12001

app/admin/model/GoodLog.php

@@ -13,21 +13,24 @@ class GoodLog extends Model
      */
   public static function LogAdd($token,$data,$action_type){
         $user = GetUserInfo($token);
+
         $uid = isset($user['data']['id']) ? $user['data']['id'] :0;
         $name = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
         if(is_array($data)){
             $temp=[];
             if(isset($data['stock_id'])){
-                $data['action_id']=$uid;
+                $data['action_uid']=$uid;
                 $data['action_name']=$name;
                 $data['action_type']=$action_type;
+                $data['addtime']=date("Y-m-d H:i:s");
                 $temp[]=$data;
             }else{
                 foreach ($data as $key=>$value){
                     if(isset($value['stock_id'])){
-                        $value['action_id']=$uid;
+                        $value['action_uid']=$uid;
                         $value['action_name']=$name;
                         $value['action_type']=$action_type;
+                        $value['addtime']=date("Y-m-d H:i:s");
                         $temp[]=$value;
                     }
                 }

app/admin/model/Workflow.php

@@ -14,12 +14,15 @@ class Workflow extends \think\Model
         $header =reset($action);
         $proces = self::where(["order_type"=>$data['order_type'],"order_code"=>$data['order_code'],"is_del"=>0])->find();
         if($proces){
-            $proces['order_status'] = $data['order_status'];
-            $proces['action_uid'] = $data['action_uid'];
-            $proces['action_name'] = $data['action_name'];
-            $proces["order_process"]=$last==$data['action_process']?3:($header==$data['action_process']?1:2);
-            $proces['updatetime']=date("Y-m-d H:i:s");
-            self::update($proces);
+
+            $info=[
+                "order_status"=>$data['order_status'],
+                "order_process"=>$last==$data['action_process']?3:($header==$data['action_process']?1:2),
+                "action_uid"=>$data['action_uid'],
+                "action_name"=>$data['action_name'],
+                "updatetime"=>date("Y-m-d H:i:s")
+            ];
+            self::where(["id"=>$proces['id']])->update($info);
         }else{
             $proces=[
                 "order_type"=>$data['order_type'],