Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Goodup.php

@@ -1165,21 +1165,21 @@ class Goodup extends Base
             if($up){
                 ChangeLog::logAdd(3,$datas['spuCode'],$jsp,$json,['id' => $this->uid, 'nickname' => $this->uname]);
                 //修改状态，添加待办
-//                ActionLog::logAdd($this->post['token'], [
-//                    "order_code" =>$supcode,//咨询单详情编号
-//                    "status" =>  $datas['status'],//这里的status是之前的值
-//                    "action_remark" => '',//备注
-//                    "action_type" => "edit"//新建create，编辑edit，更改状态status
-//                ], "SPCB",$data['status'] ,$data);
-//
-//                ProcessOrder::AddProcess($this->post['token'], [
-//                    "order_type" => 'SPCB',
-//                    "order_code" => $supcode,//咨询单详情编号
-//                    "order_id" => $datas['id'],
-//                    "order_status" =>$data['status'],
-//                    "before_status"=>$datas['status'],
-//                    'holder_id'=>$datas['createrid'],
-//                ]);
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$supcode,//咨询单详情编号
+                    "status" =>  $datas['status'],//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "SPCB",$data['status'] ,$data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SPCB',
+                    "order_code" => $supcode,//咨询单详情编号
+                    "order_id" => $datas['id'],
+                    "order_status" =>$data['status'],
+                    "before_status"=>$datas['status'],
+                    'holder_id'=>$datas['createrid'],
+                ]);
 //                $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
@@ -1703,6 +1703,7 @@ class Goodup extends Base
           	$platform['is_compliance']=0;
             $platform['compliance_remark']='';
           }
+          $before = $platform['exam_status'];
         $platform['exam_status']=$post['exam_status'];
         $platform['updatetime']=date("Y-m-d H:i:s");
         $createrid= $this->uid;
@@ -1722,7 +1723,21 @@ class Goodup extends Base
                 ];
                 $inr=Db::name("good_exam")->insert($data);
                 if($inr){
+					 ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
+                        "order_code" => $platform['skuCode'],//编号
+                        "status" => $before,
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "SPSX", $post['exam_status'], $platform);
 
+                    ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
+                        "order_type" => 'SPSX',
+                        "order_code" =>$platform['skuCode'],//咨询单详情编号
+                        "order_id" => $platform['id'],
+                        "order_status" => $post['exam_status'],
+                        "before_status" => $before,
+                        'holder_id' => $platform['createrid'],
+                    ]);
                     //如果是商品下线的话，记入商品下线记录表
                     if ($post['exam_status'] == 5) {
                         $offline_id = Db::name("good_offline_log")->insertGetId([
@@ -1978,6 +1993,20 @@ class Goodup extends Base
         try {
             $save =Db::name("good_platform")->save($platform);
             if($save){
+            	 ActionLog::logAdd(['id'=>$createrid,'nickname'=>$creater], [
+                    "order_code" =>$platform['skuCode'],//咨询单详情编号
+                    "status" =>$bifore,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "SPSX", $platform['exam_status'],$platform);
+                ProcessOrder::AddProcess(['id'=>$createrid,'nickname'=>$creater], [
+                    "order_type" => 'SPSX',
+                    "order_code" =>$platform['skuCode'],//咨询单详情编号
+                    "order_id" => $platform['id'],
+                    "order_status" => $platform['exam_status'],
+                    "before_status"=>$bifore,
+                    'holder_id' => $platform['createrid'],
+                ]);
                 $data=[
                     "code"=>$platform['skuCode'],
                     "type"=>2,
@@ -1988,6 +2017,8 @@ class Goodup extends Base
                     "addtime"=>date("Y-m-d H:i:s")
                 ];
                 $inr=Db::name("good_exam")->insert($data);
+                              //修改状态，添加待办
+
                 if($inr){
 
                     //将good_basic数据同步到good表