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

app/admin/controller/Goodup.php

@@ -2576,16 +2576,18 @@ class Goodup extends Base
                 ->where(["spuCode" => $rs['spuCode'], "is_del" => 0])
                 ->find();
 
+            $exam_status = empty($good_nake) ? 1 : 2;
+
             Db::name("good_platform")
                 ->where('id', $rs['id'])
                 ->save([
-                    'exam_status' => empty($good_nake) ? 1 : 2,
+                    'exam_status' => $exam_status,
                     'updatetime' => date('Y-m-d H:i:s'),
                 ]);
 
             Db::name("good_exam")->insert([
                 'code' => $rs['skuCode'],
-                'exam_status' => empty($good_nake) ? 1 : 2,
+                'exam_status' => $exam_status,
                 'type' => 2,
                 'exam_id' => $createrid,
                 'exam_name' => $creater,
@@ -2593,48 +2595,104 @@ class Goodup extends Base
                 'addtime' => date('Y-m-d H:i:s')
             ]);
 
-
-//            if($up){
-//                $data=[
-//                    "code"=>$platform['skuCode'],
-//                    "exam_status"=>$exam_status,
-//                    "type"=>2,
-//                    "exam_id"=>$createrid,
-//                    "exam_name"=>$creater,
-//                    "exam_remark"=>$exam_remark,
-//                    "addtime"=>date("Y-m-d H:i:s")
-//                ];
-//                $inr=Db::name("good_exam")->insert($data);
-//                if($inr){
-
-//                    ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
-//                        "order_code" => $skuCode,//编号
-//                        "status" => $bifore,
-//                        "action_remark" => '',//备注
-//                        "action_type" => "status"//新建create，编辑edit，更改状态status
-//                    ], "SPSX", $exam_status, $platform);
-//
-//                    ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
-//                        "order_type" => 'SPSX',
-//                        "order_code" => $skuCode,//咨询单详情编号
-//                        "order_id" => $platform['id'],
-//                        "order_status" => $exam_status,"before_status"=>$bifore
-//                    ]);
+            ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
+                "order_code" => $param['skuCode'],//编号
+                "status" => $rs['status'],
+                "action_remark" => '',//备注
+                "action_type" => "status"//新建create，编辑edit，更改状态status
+            ], "SPSX", $exam_status, $param);
+
+            ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
+                "order_type" => 'SPSX',
+                "order_code" => $param['skuCode'],//咨询单详情编号
+                "order_id" => $rs['id'],
+                "order_status" => $exam_status, "before_status" => $rs['status']
+            ]);
 
             Db::commit();
             return app_show(0, "驳回重新审核成功");
-//                }else{
-//                    Db::rollback();
-//                    return error_show(1004,"审核失败");
-//                }
-//            }else{
-//                Db::rollback();
-//                return error_show(1004,"审核失败");
-//            }
+
         } catch (\Exception $e) {
             Db::rollback();
             return error_show(1004, '驳回重新审核失败，' . $e->getMessage());
         }
     }
 
+    //同一个spuCode下所有的商品都下线
+    public function offlineGoodBySpuCode()
+    {
+
+        $param = $this->request->only(['token', 'skuCode'], 'post', 'trim');
+
+        $val = Validate::rule(['token' => 'require', 'skuCode' => 'require']);
+
+        if (!$val->check($param)) return error_show(1005, $val->getError());
+
+        $user = GetUserInfo($param['token']);
+
+        $createrid = isset($user['data']['id']) ? $user['data']['id'] : 0;
+        $creater = isset($user['data']['nickname']) ? $user['data']['nickname'] : '';
+
+        Db::startTrans();
+        try {
+
+            $rs = Db::name("good_platform")
+                ->field('id,spuCode,skuCode')
+                ->where(['skuCode' => $param['skuCode'], 'is_del' => 0, 'exam_status' => 6])//exam_status==6上线成功
+                ->find();
+
+            if (empty($rs)) throw new \Exception('该上线商品记录不存在');
+
+            $skuCodeS = Db::name("good_platform")
+                ->where(['spuCode' => $rs['spuCode'], 'is_del' => 0, 'exam_status' => 6])//exam_status==6上线成功
+                ->column('skuCode');
+
+            Db::name("good_platform")
+                ->where(['spuCode' => $rs['spuCode'], 'is_del' => 0, 'exam_status' => 6])
+                ->save([
+                    'exam_status' => 8,
+                    'updatetime' => date('Y-m-d H:i:s'),
+                ]);
+
+            $insert_good_exam_data = [];
+            foreach ($skuCodeS as $skuCode) {
+                $insert_good_exam_data[] = [
+                    'code' => $skuCode,
+                    'exam_status' => 8,
+                    'type' => 2,
+                    'exam_id' => $createrid,
+                    'exam_name' => $creater,
+                    'exam_remark' => '',
+                    'addtime' => date('Y-m-d H:i:s')
+                ];
+
+                ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
+                    "order_code" => $skuCode,//编号
+                    "status" => 6,
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "GOL", 8, $param);
+
+                ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
+                    "order_type" => 'GOL',
+                    "order_code" => $skuCode,
+                    "order_id" => 0,
+                    "order_status" => 8, "before_status" => 6
+                ]);
+            }
+
+            Db::name("good_exam")->insertAll($insert_good_exam_data);
+
+            Db::commit();
+            return app_show(0, "同一个成本商品编号下的商品下线成功");
+
+        } catch (\Exception $e) {
+            Db::rollback();
+            return error_show(1004, '同一个成本商品编号下的商品下线失败，' . $e->getMessage() . '|' . $e->getFile() . '|' . $e->getLine());
+        }
+    }
+
+
+
+
 }

app/admin/route/app.php

@@ -370,6 +370,7 @@ Route::rule('goodupcopy','admin/Goodup/copy');
 Route::rule('goodupedit','admin/Goodup/edit');
 Route::rule('goodupprice','admin/Goodup/checkPrice');
 Route::rule('goodupreject','admin/Goodup/rejectGoodToAgainExamine');
+Route::rule('goodupoffline','admin/Goodup/offlineGoodBySpuCode');
 
 Route::rule('goodproof','admin/Goodup/prooflist');