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

app/youzan/controller/Index.php

@@ -48,21 +48,21 @@ class Index extends Base
     //商品上线详情
     public function getYzGoodupInfo()
     {
-        $platform_youzan_id = $this->request->param('platform_youzan_id/d', 0, 'trim');
+        $platform_youzan_id = $this->request->post('platform_youzan_id/d', 0, 'trim');
         return Goodup::getYzGoodupInfo($platform_youzan_id);
     }
 
     //商品下线—有赞平台对接
     public function youzanOffline()
     {
-        $param = $this->request->only(['good_platform_id', 'token'], 'post', 'trim');
+        $param = $this->request->only(['platform_youzan_id', 'token'], 'post', 'trim');
 
         $val = Validate::rule([
-            'good_platform_id|商品上线记录ID' => 'require|number|gt:0',
+            'platform_youzan_id|有赞商品上线记录id' => 'require|number|gt:0',
             'token' => 'require',
         ]);
 
-        if ($val->check($param)) return Goodup::youzanGoodOffline($param['good_platform_id'], $param);
+        if ($val->check($param)) return Goodup::youzanGoodOffline($param['platform_youzan_id'], $param);
         else return error_show(1005, $val->getError());
     }
 

app/youzan/logic/Goodup.php

@@ -190,7 +190,7 @@ class Goodup
                     'is_display' => 1,//1上架商品
                     'quantity' => '1111111111',//库存数,先随便写个数，待 @戴 确定
                     'hide_stock' => 0,//0显示库存，1不显示库存
-                    'origin' => $data['sale_price'],//系统售价
+                    'origin' => $ladder_info['sale_price'],//系统售价
                     'price' => $data['final_price'],//最后售价
                     'uid' => isset($userinfo['data']['id']) ? $userinfo['data']['id'] : 0,
                     'nickname' => isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname'] : '',
@@ -348,7 +348,7 @@ class Goodup
 
 
     //添加商品下线到处理队列中
-    public static function youzanGoodOffline(int $good_platform_id = 0, array $data = [])
+    public static function youzanGoodOffline(int $platform_youzan_id = 0, array $data = [])
     {
 
         Db::startTrans();
@@ -358,14 +358,12 @@ class Goodup
             $db = new PlatformYouzan();
 
             $rs = $db
-                ->field('gp.id,gp.skuCode,gp.exam_status,gp.status')
-                ->alias('gp')
-                ->where(['gp.id' => $good_platform_id, 'gp.is_del' => $db::$del_normal])
+                ->field('id,skuCode,exam_status')
+                ->where(['id' => $platform_youzan_id, 'is_del' => $db::$del_normal])
                 ->findOrEmpty();
 
             if ($rs->isEmpty()) throw new Exception('该商品上线记录不存在');
-            if ($rs->exam_status != $db::$exam_status_8) throw new Exception('该商品尚未下线成功');
-            if ($rs->status == $db::$status_offline) throw new Exception('该商品已经在有赞平台下线了');
+            if ($rs->exam_status != $db::$exam_status_6) throw new Exception('该商品尚未上线');
 
             $userinfo = GetUserInfo($data['token']);
 
@@ -374,7 +372,7 @@ class Goodup
                 'item_no' => $rs->skuCode,//商品自定义编码 skuCode
                 'uid' => isset($userinfo['data']['id']) ? $userinfo['data']['id'] : 0,
                 'nickname' => isset($userinfo['data']['nickname']) ? $userinfo['data']['nickname'] : '',
-                'good_platform_id' => $good_platform_id,
+                'platform_youzan_id' => $platform_youzan_id,
             ]));
 
             Db::commit();