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

app/admin/controller/Goodup.php

@@ -1043,7 +1043,7 @@ class Goodup extends Base
                 ]);
                 $data=[
                     "code"=>$supcode,
-                    "exam_status"=>$status,
+                    "exam_status"=>$online['exam_status'],//$status,
                     "type"=>1,
                     "exam_id"=>$createrid,
                     "exam_name"=>$creater,
@@ -1477,7 +1477,7 @@ class Goodup extends Base
             if($up){
                 $data=[
                     "code"=>$platform['skuCode'],
-                    "exam_status"=>$exam_status,
+                    "exam_status"=>$bifore,//$exam_status,
                     "type"=>2,
                     "exam_id"=>$createrid,
                     "exam_name"=>$creater,
@@ -1669,20 +1669,14 @@ class Goodup extends Base
                     return app_show(1004,"商品凭证新建失败");
                 }
 
-                //艳蓉说，要把审核备注更新到上一个节点那儿
-                Db::name("good_exam")
-                    ->where(['code'=>$platform['skuCode'],'exam_status'=>$bifore])
-                    ->order('addtime','desc')
-                    ->limit(1)
-                    ->update(['exam_remark'=>$exam_remark]);
 
                 $data=[
                     "code"=>$platform['skuCode'],
                     "type"=>2,
-                    "exam_status"=>4,
+                    "exam_status"=>$bifore,//4,
                     "exam_id"=>$createrid,
                     "exam_name"=>$creater,
-                    "exam_remark"=>'',
+                    "exam_remark"=>$exam_remark,
                     "addtime"=>date("Y-m-d H:i:s")
                 ];
                 $inr=Db::name("good_exam")->insert($data);
@@ -1775,7 +1769,7 @@ class Goodup extends Base
                 $data=[
                     "code"=>$platform['skuCode'],
                     "type"=>2,
-                    "exam_status"=>$platform['exam_status'] ,
+                    "exam_status"=>$bifore,//$platform['exam_status'] ,
                     "exam_id"=>$createrid,
                     "exam_name"=>$creater,
                     "exam_remark"=>'',
@@ -2700,20 +2694,13 @@ class Goodup extends Base
                     'updatetime' => date('Y-m-d H:i:s'),
                 ]);
 
-            //艳蓉说，要把审核备注更新到上一个节点那儿
-            Db::name("good_exam")
-                ->where(['code' => $param['skuCode'], 'exam_status' => $old_exam_staus])
-                ->order('addtime', 'desc')
-                ->limit(1)
-                ->update(['exam_remark' => $param['exam_remark']]);
-
             Db::name("good_exam")->insert([
                 'code' => $rs['skuCode'],
-                'exam_status' => $exam_status,
+                'exam_status' => $old_exam_staus,
                 'type' => 2,
                 'exam_id' => $createrid,
                 'exam_name' => $creater,
-                'exam_remark' => '',//$param['exam_remark'],
+                'exam_remark' => $param['exam_remark'],
                 'addtime' => date('Y-m-d H:i:s')
             ]);