Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/youzan/controller/Index.php

@@ -168,11 +168,4 @@ class Index extends Base
     }
 
 
-    //商品下线(从有赞平台操作)
-    public function offlineGoodByYz(){
-        $param = $this->request->filter('trim')->post();
-
-        return Goodup::offlineGoodByYz($param);
-    }
-
 }

app/youzan/logic/Goodup.php

@@ -615,69 +615,4 @@ class Goodup
     }
 
 
-    //商品下线(从有赞平台操作)
-    public static function offlineGoodByYz(array $data = [])
-    {
-
-        Db::startTrans();
-
-        try {
-
-            Db::name('good_platform')
-                ->where(['is_del' => 0, 'skuCode' => $data['skuCode']])
-                ->update([
-                    'exam_status' => 8,
-                    'is_online' => 0,
-                    'updatetime' => date('Y-m-d H:i:s'),
-                ]);
-
-            $good_info = Db::name('platform_youzan')
-                ->alias('py')
-                ->field('py.id,py.spuCode,gb.good_name')
-                ->leftJoin('good_basic gb', 'gb.spuCode=py.spuCode')
-                ->where(['py.is_del' => 0, 'py.exam_status' => PlatformYouzan::$exam_status_6, 'py.skuCode' => $data['skuCode']])
-                ->find();
-
-            if (!empty($good_info)) {
-
-                //更新采销上线记录表
-                Db::name('platform_youzan')
-                    ->where('id', $good_info['id'])
-                    ->update([
-                        'exam_status' => PlatformYouzan::$exam_status_8,
-                        'offline_remark' => '有赞平台操作下架',
-                        'offline_reason_id' => self::$offline_result_info_id,
-                        'updaterid' => 0,
-                        'updater' => 'youzan',
-                        'updatetime' => date('Y-m-d H:i:s'),
-                    ]);
-
-                //下线记录
-                Db::name('good_offline_log_youzan')
-                    ->insert([
-                        'spuCode' => isset($good_info['spuCode']) ? $good_info['spuCode'] : '',
-                        'skuCodes' => $data['skuCode'],
-                        'good_name' => isset($good_info['good_name']) ? $good_info['good_name'] : '',
-                        'offline_reason' => self::$offline_result_info_id,
-                        'offline_remark' => '有赞平台操作下架',
-                        'createrid' => 0,
-                        'creater' => 'youzan',
-                        'addtime' => date('Y-m-d H:i:s'),
-                    ]);
-
-            }
-
-            Db::commit();
-
-            return app_show(0, '操作成功');
-
-        } catch (Exception $exception) {
-            Db::rollback();
-            return error_show(1005, $exception->getMessage());
-        }
-
-
-    }
-
-
 }

app/youzan/route/app.php

@@ -15,7 +15,6 @@ route::rule('yz_order_list', 'youzan/Index/getYzOrderList');//获取有赞订单
 route::rule('yz_check_handle_status', 'youzan/Index/checkHandleStatus');//处理有赞订单(确认或取消)
 route::rule('yz_get_update_good_log_by_yz', 'youzan/Index/getYzUpdateLog');//获取有赞平台修改商品日志，有赞平台
 route::rule('yz_get_update_good_log_by_caixiao', 'youzan/Index/getUpdateGoodLog');//获取修改商品日志,采销系统
-route::rule('yz_offline_good_by_yz', 'youzan/Index/offlineGoodByYz');//商品下线(从有赞平台操作)