Sfoglia il codice sorgente

Merge branch 'version1.5' into dev_wf

wufeng 2 anni fa
parent
commit
9bc37e0b81
1 ha cambiato i file con 26 aggiunte e 24 eliminazioni
  1. 26 24
      app/admin/controller/Goodup.php

+ 26 - 24
app/admin/controller/Goodup.php

@@ -851,29 +851,29 @@ class Goodup extends Base
                     "order_id" => $datas['id'],
                     "order_status" =>$data['status'],"before_status"=>$datas['status']
                 ]);
-                $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
-                if($online){
-                    $onup = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->save
-                    (["exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
-                    if($onup==false){
-                        Db::rollback();
-                        return app_show(1004,"商品规成本修改失败");
-                    }
-                    //修改状态,添加待办
-                    ActionLog::logAdd($this->post['token'], [
-                        "order_code" =>$online['skuCode'],//咨询单详情编号
-                        "status" =>  $online['exam_status'],//这里的status是之前的值
-                        "action_remark" => '',//备注
-                        "action_type" => "edit"//新建create,编辑edit,更改状态status
-                    ], "SPSX",2,["exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
-
-                    ProcessOrder::AddProcess($this->post['token'], [
-                        "order_type" => 'SPSX',
-                        "order_code" => $online['skuCode'],//咨询单详情编号
-                        "order_id" => $online['id'],
-                        "order_status" =>2,"before_status"=>$online['exam_status']
-                    ]);
-                }
+//                $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
+//                if($online){
+//                    $onup = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->save
+//                    (["exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+//                    if($onup==false){
+//                        Db::rollback();
+//                        return app_show(1004,"商品规成本修改失败");
+//                    }
+//                    //修改状态,添加待办
+//                    ActionLog::logAdd($this->post['token'], [
+//                        "order_code" =>$online['skuCode'],//咨询单详情编号
+//                        "status" =>  $online['exam_status'],//这里的status是之前的值
+//                        "action_remark" => '',//备注
+//                        "action_type" => "edit"//新建create,编辑edit,更改状态status
+//                    ], "SPSX",2,["exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+//
+//                    ProcessOrder::AddProcess($this->post['token'], [
+//                        "order_type" => 'SPSX',
+//                        "order_code" => $online['skuCode'],//咨询单详情编号
+//                        "order_id" => $online['id'],
+//                        "order_status" =>2,"before_status"=>$online['exam_status']
+//                    ]);
+//                }
                 if($good_ladder!=="" && !empty($good_ladder)){
 
                     $user =GetUserInfo($this->post['token']);
@@ -964,7 +964,7 @@ class Goodup extends Base
                 $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
                 if($online) {
                     $onl= Db::name("good_platform")->where(["spuCode" => $supcode, "is_del" => 0])->save(["exam_status" => 2, "updatetime" => date("Y-m-d H:i:s")]);
-                    if ($onl != false) {
+                    if ($onl == false) {
                         Db::rollback();
                         return error_show(1004, "审核失败");
                     }
@@ -2458,6 +2458,7 @@ class Goodup extends Base
                         "order_code" =>$value['spuCode'],//
                         "order_id" => isset($value['id']) ? $value['id'] : 0,
                         "order_status" => 8,//待产品审核
+                        "before_status" => 0,//待产品审核
                     ]);
                 }
                 foreach ($data as $value) {
@@ -2474,6 +2475,7 @@ class Goodup extends Base
                         "order_code" =>$value['skuCode'],//
                         "order_id" => isset($value['id']) ? $value['id'] : 0,
                         "order_status" =>$value['exam_status'],//待产品审核
+                        "before_status" => 0
                     ]);
                 }
                 Db::commit();