Merge branch 'version1.5' into dev_wf

app/admin/controller/Good.php

@@ -964,7 +964,7 @@ class Good extends Base
             'size' => 15
         ], 'post', 'trim');
 
-        $where = [];
+        $where = [["gl.is_del","=",0]];
         if ($param['good_type']!='') $where[] = ['gb.good_type', '=', $param['good_type']];
 //        if (!empty($param['start'])) $where[] = ['gl.addtime', '>=', $param['start']];
 //        if (!empty($param['end'])) $where[] = ['gl.addtime', '<=', $param['end'] . ' 23:59:59'];

app/admin/controller/Goodup.php

@@ -529,9 +529,9 @@ class Goodup extends Base
         if($data==false){
             return error_show(1004,"未找到商品数据");
         }
-        $data = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->where("exam_status","<>",8)
+        $is_down = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->where("exam_status","<>",8)
             ->find();
-        if($data!=false){
+        if($is_down!=false){
             return error_show(1004,"存在未下线商品数据");
         }
         $good_name= isset($this->post['good_name'])&&$this->post['good_name']!="" ? trim($this->post['good_name']):"";
@@ -1126,22 +1126,23 @@ class Goodup extends Base
             $good_basic = Db::name("good_basic")
                 ->field('id,spuCode,status')
                 ->where(["spuCode" => $supcode, "is_del" => 0])
-                ->find();
+                ->select()->toArray();
 
             if (empty($good_basic)) throw new Exception('该记录不存在或已删除');
 
             $good = Db::name('good')
                 ->alias('g')
-                ->field('gp.id,gp.exam_status')
+                ->field('gp.id,gp.exam_status,gp.skuCode')
                 ->leftJoin('good_platform gp', 'gp.spuCode=g.spuCode AND gp.is_del=0')
                 ->where(['g.spuCode' => $supcode, 'g.is_del' => 0])
                 ->whereNotIn('gp.exam_status', [1, 8])
-                ->find();
+                ->select()->toArray();
 
             if (!empty($good)) throw new Exception('该商品需要下线之后才能删除');
 
+
             Db::name("good_basic")
-                ->where(['id' => $good_basic['id'], 'is_del' => 0])
+                ->where(["spuCode" => $supcode, 'is_del' => 0])
                 ->update(['is_del' => 1, 'updatetime' => date('Y-m-d H:i:s')]);
 
             Db::name("good")
@@ -1152,8 +1153,12 @@ class Goodup extends Base
                 ->where(['spuCode' => $supcode, 'is_del' => 0])
                 ->whereIn('exam_status', [1, 8])
                 ->update(['is_del' => 1, 'updatetime' => date('Y-m-d H:i:s')]);
-
-            ProcessOrder::workdel(["order_type" => "CGD", "order_code" => $supcode]);
+            Db::name("good_ladder")->where(["skuCode"=>array_column($good,"skuCode"),"is_del"=>0])->update(['is_del'
+            => 1, 'updatetime' => date('Y-m-d H:i:s')]);
+            Db::name("good_nake")->where(["spuCode"=>$supcode,"is_del"=>0])->update(['is_del'
+            => 1, 'updatetime' => date('Y-m-d H:i:s')]);
+            ProcessOrder::workdel(["order_type" => "SPCB", "order_code" => $supcode]);
+            ProcessOrder::workdel(["order_type" => "SPSX", "order_code" => array_column($good,"skuCode")]);
 
             Db::commit();
             app_show(0, "删除成功");

app/admin/controller/Resign.php

@@ -173,8 +173,8 @@ class Resign extends Base
             "lasttime"=>$lastime,
             "status"=>1,
             "remark"=>$mark,
-            "cgder"=>$supplier['person'],
-            "cgderid"=>$supplier['personid'],
+            "cgder"=>$good['creater'],
+            "cgderid"=>$good['createrid'],
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s"),
             "apply_id"=>$userinfo['id'],
@@ -796,8 +796,8 @@ class Resign extends Base
         $cg =["cgdNo"=>$cgdCode,
             "bkcode"=>$bk_code,
             "wsm_code"=>$wsm_code,
-            "cgder"=>$supplier['person'],
-            "cgder_id"=>$supplier['personid'],
+            "cgder"=>$good['creater'],
+            "cgder_id"=>$good['createrid'],
             "spuCode"=>$info['spuCode'],
             "good_name"=>$info['good_name'],
             "good_num"=>$info['good_num'],