Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Goodup.php

@@ -1126,20 +1126,21 @@ 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])
                 ->update(['is_del' => 1, 'updatetime' => date('Y-m-d H:i:s')]);
@@ -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, "删除成功");