Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Brand.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ChangeLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -132,8 +133,16 @@ class Brand extends BaseController
             "is_del"=>0,
             "updatetime"=>date("Y-m-d H:i:s")
         ];
+        $temp = array_diff($data,$info);
+        $json = json_encode($temp,JSON_UNESCAPED_UNICODE);
+        $jsp = json_encode($info,JSON_UNESCAPED_UNICODE);
         $item = Db::name("brand")->save($data);
-        return $item? error_show(0,"更新成功"):error_show(1002,"更新失败");
+        ChangeLog::logAdd(6,$info['id'],$jsp,$json,$this->post['token'],$this->post);
+        if($item){
+            return error_show(0,"更新成功");
+        }else{
+            return error_show(1002,"更新失败");
+        }
     }
     public function status()
     {

app/admin/controller/Cat.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\admin\model\ActionLog;
+use app\admin\model\ChangeLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -341,10 +342,13 @@ public function edit(){
             "search"=>$search
         ];
         $strinfo = Db::name('cat')->where(['id'=>$id])->save($str);
+        $temp = array_diff($str,$idinfo);
+        $json = json_encode($temp,JSON_UNESCAPED_UNICODE);
+        $jsp = json_encode($idinfo,JSON_UNESCAPED_UNICODE);
         if($strinfo){
             $order = ["order_code"=>$id,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$order,"sxd",$status,$order);
-
+            ChangeLog::logAdd(7,$idinfo['id'],$jsp,$json,$this->post['token'],$this->post);
             $spc =[];
             $vp = Db::name('cat_spec')->where(['cat_id'=>$idinfo['id'],'is_del'=>0])->find();
           $str ="";

app/admin/controller/Customar.php

@@ -232,10 +232,11 @@ class Customar extends BaseController
             ];
             $datainfo = Db::name('customer_info')->save($data);
             // var_dump(Db::name('customer_info')->getLastSql());
-            $stn = array_diff($idinfo,$data);
-            $json = json_encode($stn);
+            $stn = array_diff($data,$idinfo);
+            $json = json_encode($stn,JSON_UNESCAPED_UNICODE);
+            $jsp = json_encode($idinfo,JSON_UNESCAPED_UNICODE);
             if ($datainfo) {
-                ChangeLog::logAdd("2",$idinfo['companyNo'],$idinfo,$json,$this->post['token'],$this->post);
+                ChangeLog::logAdd("2",$idinfo['companyNo'],$jsp,$json,$this->post['token'],$this->post);
                // $var=[];
 //                var_dump($customer_member);
                 foreach ($customer_member as $value) {

app/admin/controller/Goodup.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ChangeLog;
 use think\App;
 use think\facade\Db;
 
@@ -603,7 +604,11 @@ class Goodup extends Base
             $field = array_diff_assoc($temp,$data);
             $temp['field_change'] =empty($field)?"":json_encode(array_keys($field));
             $up = Db::name("good_basic")->where(["spuCode"=>$supcode,"is_del"=>0])->save($temp);
+            $timp = array_diff($temp,$data);
+            $json = json_encode($timp,JSON_UNESCAPED_UNICODE);
+            $jsp = json_encode($data,JSON_UNESCAPED_UNICODE);
             if($up){
+                ChangeLog::logAdd(3,$data['spuCode'],$jsp,$json,$this->post['token'],$this->post);
                 if($speclist!=="" && !empty($speclist)){
                     foreach ($speclist as $value){
                         $lemp=[];
@@ -692,7 +697,11 @@ class Goodup extends Base
         Db::startTrans();
         try{
             $up = Db::name("good_basic")->where(["spuCode"=>$supcode,"is_del"=>0])->save($data);
+            $temp = array_diff($data,$datas);
+            $json = json_encode($temp,JSON_UNESCAPED_UNICODE);
+            $jsp = json_encode($datas,JSON_UNESCAPED_UNICODE);
             if($up){
+                ChangeLog::logAdd(3,$datas['spuCode'],$jsp,$json,$this->post['token'],$this->post);
                 $online = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->save(["is_online"=>0,"status"=>0,"updatetime"=>date("Y-m-d H:i:s")]);
                 if($good_ladder!=="" && !empty($good_ladder)){
                     foreach ($good_ladder as $value){
@@ -1566,7 +1575,11 @@ class Goodup extends Base
             $field = array_diff_assoc($temp,$data);
             $temp['field_change'] =empty($field)?"":json_encode(array_keys($field));
             $up = Db::name("good_basic")->where(["spuCode"=>$supcode,"is_del"=>0])->save($temp);
+            $var = array_diff($temp,$data);
+            $json = json_encode($var,JSON_UNESCAPED_UNICODE);
+            $dat = json_encode($data,JSON_UNESCAPED_UNICODE);
             if($up){
+                ChangeLog::logAdd(3,$data['spuCode'],$dat,$json,$this->post['token'],$this->post);
                 if($speclist!=="" && !empty($speclist)){
                     foreach ($speclist as $value){
                         $lemp=[];

app/admin/controller/Platform.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ChangeLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -103,19 +104,19 @@ class Platform extends BaseController
             return error_show(1002, "参数platform_name不能为空");
         }
         $platform_type = isset($this->post['platform_type']) && $this->post['platform_type'] !== "" ? intval($this->post['platform_type']) :"";
-        if($platform_type==""){
+        if($platform_type===""){
             return error_show(1002,"参数platform_type不能为空");
         }
         $token = isset($this->post['token']) && $this->post['token'] != '' ? trim($this->post['token']) : "";
         if ($token == '') {
             return error_show(1005, "参数token不能为空");
         }
-        $user = GetUserInfo($token);
-        if (empty($user) || $user['code'] != 0) {
-            return error_show(102, "创建人数据不存在");
-        }
-        $action_id = isset($user["data"]['id']) ? $user["data"]['id'] : "";
-        $action_name = isset($user["data"]['nickname']) ? $user["data"]['nickname'] : "";
+//        $user = GetUserInfo($token);
+//        if (empty($user) || $user['code'] != 0) {
+//            return error_show(102, "创建人数据不存在");
+//        }
+//        $action_id = isset($user["data"]['id']) ? $user["data"]['id'] : "";
+//        $action_name = isset($user["data"]['nickname']) ? $user["data"]['nickname'] : "";
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "";
         $desc = isset($this->post['desc']) && $this->post['desc'] !== "" ? trim($this->post['desc']) : "";
         $data = [
@@ -123,15 +124,19 @@ class Platform extends BaseController
             "platform_code" => $platform_code,
             "platform_name" => $platform_name,
             "platform_type" => $platform_type,
-            "createrid" => $action_id,
-            "creater" => $action_name,
+//            "createrid" => $action_id,
+//            "creater" => $action_name,
             "desc" => $desc,
             "status" => $status,
             "is_del" => 0,
             "updatetime" => date("Y-m-d H:i:s")
         ];
         $datainfo = Db::name('platform')->save($data);
+        $temp = array_diff($data,$info);
+        $json = json_encode($temp,JSON_UNESCAPED_UNICODE);
+        $jsp = json_encode($info,JSON_UNESCAPED_UNICODE);
         if ($datainfo) {
+            ChangeLog::logAdd(8,$info['platform_code'],$jsp,$json,$this->post['token'],$this->post);
             return error_show(0, "更新成功");
         } else {
             return error_show(1002, "更新失败");

app/admin/controller/Specs.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ChangeLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -165,7 +166,11 @@ class Specs extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $datainfo=Db::name('specs')->save($data);
+        $item = array_diff($data,$info);
+        $json = json_encode($item,JSON_UNESCAPED_UNICODE);
+        $jsp = json_encode($info,JSON_UNESCAPED_UNICODE);
         if($datainfo){
+            ChangeLog::logAdd(5,$info['id'],$jsp,$json,$this->post['token'],$this->post);
             return error_show(0,"更新成功");
         }else{
             return error_show(1002,"更新失败");

app/admin/controller/Suppler.php

@@ -429,11 +429,12 @@ class Suppler extends BaseController
                     $data['ocr_status']=2;
                 }
             }
-            $ino = array_diff($info,$data);
-            $tem = json_encode($ino);
+            $ino = array_diff($data,$info);
+            $tem = json_encode($ino,JSON_UNESCAPED_UNICODE);
+            $jsp = json_encode($info,JSON_UNESCAPED_UNICODE);
             $join = Db::name('supplier')->where(['id'=>$id,'is_del'=>0])->save($data);
             if($join){
-                ChangeLog::logAdd("1",$info['code'],$info,$tem,$this->post['token'],$this->post);
+                ChangeLog::logAdd("1",$info['code'],$jsp,$tem,$this->post['token'],$this->post);
                 $item = Db::name('supplier_contact')->where(['code'=>$info['code']])->find();
                     $temp = [];
                 isset($item['id']) && $item['id'] !== "" ? $temp['id'] =$item['id'] : '';

app/admin/controller/Unit.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ChangeLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -116,7 +117,11 @@ class Unit extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $datainfo = Db::name('unit')->save($data);
+        $item = array_diff($data,$info);
+        $json = json_encode($item,JSON_UNESCAPED_UNICODE);
+        $jsp = json_encode($info,JSON_UNESCAPED_UNICODE);
         if($datainfo){
+            ChangeLog::logAdd(4,$info['id'],$jsp,$json,$this->post['token'],$this->post);
             return error_show(0,"更新成功");
         }else{
             return error_show(1002,"更新失败");

app/admin/model/ChangeLog.php

@@ -12,13 +12,13 @@ class ChangeLog extends Model
         $createrid= isset($user['data']['id']) ? $user['data']['id'] :0;
         $creater = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
 //        $item= array_diff($before_info,$after_info);
-        $json = json_encode($after_info);
-        $jsp = json_encode($before_info);
+//        $json = json_encode($after_info,JSON_UNESCAPED_UNICODE);
+//        $jsp = json_encode($before_info,JSON_UNESCAPED_UNICODE);
         $data=[
             "createrid"=>$createrid,
             "creater"=>$creater,
-            "before_info"=>$jsp,
-            "after_info"=>$json,
+            "before_info"=>$before_info,
+            "after_info"=>$after_info,
             "code"=>$code,
             "type"=>$type,
           //  "action_data"=>json_encode($post),

app/admin/route/app.php

@@ -132,7 +132,7 @@ Route::rule('allotgetont','admin/Allot/getont');
 Route::rule('allotgetin','admin/Allot/getin');
 Route::rule('allotvesio','admin/Allot/vesio');
 
-Route::rule('userlist', 'admin/User/list');
+Route::rule('userlistuserlist', 'admin/User/list');
 Route::rule('userinfo', 'admin/User/userInfo');
 Route::rule('userall', 'admin/User/userAll');
 Route::rule("userstatus","admin/User/UserStatus");