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

app/admin/controller/Goodup.php

@@ -1894,10 +1894,43 @@ class Goodup extends Base
         if (!empty($a)) return error_show(1005, '该咨询商品不存在' . implode(',', $a));
 
         $isonline = Db::name("good_platform")
-            ->field('id,spuCode')
-            ->where(["platform_code" => $param['platform'], "is_del" => 0])
-            ->whereIn('spuCode', $param['codes'])
-            ->find();
+            ->alias('gp')
+            ->field('gp.id,gp.spuCode,gb.good_name,gb.good_img,gp.exam_status')
+            ->where(["gp.platform_code" => $param['platform'], "gp.is_del" => 0])
+            ->whereIn('gp.spuCode', $param['codes'])
+            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
+            ->select()
+            ->toArray();
+
+        if (!empty($isonline)) {
+
+            foreach ($isonline as &$v) {
+                $spec = Db::name("good_spec")
+                    ->where(["spuCode" => $v['spuCode'], "is_del" => 0])
+                    ->select()
+                    ->toArray();
+                $speclist = [];
+                if (!empty($spec)) {
+                    foreach ($spec as $val) {
+                        $temp = [];
+                        $temp['id'] = $val['id'];
+                        $temp['spuCode'] = $val['spuCode'];
+                        $temp['spec_id'] = $val['spec_id'];
+                        $temp['spec_value_id'] = $val['spec_value_id'];
+                        $temp['is_del'] = $val['is_del'];
+                        $sp = Db::name("specs")->where(["id" => $val['spec_id']])->find();
+                        $temp['spec_name'] = isset($sp["spec_name"]) ? $sp["spec_name"] : "";
+                        $spv = Db::name("spec_value")->where(["id" => $val['spec_value_id']])->find();
+                        $temp['spec_value'] = isset($spv["spec_value"]) ? $spv["spec_value"] : "";
+                        $speclist[] = $temp;
+                    }
+                }
+                $v["speclist"] = empty($speclist) ? [] : $speclist;
+
+            }
+
+            return app_show(1009, "存在已上线产品", $isonline);
+        }
 
         if (!empty($isonline)) return error_show(1005, $isonline['spuCode'] . '该商品已在商品成本管理中，请在商品成本管理菜单提交上线！');
 
@@ -1921,13 +1954,13 @@ class Goodup extends Base
             ->whereIn('spuCode', $param['codes'])
             ->column('id', 'spuCode');
 
-        if(!empty($all_good)) return error_show(1004,'请从商品成本提交该商品上线');
+        if (!empty($all_good)) return error_show(1004, '请从商品成本提交该商品上线');
 
         $all_good_basic = Db::name('good_basic')
             ->where('is_del', 0)
             ->whereIn('spuCode', $param['codes'])
             ->column('id', 'spuCode');
-        if(!empty($all_good_basic)) return error_show(1004,'请从商品成本提交该商品上线');
+        if (!empty($all_good_basic)) return error_show(1004, '请从商品成本提交该商品上线');
 
         foreach ($param['codes'] as $value) {