2121j

app/admin/controller/Cat.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -96,6 +97,8 @@ public function create()
     ];
     $datainfo = Db::name('cat')->insert($data);
         if ($datainfo) {
+            $stx = ["order_code"=>$pid,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+            ActionLog::logAdd($this->post['token'],$stx,"sxd",$status,$stx);
             return error_show(0, "新建成功");
         } else {
             return error_show(1002, "新建失败");
@@ -129,6 +132,8 @@ public function edit(){
     ];
     $strinfo = Db::name('cat')->where(['id'=>$id])->save($str);
     if($strinfo){
+        $order = ["order_code"=>$id,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$order,"sxd",$status,$order);
         return error_show(0,"编辑成功");
     }else{
         return error_show(1002,"编辑失败");
@@ -155,10 +160,13 @@ public function status(){
     if($status===""){
         return error_show(1002,"参数status不能为空");
     }
+    $pd= $stn['status'];
     $stn['status']=$status;
     $stn['updatetime']=date("Y-m-d H:i:s");
     $str = Db::name('cat')->where(['id'=>$id])->save($stn);
     if($str){
+        $order = ["order_code"=>$id,"status"=>$pd,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$order,"sxd",$stn['status'],$order);
         return error_show(0,"状态更新成功");
     }else{
         return error_show(1002,"状态更新失败");

app/admin/controller/Gold.php

@@ -52,6 +52,7 @@ class Gold extends \app\BaseController
         if(empty($userinfo)||$userinfo['code']!=0){
             return error_show(1002,"申请人数据不存在");
         }
+        $uiq=md5(time());
         $rid= isset($userinfo["data"]['id']) ?  $userinfo["data"]['id'] : "";
         $rname= isset($userinfo["data"]['nickname']) ?  $userinfo["data"]['nickname'] : "";
         $type = isset($this->post['type'])&&$this->post['type']!=''?intval($this->post['type']):"";
@@ -66,6 +67,7 @@ class Gold extends \app\BaseController
             "action_name"=>$rname,
             "type"=>$type,
             "price"=>$price,
+            "uiq"=>$uiq,
             "addtime"=>date("Y-m-d H:i:s")
         ];
         $int = Db::name("gold_price")->insert($gold);

app/admin/controller/Group.php

@@ -203,7 +203,7 @@ class Group extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $in = Db::name("role_group")->save($data);
-        $orde = ["order_code"=>$groupid,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+        $orde = ["order_code"=>$groupname,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
         ActionLog::logAdd($token,$orde,'role_group',0,$orde);
         return $in ? app_show(0,"更新成功"): error_show(1005,"更新失败");
     }

app/admin/controller/Menu.php

@@ -86,6 +86,14 @@ class Menu extends BaseController
      */
     public function MenuEdit(){
         $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         if($id!=""){
             $menu = Db::name("admin_menu")->where("id","=",$id)->find();
@@ -131,7 +139,7 @@ class Menu extends BaseController
         }
         $result = Db::name("admin_menu")->save($data);
         $orde = ["order_code"=>$code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-        ActionLog::logAdd($this->post['token'],$orde,"admin_menu",0,$orde);
+        ActionLog::logAdd($token,$orde,"admin_menu",0,$orde);
         return $result ? app_show(0,"{$message}成功"): error_show(1003,"{$message}失败");
     }
 
@@ -143,7 +151,14 @@ class Menu extends BaseController
      */
     public function MenuStatus(){
         $post  =$this->request->post();
-
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         $menu = Db::name("admin_menu")->where("id","=",$id)->find();
         if($menu==false){
@@ -157,8 +172,8 @@ class Menu extends BaseController
         $menu['status']=$statu;
         $menu['updatetime']=date("Y-m-d H:i:s");
         $result = Db::name("admin_menu")->save($menu);
-        $orde = ["order_code"=>$id,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
-        ActionLog::logAdd($this->post['token'],$orde,"admin_menu", $menu['status'],$orde);
+        $orde = ["order_code"=>$menu['menu_name'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($token,$orde,"admin_menu", $menu['status'],$orde);
         return $result ? app_show(0,"状态更新成功"): error_show(1003,"状态更新失败");
     }
 
@@ -194,6 +209,14 @@ class Menu extends BaseController
 
     public function MenuDel(){
         $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         $menu =  Db::name("admin_menu")->where("id","=",$id)->find();
         if($menu==false){
@@ -205,8 +228,8 @@ class Menu extends BaseController
         $menu['is_del']=1;
         $menu['updatetime']=date("Y-m-d H:i:s");
         $result =  Db::name("admin_menu")->save($menu);
-        $orde = ["order_code"=>$id,"status"=>$var,"action_remark"=>'',"action_type"=>"delete"];
-        ActionLog::logAdd($this->post['token'],$orde,"admin_menu", $menu['status'],$orde);
+        $orde = ["order_code"=>$menu['menu_name'],"status"=>$var,"action_remark"=>'',"action_type"=>"delete"];
+        ActionLog::logAdd($token,$orde,"admin_menu", $menu['status'],$orde);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }
 
@@ -218,7 +241,14 @@ class Menu extends BaseController
      */
     public function MenuActionDel(){
         $post  =$this->request->post();
-
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         $menu =  Db::name("action")->where("id","=",$id)->find();
         if($menu==false){
@@ -226,8 +256,8 @@ class Menu extends BaseController
         }
 
         $result =  Db::name("action")->delete($menu);
-        $orde = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
-        ActionLog::logAdd($this->post['token'],$orde,"action",0,$orde);
+        $orde = ["order_code"=>$menu['menu_name'],"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+        ActionLog::logAdd($token,$orde,"action",0,$orde);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }
 }

app/admin/controller/Newfill.php

@@ -78,7 +78,7 @@ class Newfill extends BaseController
         $s['updatetime'] = date("Y-m-d H:i:s");
        // var_dump($s);
         $ti = Db::name('company_item')->save($s);
-        $orde = ["order_code"=>$id,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+        $orde = ["order_code"=>$s['name'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
         ActionLog::logAdd($this->post['token'],$orde,"company_item",$s['status'],$orde);
         return app_show(0,"更新成功");
     }
@@ -103,7 +103,7 @@ class Newfill extends BaseController
                 $f['position']=1;
                 $f['updatetime']= date("Y-m-d H:i:s");
                 $m= Db::name('depart_user')->save($f);
-                $orde = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                $orde = ["order_code"=>$t['nickname'],"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
                 ActionLog::logAdd($this->post['token'],$orde,"depart_user",0,$orde);
                  if($m==true){
                      Db::commit();
@@ -168,7 +168,7 @@ class Newfill extends BaseController
 
             $t= Db::name("company_item")->insert($data,true);
             if($t>0){
-                $orde = ["order_code"=>$pid,"status"=>0,"action_remark"=>'',"action_type"=>"creat"];
+                $orde = ["order_code"=>$repeat_name['name'],"status"=>0,"action_remark"=>'',"action_type"=>"creat"];
                 ActionLog::logAdd($token,$orde,"company_item",0,$orde);
                 $depart_link=$spid['depart_link']."{$t}-";
                 $level =explode('-',$depart_link);
@@ -177,7 +177,7 @@ class Newfill extends BaseController
                 $i=['depart_link'=>$depart_link,'level'=>$level];
                 $o=Db::name('company_item')->where(['id'=>$t])->update($i);
                 if($o){
-                    $stn = ["order_code"=>$pid,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                    $stn = ["order_code"=>$repeat_name['name'],"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
                     ActionLog::logAdd($token,$stn,"company_item",0,$stn);
                    Db::commit();
                    return error_show(0,"添加成功");
@@ -239,7 +239,7 @@ class Newfill extends BaseController
             'level'=>$itemlevel
         ];
       $re = Db::name("company_item")->save($item);
-        $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+        $stn = ["order_code"=>$repeat_name['name'],"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
         ActionLog::logAdd($token,$stn,"company_item",0,$stn);
       return $re ? app_show(0,"信息更新成功"): error_show(1003,"信息更新失败");
     }
@@ -283,7 +283,7 @@ class Newfill extends BaseController
         $items['is_del']=1;
         $items['updatetime']=date("Y-m-d H:i:s");
         $result = Db::name("company_item")->save($items);
-        $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+        $stn = ["order_code"=>$items['name'],"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
         ActionLog::logAdd($token,$stn,"company_item",0,$stn);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }

app/admin/controller/Reorder.php

@@ -214,6 +214,7 @@ class Reorder extends \app\BaseController
            return error_show(1004,"未找到退货数据");
        }
        $orderinfo = Db::name("sale")->where(["orderCode"=>$info["orderCode"]])->find();
+
        $info['good_code'] = isset($orderinfo['good_code'])?$orderinfo['good_code']:'';
        $info['good_name'] = isset($orderinfo['good_name'])?$orderinfo['good_name']:'';
        $info['good_num'] = isset($orderinfo['good_num'])?$orderinfo['good_num']:'';

app/admin/controller/Resigninfo.php

@@ -118,7 +118,7 @@ class Resigninfo extends BaseController
             "updatetime"=>date("Y-m-d H:i:s"),
         ];
         $in = Db::name('resign_info')->insert($data);
-        $stn = ["order_code"=>$resign_id,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+        $stn = ["order_code"=>"BH","status"=>$status,"action_remark"=>'',"action_type"=>"create"];
         ActionLog::logAdd($this->post['token'],$stn,"resign_info",$status,$stn);
         return $in ? error_show(0,"添加成功") : error_show(1002,"添加失败");
     }
@@ -177,7 +177,7 @@ class Resigninfo extends BaseController
       ];
       $it = Db::name('resign_info')->where(['is_del'=>0,'id'=>$id])->save($str);
       if($it){
-          $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+          $stn = ["order_code"=>"BH","status"=>0,"action_remark"=>'',"action_type"=>"edit"];
           ActionLog::logAdd($this->post['token'],$stn,"resign_info",0,$stn);
           return error_show(0,"编辑成功");
       }else{
@@ -192,7 +192,7 @@ class Resigninfo extends BaseController
         }
         $num = Db::name('resign_info')->update(['is_del'=>1,'id'=>$id,"updatetime"=>date("Y-m-d H:i:s")]);
         if($num){
-            $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+            $stn = ["order_code"=>"BH","status"=>0,"action_remark"=>'',"action_type"=>"delete"];
             ActionLog::logAdd($this->post['token'],$stn,"resign_info",0,$stn);
             return error_show(0,"删除成功");
         }else{
@@ -219,7 +219,7 @@ class Resigninfo extends BaseController
         $st['updatetime']= date('Y-m-d H:i:s');
         $sv = Db::name('resign_info')->save($st);
         if($sv){
-            $stn = ["order_code"=>$id,"status"=>$tn,"action_remark"=>'',"action_type"=>"edit"];
+            $stn = ["order_code"=>"BH","status"=>$tn,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$stn,"resign_info",$stauts,$stn);
             return error_show(0,"状态更新成功");
         }else{

app/admin/controller/Result.php

@@ -109,7 +109,7 @@ class Result extends BaseController
             "updatetime" => date("Y-m-d H:i:s"),
         ];
         $stn = Db::name('result_info')->where(['is_del' => 0, 'id' => $id])->save($li);
-        $st = ["order_code"=>$id,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+        $st = ["order_code"=>"RKD","status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
         ActionLog::logAdd($this->post['token'],$st,"resign_info",$status,$st);
         return $stn ? error_show(0, "编辑成功") : error_show(1002, "编辑失败");
     }
@@ -123,7 +123,7 @@ class Result extends BaseController
         }
         $back = Db::name('result_info')->update(['id' => $id, 'is_del' => 1, 'updatetime' => date('Y-m-d H:i:s')]);
         if ($back) {
-            $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+            $st = ["order_code"=>"RKD","status"=>0,"action_remark"=>'',"action_type"=>"delete"];
             ActionLog::logAdd($this->post['token'],$st,"resign_info",0,$st);
             return error_show(0, '删除成功');
         } else {
@@ -147,7 +147,7 @@ class Result extends BaseController
         $pd ['updatetime'] = date('Y-m-d H:i:s');
         $tn = Db::name('result_info')->save($pd);
         if ($tn) {
-            $st = ["order_code"=>$id,"status"=>$de,"action_remark"=>'',"action_type"=>"edit"];
+            $st = ["order_code"=>"RKD","status"=>$de,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$st,"resign_info",$pd['status'],$st);
             return error_show(0, "状态更新成功");
         } else {

app/admin/controller/Role.php

@@ -16,12 +16,10 @@ class Role extends BaseController
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
-
         }
         $effetc = VerifyTokens($token);
         if(!empty($effetc) && $effetc['code']!=0){
             return error_show($effetc['code'],$effetc['message']);
-
         }
     }
 
@@ -65,6 +63,14 @@ class Role extends BaseController
      */
     public function RoleAdd(){
         $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
         $creater= GetUserInfo($post['token']);
         if(isset($creater['code'])&&$creater['code']==0){
             $uid= isset($userinfo['data']['id']) ? $userinfo['data']['id']: "0";
@@ -128,7 +134,7 @@ class Role extends BaseController
             ];
             $role= Db::name("role")->insert($list,true);
             $st = ["order_code"=>$role_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$st,"role",1,$st);
+            ActionLog::logAdd($token,$st,"role",1,$st);
             if($role>0){
                 $role_action = [
                     "role_id"=>$role,
@@ -142,7 +148,7 @@ class Role extends BaseController
                 $roleaction= Db::name("role_action")->insert($role_action,true);
                 if($roleaction){
                     $sty = ["order_code"=>$role,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                    ActionLog::logAdd($this->post['token'],$sty,"role_action",1,$sty);
+                    ActionLog::logAdd($token,$sty,"role_action",1,$sty);
                     Db::commit();
                     return app_show(0,"新建成功");
                 }else{
@@ -198,7 +204,14 @@ class Role extends BaseController
      */
     public function RoleSave(){
         $post  =$this->request->post();
-
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
         $roleid= isset($post['roleid']) ? intval($post['roleid']) : "";
         if($roleid==""){
             return error_show(1001,'roleid不能为空');
@@ -255,8 +268,8 @@ class Role extends BaseController
                 'id'=>$roleid
             ];
             $role= Db::name("role")->save($list);
-            $stm = ["order_code"=>$roleid,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-            ActionLog::logAdd($this->post['token'],$stm,"resign_info",0,$stm);
+            $stm = ["order_code"=>"YS","status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($token,$stm,"resign_info",0,$stm);
             if($role){
                 $role_action = [
                     "role_id"=>$roleid,
@@ -267,8 +280,8 @@ class Role extends BaseController
                 ];
                 $roleaction= Db::name("role_action")->where("role_id","=",$roleid)->update($role_action);
                 if($roleaction){
-                    $stl = ["order_code"=>$roleid,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$stl,"role_action",0,$stl);
+                    $stl = ["order_code"=>"YS","status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($token,$stl,"role_action",0,$stl);
                     Db::commit();
                     return app_show(0,"更新成功");
                 }else{
@@ -292,7 +305,14 @@ class Role extends BaseController
      */
     public function RoleStatus(){
         $post  =$this->request->post();
-
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
         $roleid= isset($post['roleid']) ? intval($post['roleid']) : "";
         if($roleid==""){
             return error_show(1001,'roleid不能为空');
@@ -319,7 +339,7 @@ class Role extends BaseController
                 if($action){
 
                     $sti = ["order_code"=>$roleid,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$sti,"role_action",0,$sti);
+                    ActionLog::logAdd($token,$sti,"role_action",$status,$sti);
                     Db::commit();
                     return app_show(0,"状态更新成功");
                 }

app/admin/controller/Sale.php

@@ -1041,6 +1041,7 @@ class Sale extends BaseController
      */
     public function diffcheck()
     {
+        $token = isset($this->post['token']) && $this->post['token'] !== "" ? trim($this->post['token']) : "";
         $id = isset($this->post['id']) && $this->post['id'] !== "" ? intval($this->post['id']) : "";
         if ($id === "") {
             return error_show(1004, "参数id不能为空");
@@ -1083,6 +1084,7 @@ class Sale extends BaseController
      */
     public function diffstatus()
     {
+        $token = isset($this->post['token']) && $this->post['token'] !== "" ? trim($this->post['token']) : "";
         $id = isset($this->post['id']) && $this->post['id'] !== "" ? intval($this->post['id']) : "";
         if ($id === "") {
             return error_show(1004, "参数id不能为空");

app/admin/controller/Supplier.php

@@ -122,7 +122,7 @@ public function create(){
         "is_platform"=>$is_platform
     ];
     $join = Db::name('supplier')->insert($data);
-    $st = ["order_code"=>$code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+    $st = ["order_code"=>"GYS","status"=>0,"action_remark"=>'',"action_type"=>"create"];
     ActionLog::logAdd($this->post['token'],$st,"role_share",0,$st);
     return $join? error_show(0,"添加成功") :error_show(1002,"添加失败");
 }
@@ -180,7 +180,7 @@ public function edit(){
         "updatetime"=>date("Y-m-d H:i:s")
     ];
     $ed = Db::name('supplier')->where(['is_del'=>0,'id'=>$id])->save($vmp);
-    $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+    $st = ["order_code"=>"GYS","status"=>0,"action_remark"=>'',"action_type"=>"edit"];
     ActionLog::logAdd($this->post['token'],$st,"role_share",0,$st);
     return $ed ? error_show(0,"编辑成功") : error_show(1002,"编辑失败");
 }

app/admin/model/ActionLog.php

@@ -33,7 +33,7 @@ class ActionLog extends Model
             "role_id"=>$roleid,
             "action_status"=>$status,
             "action_remark"=>isset($order[ 'remark']) ? trim($order['remark']) :"",
-            "order_code"=>isset($order['order_code']) ? trim($order['order_code']) :"",
+            "order_code"=>isset($order['order_code']) ? trim($order['order_code']."") :"",
             "order_type"=>$type,
             "action_type"=>isset($order['action_type']) ? trim($order['action_type']) :"",
             "action_data"=>json_encode($post),