ad

app/admin/controller/Account.php

@@ -22,9 +22,7 @@ class Account extends Base
             'page|页码' => 'require|number|gt:0',
             'size|每页数量' => 'require|number|elt:100',
         ]);
-
         if (!$val->check($param)) return json_show(1004, $val->getError());
-
         return AccountLogic::getAccountList($param);
     }
 
@@ -69,9 +67,7 @@ class Account extends Base
         ]);
 
         if (!$val->check($param)) return json_show(1004, $val->getError());
-
         $token = $this->request->filter('trim')->post('token');
-
         return AccountLogic::addAccount($param, $token);
 
     }

app/admin/controller/Action.php

@@ -110,7 +110,6 @@ class Action extends BaseController
             ->select()
             ->toArray();
         foreach ($child as $k => $value) {
-            // $act = PasAction::all(['menuid'=>$value['id'],"status"=>1]);
             $act = Db::name("action")
                 ->alias("a")
                 ->leftJoin("action_list l", "a.action_code=l.action_code")
@@ -118,10 +117,6 @@ class Action extends BaseController
                 ->where(['a.menuid' => $value['id'], "a.status" => 1])
                 ->select()
                 ->toArray();
-//            $act_data = Db::name("action_field")
-//                ->where(['menuid' => $value['id'], "status" => 1])
-//                ->select()
-//                ->toArray();
             $value['action'] = $act;
             $value['action_data'] =[];
             if (array_key_exists($value['pid'], $result)) {

app/admin/controller/Activity.php

@@ -691,7 +691,7 @@ class Activity extends Base
       if($skuCode==""){
           return error_show(1004,"参数skuCode不能为空");
       }
-      $where=['a.is_del'=>0,"b.is_del"=>0,"a.status"=>6,"b.status"=>1,"b.skuCode"=>$skuCode];
+      $where=['a.is_del'=>0,"b.is_del"=>0,"a.status"=>3,"b.status"=>1,"b.skuCode"=>$skuCode];
       $condition=['a.skuCode' =>$skuCode,"a.is_del"=>0,'a.exam_status'=>3];
       $company =  isset($this->post['companyNo'])&&$this->post['companyNo']!=""?trim($this->post['companyNo']):"";
       if($company!=""){

app/admin/controller/Business.php

@@ -19,10 +19,6 @@ class Business extends Base
         if ($company == "") {
             return error_show(1002, "参数company不能为空");
         }
-//        $companyinfo = Db::name('business')->where(['is_del' => 0, 'company' => $company])->find();
-//        if (!empty($companyinfo)) {
-//            return error_show(1002, "企业公司名称已存在");
-//        }
         $type = isset($this->post['type']) && $this->post['type'] !== "" ? trim($this->post['type']) : "";
         if ($type == "") {
             return error_show(1002, "参数type不能为空");
@@ -68,23 +64,13 @@ class Business extends Base
             return error_show(1002, "参数inv_scope不能为空");
         }
         $license_img = isset($this->post['license_img']) && $this->post['license_img'] !== "" ? trim($this->post['license_img']) : "";
-//        if($license_img==""){
-//            return error_show(1002,"参数license_img不能为空");
-//        }
         $token = isset($this->post['token']) && $this->post['token'] != '' ? trim($this->post['token']) : "";
         if ($token == '') {
             return error_show(105, "参数token不能为空");
         }
-//        $user =GetUserInfo($token);
-//        if(empty($user)||$user['code']!=0){
-//            return error_show(102,"创建人数据不存在");
-//        }
         $createrid = $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater = $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "1";
-//        Db::startTrans();
-//       try{
-
         $data = [
             "company" => $company,
             "companyNo" => $companyNo,
@@ -111,25 +97,11 @@ class Business extends Base
         $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('bCreate', $data);
         return json_show($rs['code'], $rs['message'], $rs['data']);
-//           $datainfo = Db::name('business')->insert($data);
-//           if($datainfo){
-//               Db::commit();
-//               return error_show(0,"新建成功");
-//           }else{
-//               Db::rollback();
-//               return error_show(1004,"新建失败");
-//           }
-//       }catch (\Exception $e) {
-//       }
-//           Db::rollback();
-//           return error_show(1005, $e->getMessage());
-
 
     }
 
     public function list()
     {
-
         $param = $this->request->only([
             'page' => 1,
             'size' => 10,
@@ -140,58 +112,9 @@ class Business extends Base
             'end' => '',
             'company_name' => '',
         ], 'post', 'trim');
-
-//        $page = isset($this->post['page']) && $this->post['page'] !==""? intval($this->post['page']):"1";
-//        $size = isset($this->post['size']) && $this->post['size'] !==""? intval($this->post['size']):"10";
-//        $where = [["b.is_del","=",0]];
-//        $company = isset($this->post['company']) && $this->post['company'] !=="" ? trim($this->post['company']):"";
-//        if($company!==""){
-//            $where[]=['b.company',"like","%$company%"];
-//        }
-//        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
-//        if($status!==""){
-//            $where[]=['b.status',"=",$status];
-//        }
-//        $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? trim($this->post['creater']):"";
-//        if($creater!==""){
-//            $where[]=['b.creater',"like","%$creater%"];
-//        }
-//        $start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
-//        if($start!==""){
-//            $where[]=['b.addtime',">=",date('Y-m-d H:i:s',strtotime($start))];
-//        }
-//        $end = isset($this->post['end']) && $this->post['end']!=="" ? $this->post['end']:"";
-//        if($end!==""){
-//            $where[]=['b.addtime',"<",date('Y-m-d H:i:s',strtotime($end)+24*3600)];
-//        }
-//        $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
-//        if ($company_name !== "") $where[] = ["b.createrid", 'in', get_company_item_user_by_name($company_name)];
-
         $userCommon =\app\admin\common\User::getIns();
         $rs = $userCommon->handle('bGetList', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);
-
-//        $count = Db::name('business')
-//            ->alias('b')
-//            ->where($where)
-//            ->count();
-//        $total = ceil($count / $size);
-//        $page = $page >= $total ? $total : $page;
-//        $list = Db::name('business')
-//            ->alias('b')
-//            ->where($where)
-//            ->page($page,$size)
-//            ->field("b.id,b.company,b.companyNo,b.status,b.creater,b.addtime,b.type,u.itemid")
-//            ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
-//            ->order("addtime desc")
-//            ->append(['company_name'])
-//            ->withAttr('company_name',function ($val,$data){
-//                return implode('/', array_column(GetPart($data['itemid']), 'name'));
-//            })
-//            ->select()
-//            ->toArray();
-//
-//        return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
     }
 
     public function edit()
@@ -213,115 +136,11 @@ class Business extends Base
         $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('bEdit', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);
-
-//        $id = isset($this->post['id']) && $this->post['id'] !== "" ? intval($this->post['id']) : "";
-//        if ($id == "") {
-//            return error_show(1002, "参数id不能为空");
-//        }
-//       $idinfo = Db::name('business')->where(['id'=>$id,'is_del'=>0])->find();
-//       if($idinfo==""){
-//           return error_show(1003,"未找到数据");
-//       }
-//       $companyNo = makeNo("GS");
-//        $company = isset($this->post['company']) && $this->post['company'] !== "" ? trim($this->post['company']) : "";
-//        if ($company == "") {
-//            return error_show(1002, "参数company不能为空");
-//        }
-//        $type = isset($this->post['type']) && $this->post['type'] !== "" ? trim($this->post['type']) : "";
-//        if ($type == "") {
-//            return error_show(1002, "参数type不能为空");
-//        }
-//        $inv_code = isset($this->post['inv_code']) && $this->post['inv_code'] !== "" ? trim($this->post['inv_code']) : "";
-//        if ($inv_code == "") {
-//            return error_show(1002, "参数inv_code不能为空");
-//        }
-//        $inv_legaler = isset($this->post['inv_legaler']) && $this->post['inv_legaler'] !== "" ? trim($this->post['inv_legaler']) : "";
-//        if ($inv_legaler == "") {
-//            return error_show(1002, "参数inv_legaler不能为空");
-//        }
-//        $inv_time = isset($this->post['inv_time']) && $this->post['inv_time'] !== "" ? $this->post['inv_time'] : "";
-//        if ($inv_time == "") {
-//            return error_show(1005, '参数inv_time不能为空');
-//        }
-//        $inv_addr = isset($this->post['inv_addr']) && $this->post['inv_addr'] !== "" ? trim($this->post['inv_addr']) : "";
-//        if ($inv_addr == "") {
-//            return error_show(1002, "参数inv_addr不能为空");
-//        }
-//        $inv_bank = isset($this->post['inv_bank']) && $this->post['inv_bank'] !== "" ? trim($this->post['inv_bank']) : "";
-//        if ($inv_bank == "") {
-//            return error_show(1002, "参数inv_bank不能为空");
-//        }
-//        $inv_bankNo = isset($this->post['inv_bankNo']) && $this->post['inv_bankNo'] !== "" ? trim($this->post['inv_bankNo']) : "";
-//        if ($inv_bankNo == "") {
-//            return error_show(1002, "参数inv_bankNo不能为空");
-//        }
-//        $contactor = isset($this->post['contactor']) && $this->post['contactor'] !== "" ? trim($this->post['contactor']) : "";
-//        if ($contactor == "") {
-//            return error_show(1002, "参数contactor不能为空");
-//        }
-//        $mobile = isset($this->post['mobile']) && $this->post['mobile'] !== "" ? trim($this->post['mobile']) : "";
-//        if ($mobile == "") {
-//            return error_show(1002, "参数mobile不能为空");
-//        }
-//        $addr = isset($this->post['addr']) && $this->post['addr'] !== "" ? trim($this->post['addr']) : "";
-//        if ($addr == "") {
-//            return error_show(1002, "参数addr不能为空");
-//        }
-//        $inv_scope = isset($this->post['inv_scope']) && $this->post['inv_scope'] !== "" ? trim($this->post['inv_scope']) : "";
-//        if ($inv_scope == "") {
-//            return error_show(1002, "参数inv_scope不能为空");
-//        }
-//        $license_img = isset($this->post['license_img']) && $this->post['license_img'] !== "" ? trim($this->post['license_img']) : "";
-//        if($license_img==""){
-//            return error_show(1002,"参数license_img不能为空");
-//        }
-//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-//        if($token==''){
-//            return error_show(105,"参数token不能为空");
-//        }
-//        $user =GetUserInfo($token);
-//        if(empty($user)||$user['code']!=0){
-//            return error_show(102,"创建人数据不存在");
-//        }
-//        $createrid = $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-//        $creater = $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-//        $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "0";
-//        Db::startTrans();
-//        try{
-//            $info = Db::name('business')->save($data);
-//            if($info){
-//                Db::commit();
-//                return error_show(0,"更新成功");
-//            }else{
-//                Db::rollback();
-//                return error_show(1002,"更新失败");
-//            }
-//        }catch (\Exception $e) {
-//            Db::rollback();
-//            return error_show(1005, $e->getMessage());
-//        }
-
-
     }
 
     public function del()
     {
-//        $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
-//        if($id==""){
-//            return error_show(1002,"参数id不能为空");
-//        }
-//        $str= Db::name('business')->where(['id'=>$id,'is_del'=>0])->find();
-//        if(empty($str)){
-//            return error_show(1002,"未找到数据");
-//        }
-//        $end = Db::name('business')->update(['id'=>$id,'is_del'=>1]);
-//        if($end){
-//            return error_show(0,"删除成功");
-//        }else{
-//            return error_show(1002,"删除失败");
-//        }
         $param = $this->request->only(['id' => 0], 'post', 'trim');
-
         $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('delete', [
             'ids' => [$param['id']],
@@ -334,37 +153,13 @@ class Business extends Base
 
     public function status()
     {
-//        $id = isset($this->post['id']) && $this->post['id'] !==""? intval($this->post['id']):"";
-//        if($id==""){
-//            return error_show(1002,"参数id不能为空");
-//        }
-//        $info =  Db::name("business")->where([["id","=",$id],["is_del","=",0]])->find();
-//        if(!$info){
-//            return error_show(1002,"未找到对应数据");
-//        }
-//        $status =  isset($this->post['status']) && $this->post['status']!==""? intval($this->post['status']):"";
-//        if($status===""){
-//            return error_show(1002,"参数status不能为空");
-//        }
-//        if(!in_array($status,[0,1])){
-//            return error_show(1002,"参数status无效");
-//        }
-//        $info['status']=$status;
-//        $msg = $status==1?"启用":"禁用";
-//        $update = Db::name("business")->save($info);
-//        return  $update? error_show(0,"{$msg}成功"):error_show(1004,"{$msg}失败");
-
         $param = $this->request->only(['id', 'status'], 'post', 'trim');
-
         $val = Validate::rule([
             'id' => 'require|number|gt:0',
             'status|状态' => 'require|number|in:0,1'
         ]);
-
         if (!$val->check($param)) return json_show(1005, $val->getError());
-
         $userCommon = \app\admin\common\User::getIns();
-
         $rs = $userCommon->handle('status', [
             'id' => $param['id'],
             'status' => $param['status'],
@@ -377,43 +172,15 @@ class Business extends Base
 
     public function info()
     {
-//        $companyNo =isset($this->post['companyNo']) && $this->post['companyNo'] !==""? trim($this->post['companyNo']) :"";
-
         $param = $this->request->only(['companyNo'], 'post', 'trim');
-
         $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('bInfo', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);
-
-//        if($companyNo==""){
-//            return error_show(1004,"参数companyNo不能为空");
-//        }
-//        $tod=Db::name('business')->where(['companyNo'=>$companyNo,'is_del'=>0])->find();
-//        if($tod==""){
-//            return error_show(1002,"未找到数据");
-//        }
-//        $info = Db::name('company_type')->where(['id'=>$tod['type'],"is_del"=>0])->find();
-//
-//        $tod['companytype']=isset($info['company_type'])?$info['company_type']:"" ;
-//
-//        return app_show(0,"获取成功",$tod);
     }
 
     public function title()
     {
         $param = $this->request->only(['company_type' => '', 'status' => ''], 'post', 'trim');
-//        $where = [["is_del","=",0]];
-//        $company_type = isset($this->post['company_type']) && $this->post['company_type'] !=="" ? intval($this->post['company_type']):"";
-//        if($company_type!=""){
-//            $where[]=['company_type',"like","%$company_type%"];
-//        }
-//        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
-//        if($status!=""){
-//            $where[]=['status',"=",$status];
-//        }
-//        $list = Db::name('company_type')->where($where)->select();
-//        return app_show(0,"获取成功",$list);
-
         $userCommon = \app\admin\common\User::getIns();
         $rs = $userCommon->handle('bTitle', $param);
         return json_show($rs['code'], $rs['message'], $rs['data']);

app/admin/controller/Check.php

@@ -238,7 +238,7 @@ public function __construct(App $app)
             ->alias('a')
             ->join("warehouse_info b", "a.wsm_code = b.wsm_code", "left")
 //            ->join("supplier v", "v.code=b.supplierNo", "left")
-            ->field("a.status,a.apply_id,a.apply_name,a.type,a.addtime,a.wsm_code,a.check_code,b.name,a.id,b.supplierNo as code,a.companyNo")
+            ->field("a.status,a.apply_id,a.apply_name,a.type,a.addtime,a.wsm_code,a.check_code,b.name,a.id,b.supplierNo as code,b.supplierName,a.companyNo")
             ->where($where)
             ->page($page, $size)
             ->order("a.id desc")
@@ -256,7 +256,6 @@ public function __construct(App $app)
                 // var_dump(Db::name("depart_user")->getLastSql());
                 $value['rename'] = implode(",", $depart);
             }
-            $value['name'] =$supplier[$value['code']]??"";
             //是否具有编辑权限
             $value['is_allow_update'] = 0;
             if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;

app/admin/controller/Good.php

@@ -1282,8 +1282,6 @@ class Good extends Base
 
         $where = [["gl.is_del", "=", 0], ['gp.exam_status', '=', 3]];//exam_status==6已上线
         if ($param['good_type']!='') $where[] = ['gb.good_type', '=', $param['good_type']];
-//        if (!empty($param['start'])) $where[] = ['gl.addtime', '>=', $param['start']];
-//        if (!empty($param['end'])) $where[] = ['gl.addtime', '<=', $param['end'] . ' 23:59:59'];
         if ($param['is_stock']!='') $where[] = ['gb.is_stock', '=', $param['is_stock']];
         if (!empty($param['cat_id'])) $where[] = ['gb.cat_id', '=', $param['cat_id']];
         if (!empty($param['brand_id'])) $where[] = ['gb.brand_id', '=', $param['brand_id']];
@@ -1297,17 +1295,14 @@ class Good extends Base
         if (!empty($param['creater'])) $where[] = ['gb.creater', 'like', '%' . $param['creater'], '%'];
         if (!empty($param['platform_code'])) $where[] = ['gp.platform_code', 'like', '%' . $param['platform_code'], '%'];
         if (!empty($param['company_name'])) $where[] = ['gb.createrid', 'in', get_company_item_user_by_name($param['company_name'])];
-//        if (!empty($param['supplierNo'])) $where[] = ['supplierNo', 'like', '%'.$param['supplierNo'],'%'];
         if ($param['relaComNo'] != '') $where[] = ['gb.companyNo|gb.supplierNo', '=', $param['relaComNo']];
 
         //5.获取结果
         $count = Db::name('good_ladder')
             ->alias('gl')
-            //->field('gl.id,gl.skuCode,gp.spuCode,p.platform_name,gb.good_thumb_img,gb.good_name,gb.cat_id,gb.good_type,gb.is_stock,gb.brand_id,gp.plat_code,gl.min_num,gl.sale_price,gb.creater purchase,gb.creater,gb.companyNo,u.itemid')
-            ->leftJoin('good_platform gp', 'gp.skuCode=gl.skuCode AND gp.is_del=0')
+			->leftJoin('good_platform gp', 'gp.skuCode=gl.skuCode AND gp.is_del=0')
             ->leftJoin('platform p', 'p.id=gp.platform_code AND p.is_del=0')
             ->leftJoin('good gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
-//            ->leftJoin("depart_user u", "u.uid=gb.createrid AND u.is_del=0")
             ->where($where)
             ->count('gl.id');
 

app/admin/controller/Menu.php

@@ -17,61 +17,12 @@ class Menu extends Base
     public  function __construct(App $app)
     {
         parent::__construct($app);
-//        $this->post  =$this->request->post();
     }
 
-//    public function list()
-//    {
-//        $uid = $this->uid;
-//        if($uid==''){
-//            return error_show(101,'未找到用户信息');
-//        }
-//        $role =$this->checkRole();
-////        var_dump($role);
-//        if(empty($role)){
-//            return app_show(0,"获取成功",[]);
-//        }
-//        $data= Db::name("view_menu")->where('aid',"in",explode(",",$role['action_conllect']))->where(['status'=>1,"cstatus"=>1,"is_display"=>1])
-//            ->order("weight desc,id asc,cweight desc,cid asc")->select();
-//        $list=[];
-//        $act=[];
-//        foreach ($data as $value){
-//            $list[$value["id"]]['menu_name']=$value['menu_name'];
-//            $list[$value["id"]]['menu_img']=$value['menu_img'];
-//            $list[$value["id"]]['menu_route']=$value['menu_route'];
-//            $list[$value["id"]]['is_display']=$value['is_display'];
-//            $list[$value["id"]]['status']=$value['status'];
-//            $temp=[];
-//            $temp['menu_name']=$value['cname'];
-//            $temp['menu_img']=$value['cmenu_img'];
-//            $temp['menu_route']=$value['cmenu_route'];
-//            $temp['menu_url']=$value['cmenu_url'];
-//            $temp['status']=$value['cstatus'];
-//            $temp['is_private']=$value['cprivate'];
-//            $temp['is_display']=$value['cis_display'];
-//            $list[$value["id"]]['child'][$value['cid']]=$temp;
-//            $act[$value['id']][$value['cid']][]=$value['acode'];
-//            $list[$value["id"]]['child'][$value['cid']]['action']= $act[$value['id']][$value['cid']];
-//        }
-//        array_walk($list,function (&$value){
-//            $value['child']= array_values($value['child']);
-//        });
-//        return app_show(0,"获取成功",array_values($list));
-//    }
     public function list()
     {
         $post = $this->request->filter('trim')->post();
-
-//        $uid = $this->uid;
-//        if ($uid == '') {
-//            return error_show(101, '未找到用户信息');
-//        }
-
-        //相关权限等以后重新梳理
-//        $role = $this->checkRole();
-
         $where = [['status', '=', 1], ['cstatus', '=', 1], ['is_display', '=', 1]];
-
         //先把当前账号能看到的菜单筛选出来
         switch ($this->level) {
 
@@ -80,7 +31,6 @@ class Menu extends Base
                 $role['action_conllect'] = Db::name('action')
                     ->where(['is_del' => 0, 'status' => 1])
                     ->column('id');
-//                $where[] = ['blevel', 'in', [0, 1, 2]];
                 break;
             case 2:
                 $role['action_conllect'] = Db::name('user_role')
@@ -88,8 +38,6 @@ class Menu extends Base
                     ->leftJoin('role_action b', 'b.role_id=a.roleid')
                     ->where(['a.uid' => $this->uid, 'a.is_del' => 0, 'a.companyNo' => $post['relaComNo']])
                     ->value('b.action_conllect');
-
-//                $where[] = ['blevel', 'in', [0, $level]];
                 break;
 
             case 3:
@@ -99,25 +47,15 @@ class Menu extends Base
                     ->leftJoin('role_action b', 'b.role_id=a.roleid')
                     ->where(['a.uid' => $this->uid, 'a.is_del' => 0])
                     ->value('b.action_conllect');
-
-//                $where[] = ['blevel', 'in', [0, $level]];
                 break;
 
         }
-
-//        if (isset($post['level']) && $post['level'] !== '' && $post['level'] != 1) $where[] = ['blevel', 'in', [0, $post['level']]];
+        
         if (isset($post['level']) && $post['level'] !== '') $where[] = ['blevel', 'in', [0, $post['level']]];
         else {
             if ($this->level == 1) $where[] = ['blevel', 'in', [0, 1, 2]];
             else $where[] = ['blevel', 'in', [0, $this->level]];
         }
-
-//        if (empty($role['action_conllect'])) {
-//            return app_show(0, "获取成功", []);
-//        }
-
-//        if (!empty($role['action_conllect'])) $where[] = ['aid', 'in', $role['action_conllect']];
-
         $data = Db::name("view_menu")
             ->where($where)
             ->whereIn('aid', $role['action_conllect'])
@@ -158,14 +96,6 @@ class Menu extends Base
      */
     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();
@@ -324,14 +254,6 @@ class Menu extends Base
      */
     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){

app/admin/controller/OrderImport.php

@@ -179,81 +179,6 @@ class OrderImport extends Base
         } else $res['user_update'] = $res['confirm'];
 
         return app_show(0, '请求成功', $res);
-        /**
-         * $info = OIFCModel::alias('c')
-         * ->field('c.*,ce.*,b.company,ci.companyName CustomerCompanyName,s.name supplierName,a.activity_code')
-         * ->leftJoin('order_import_from_c_extend ce', 'ce.order_import_from_c_id=c.id')
-         * ->leftJoin('business b', 'b.companyNo=ce.companyNo AND b.is_del=0')
-         * ->leftJoin('customer_info ci', 'ci.companyNo=ce.customer_code AND ci.is_del=0')
-         * ->leftJoin('supplier s', 's.code=ce.supplierNo AND s.is_del=0')
-         * ->leftJoin('activity_info a', 'a.activity_code=ce.activity_code AND a.is_del=0')
-         * ->where('c.id', $id)
-         * ->where('c.status', '<>', OIFCModel::$status_wait_validate)
-         * ->findOrEmpty()
-         * ->toArray();//因为这里用的是模型，查询结果是一个对象
-         *
-         * if (!empty($info)) {
-         * $info['platform_names'] = Db::name('platform')
-         * ->where('platform_code', $info['platform_id'])
-         * ->where(['is_del' => 0, 'status' => 1])
-         * ->column('platform_name');
-         *
-         * if ($info['addr_code']) {
-         * $addr_code = explode(',', $info['addr_code']);
-         * $info['addr_name'] = GetAddr(json_encode(['provice_code' => $addr_code[0], 'city_code' => $addr_code[1], 'area_code' => $addr_code[2]]));
-         * } else $info['addr_name'] = '';
-         *
-         * $res['id'] = $info['id'];
-         * $res['status'] = $info['status'];
-         * $res['createrid'] = $info['createrid'];
-         * $res['creater'] = $info['creater'];
-         * $res['updateid'] = $info['updateid'];
-         * $res['updater'] = $info['updater'];
-         *
-         * //导入字段
-         * $res['import'] = [
-         * 'platform_code' => $info['platform_code'],
-         * 'platform_time' => $info['platform_time'],
-         * 'plat_code' => $info['plat_code'],
-         * 'sale_source' => $info['sale_source'],
-         * 'price' => $info['price'],
-         * 'num' => $info['num'],
-         * 'before_discount_all_price' => $info['before_discount_all_price'],
-         * 'activity_name' => $info['activity_name'],
-         * 'mode' => $info['mode'],
-         * 'order_remark' => $info['order_remark'],
-         * 'contactor' => $info['contactor'],
-         * 'mobile' => $info['mobile'],
-         * 'addr' => $info['addr'],
-         * ];
-         * //确认字段
-         * $res['confirm'] = $info;
-         *
-         * //用户编辑字段
-         * $user_update = Db::name('order_import_from_c_extend')
-         * ->alias('ce')
-         * ->field('ce.*,b.company,ci.companyName CustomerCompanyName,s.name supplierName,a.activity_code')
-         * ->leftJoin('business b', 'b.companyNo=ce.companyNo AND b.is_del=0')
-         * ->leftJoin('customer_info ci', 'ci.companyNo=ce.customer_code AND ci.is_del=0')
-         * ->leftJoin('supplier s', 's.code=ce.supplierNo AND s.is_del=0')
-         * ->leftJoin('activity_info a', 'a.activity_code=ce.activity_code AND a.is_del=0')
-         * ->where(['ce.order_import_from_c_id' => $id, 'ce.is_del' => 1])
-         * ->order('ce.addtime', 'desc')
-         * ->find();
-         *
-         * if (empty($user_update)) $res['user_update'] = $res['confirm'];
-         * else {
-         * if ($user_update['addr_code']) {
-         * $addr_code = explode(',', $user_update['addr_code']);
-         * $user_update['addr_name'] = GetAddr(json_encode(['provice_code' => $addr_code[0], 'city_code' => $addr_code[1], 'area_code' => $addr_code[2]]));
-         * } else $user_update['addr_name'] = '';
-         * $res['user_update'] = array_merge($res['confirm'], $user_update);
-         * }
-         *
-         * return app_show(0, '请求成功', $res);
-         *
-         * } else  return error_show(1005, '系统尚未解析完成，无法查看详情,请等待');
-         **/
     }
 
     //用户确认订单数据(编辑)

app/admin/controller/OrderOutChild.php

@@ -558,6 +558,8 @@ class OrderOutChild extends Base
                         'post_name' => $value['post_name'],
                         'post_code' => $value['post_code'],
                         'post_fee' => $value['post_fee'],
+                        'sender_id' => $this->uid,
+                        'sender' => $this->uname,
                         'status' => 2,
                         'sendtime' => $date,
                         'updatetime' => $date,

app/admin/controller/Orderuse.php

@@ -16,51 +16,20 @@ class Orderuse extends Base
         $param = $this->request->only(['order_use'], 'post', 'trim');
 
         $val = Validate::rule([
-//            'companyNo|公司编码' => 'require|length:18',
-//            'companyName|公司名称' => 'require|max:255',
             'order_use|订单用途' => 'require|max:255',
         ]);
 
         if ($val->check($param) == false) return json_show(1004, $val->getError());
-
-//        $order_use = isset($this->post['order_use']) && $this->post['order_use']!=="" ? trim($this->post['order_use']):"";
-//        if($order_use==""){
-//            return error_show(1002,"参数order_use不能为空");
-//        }
-//        $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(1002,"创建人数据不存在");
-//        }
-//        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-//        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-//        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"0";
-//        $data =[
-//            "order_use"=>$order_use,
-//            "creater"=>$creater,
-//            "createrid"=>$createrid,
-//            "status"=>0,
-//            "is_del"=>0,
-//            "addtime"=>date("Y-m-d H:i:s"),
-//            "updatetime"=>date("Y-m-d H:i:s")
-//        ];
-
         $tmp = Db::name('order_use')
             ->field('id')
             ->where([
                 'is_del' => 0,
-//                'companyNo' => $param['companyNo'],
                 'order_use' => $param['order_use'],
             ])
             ->findOrEmpty();
         if (!empty($tmp)) return json_show(1004, '同一公司下该订单用途已存在');
 
         $datainfo = Db::name('order_use')->insert([
-//            "companyNo" => $param['companyNo'],
-//            "companyName" => $param['companyName'],
             "order_use" => $param['order_use'],
             "creater" => $this->uname,
             "createrid" => $this->uid,
@@ -71,11 +40,6 @@ class Orderuse extends Base
         ]);
 
         return $datainfo ? app_show(0, "新建成功") : error_show(1002, "新建失败");
-//        if($datainfo){
-//            return error_show(0,"新建成功");
-//        }else{
-//            return error_show(1002,"新建失败");
-//        }
     }
 
     public function list()
@@ -144,39 +108,14 @@ class Orderuse extends Base
 
         $val = Validate::rule([
             'id' => 'require|number|gt:0',
-//            'companyNo|公司编码' => 'require|length:18',
-//            'companyName|公司名称' => 'require|max:255',
             'order_use|订单用途' => 'require|max:255',
         ]);
 
         if ($val->check($param) == false) return json_show(1004, $val->getError());
-
-
-//        $id = isset($this->post['id']) && $this->post['id'] !== "" ? intval($this->post['id']) : "";
-//        if ($id == "") {
-//            return error_show(1002, "参数id不能为空");
-//        }
-//        $info = Db::name('order_use')->where(['id' => $id, 'is_del' => 0])->find();
-//        if ($info == "") {
-//            return error_show(1004, "未找到数据");
-//        }
-//        $order_use = isset($this->post['order_use']) && $this->post['order_use'] !== "" ? trim($this->post['order_use']) : "";
-//        if ($order_use == "") {
-//            return error_show(1002, "参数order_use不能为空");
-//        }
-//        $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "0";
-//        $data = [
-//            "id" => $id,
-//            "order_use" => $order_use,
-//            "is_del" => 0,
-//            "updatetime" => date("Y-m-d H:i:s")
-//        ];
-
         $tmp = Db::name('order_use')
             ->field('id')
             ->where([
                 'is_del' => 0,
-//                'companyNo' => $param['companyNo'],
                 'order_use' => $param['order_use'],
             ])
             ->where('id', '<>', $param['id'])
@@ -187,42 +126,21 @@ class Orderuse extends Base
         $datainfo = Db::name("order_use")
             ->where(['is_del' => 0, 'id' => $param['id']])
             ->update([
-//                "companyNo" => $param['companyNo'],
-//                "companyName" => $param['companyName'],
                 "order_use" => $param['order_use'],
                 "updatetime" => date("Y-m-d H:i:s")
             ]);
 
         return $datainfo ? app_show(0, "编辑成功") : error_show(1002, "编辑失败");
-
-//        if ($datainfo) {
-//            return error_show(0, "编辑成功");
-//        } else {
-//            return error_show(1002, "编辑失败");
-//        }
     }
 
     public function dele()
     {
         $id = $this->request->filter('trim')->post('id/d', 0);
-//        $id = isset($this->post['id']) && $this->post['id'] !== "" ? intval($this->post['id']) : "";
-//        if ($id == "") {
-//            return error_show(1002, "参数id不能为空");
-//        }
-//        $info = Db::name('order_use')->where(['id' => $id, 'is_del' => 0])->find();
-//        if (empty($info)) {
-//            return error_show(1004, "未找到数据");
-//        }
         $item = Db::name('order_use')
             ->where(['is_del' => 0, 'id' => $id])
             ->update(['is_del' => 1, 'updatetime' => date("Y-m-d H:i:s")]);
 
         return $item ? app_show(0, "删除成功") : error_show(1002, "删除失败");
-//        if ($item) {
-//            return error_show(0, "删除成功");
-//        } else {
-//            return error_show(1002, "删除失败");
-//        }
     }
 
     public function status()
@@ -235,47 +153,21 @@ class Orderuse extends Base
         ]);
 
         if ($val->check($param) == false) return json_show(1004, $val->getError());
-
-//        $id = isset($this->post['id']) && $this->post['id'] !== "" ? intval($this->post['id']) : "";
-//        if ($id == "") {
-//            return error_show(1002, "参数id不能为空");
-//        }
-//        $info = Db::name("order_use")->where([["id", "=", $id], ["is_del", "=", 0]])->find();
-//        if (!$info) {
-//            return error_show(1002, "未找到对应数据");
-//        }
-//        $msg = $info['status'] == 0 ? "启用" : "禁用";
-//        $info['status'] = $info['status'] == 0 ? 1 : 0;
-//        $info['updatetime'] = date("Y-m-d H:i:s");
         $in = Db::name("order_use")
             ->where(['is_del' => 0, 'id' => $param['id']])
             ->where('status', '<>', $param['status'])
             ->update(['status' => $param['status'], 'updatetime' => date("Y-m-d H:i:s")]);
 
         return $in ? app_show(0, "操作成功") : error_show(1004, "操作失败");
-//        if ($in) {
-//            return app_show(0, "{$msg}成功");
-//        } else {
-//            return error_show(1004, "{$msg}失败");
-//        }
     }
 
     public function info()
     {
         $id = $this->request->filter('trim')->post('id/d', 0);
 
-//        $id = isset($this->post['id']) && $this->post['id'] !== "" ? trim($this->post['id']) : "";
-//        if ($id == "") {
-//            return error_show(1002, "参数id不能为空");
-//        }
         $info = Db::name('order_use')
             ->where(['id' => $id, 'is_del' => 0])
             ->findOrEmpty();
-//        if (empty($info)) {
-//            return error_show(1004, '未找到数据');
-//        }
-//        return app_show(0, "获取成功", $info);
-
         return empty($info) ? error_show(1004, '未找到数据') : app_show(0, "获取成功", $info);
     }
 

app/admin/controller/Process.php

@@ -68,22 +68,6 @@ class Process extends Base
             'orderCode'=>'require',
         ]);
         if (!$val->check($param)) return error_show(1004, $val->getError());
-//        $process_type = isset($this->post['type']) && $this->post['type'] != "" ? $this->post['type'] : "";
-//        if ($process_type == "") {
-//            return error_show(1004, "参数type 不能为空");
-//        }
-//        $orderCode = isset($this->post['orderCode']) && $this->post['orderCode'] != "" ? $this->post['orderCode'] : "";
-//        if ($orderCode == "") {
-//            return error_show(1004, "参数orderCode不能为空");
-//        }
-//        $list = Db::name("action_process")
-//            ->where(['order_type' => $param['type'], "is_del" => 0, "status" => 1])
-//            ->order("weight desc,id desc")
-//            ->column('*', 'order_process');
-
-        //根据所有的状态，查询对应的操作
-//        $order_process_s = array_column($list, 'order_process');
-
         $rs = Db::name("process_order")
             ->alias('a')
             ->leftJoin('action_process b', 'b.order_type=a.order_type AND b.order_process=a.action_process')
@@ -113,20 +97,8 @@ class Process extends Base
                 'status_name' => $value['status_name'],
                 'order_process' => $value['action_process']
             ];
-//            $value['order_process'] = isset($list[$value['action_process']]['order_process']) ? $list[$value['action_process']]['order_process'] : 0;
-//            $value['order_name'] = isset($list[$value['action_process']]['order_name']) ? $list[$value['action_process']]['order_name'] : '';
-//            $value['pid'] = isset($list[$value['action_process']]['pid']) ? $list[$value['action_process']]['pid'] : '';
-//            $value['status_name'] = isset($list[$value['action_process']]['status_name']) ? $list[$value['action_process']]['status_name'] : '';
-//            $value['roleid'] = isset($list[$value['action_process']]['roleid']) ? $list[$value['action_process']]['roleid'] : '';
-//            $value['status'] = isset($list[$value['action_process']]['status']) ? $list[$value['action_process']]['status'] : '';
-//            $value['weight'] = isset($list[$value['action_process']]['weight']) ? $list[$value['action_process']]['weight'] : '';
-//            $value['is_del'] = isset($list[$value['action_process']]['is_del']) ? $list[$value['action_process']]['is_del'] : '';
-
             $i++;
         }
-
-//        if ($node) array_unshift($node, ['status_name' => '创建', 'order_process' => -1]);
-
         return app_show(0, "获取成功", $data);
     }
 
@@ -148,7 +120,7 @@ class Process extends Base
 
         $list = ProcessModel::field('id,process_name,process_type,status,creater,addtime')
             ->where($where)
-            ->order(['weight'=>'desc','id'=>'desc'])
+            ->order(['id'=>'desc'])
             ->page($param['page'], $param['size'])
             ->select()
             ->toArray();
@@ -160,7 +132,11 @@ class Process extends Base
     //增加流程
     public function add()
     {
-        $param = $this->request->filter('trim')->only(['token', 'process_name', 'process_type', 'remark' => ''], 'post');
+        $param = $this->request->filter('trim')->only(['token',
+         'process_name',
+         'process_type',
+         'remark' => ''
+         ], 'post');
 
         $val = Validate::rule([
             'token' => 'require',

app/admin/controller/Purch.php

@@ -519,6 +519,7 @@ class Purch extends Base
         }
         $data['good_price'] = round(($data['pakge_fee']+$data['weight']*$data['gold_price']+$data['nake_fee']+$data['mark_fee']+$data['cert_fee']+$data['open_fee']/$data['good_num']+$data['teach_fee']*$data['weight']+$data['delivery_fee']),2);
         $data['total_fee'] = round($data['good_price']*$data['good_num'],2);
+        $data['origin_total'] = round($data['good_price']*$data['good_num'],2);
         $data['updatetime'] =date("Y-m-d H:i:s");
         $upd=Db::name("purchease_order")->save($data);
         if($upd){
@@ -1107,7 +1108,13 @@ class Purch extends Base
 
         $rs = Db::name("purchease_order")
             ->where('id', $data['id'])
-            ->update(['updatetime' => date('Y-m-d H:i:s'), 'gold_price' => $param['gold_price'],"good_price"=>$sale_price,"total_fee"=>$total_price]);
+            ->update([
+                'updatetime' => date('Y-m-d H:i:s'),
+                'gold_price' => $param['gold_price'],
+                "good_price"=>$sale_price,
+                "total_fee"=>$total_price,
+                "origin_total"=>$total_price
+                ]);
 
         return $rs ? app_show(0, '修改采购单实时金价成功') : error_show(1005, '修改采购单实时金价失败');
 

app/admin/controller/Resign.php

@@ -915,9 +915,8 @@ class Resign extends Base
             $sale_price = $goodnake['nake_total'];
             $total_price = round($info['good_num']*$sale_price,2);
         }
-
+         $cgd_origin_price = $goodnake['supplier_origin_price']??0;
         $cgdCode = makeNo("CG");
-
         $cg =["cgdNo"=>$cgdCode,
             "bkcode"=>$bk_code,
             "wsm_code"=>$wsm_code,
@@ -959,7 +958,7 @@ class Resign extends Base
             "updatetime"=>date("Y-m-d H:i:s"),
             'good_createrid' => $good['createrid'],
             'good_creater' => $good['creater'],//商品创建人
-            'supplier_origin_price'=>$good['supplier_origin_price'],//供应商采购成本
+            'supplier_origin_price'=>$cgd_origin_price,//供应商采购成本
 	        'cgd_supplier_code'=>$good['cgd_supplier_code'],//采购供应商编号
 	        'cgd_supplier_name'=>$good['cgd_supplier_name'],//采购供应商编号
 	        'cgd_apply_id'=>$good['cgd_apply_id'],//竞单人

app/admin/controller/Role.php

@@ -84,7 +84,7 @@ class Role extends Base
 //            "companyNo|业务公司编号" => "requireWithout:relaComNo|max:255",
             "action|角色权限" => "require|array",
             "is_allow_see_price|是否允许查看价格" => "require|in:0,1",
-            'private_field|关键字段权限' => 'require|array|max:3',
+            'private_field|关键字段权限' => 'require|array|max:10',
             "level|角色级别"=>"require|number|in:1,2,3",
         ]);
         if ($valid->check($post) == false) return error_show(1004, $valid->getError());
@@ -203,7 +203,7 @@ class Role extends Base
             "relaComNo|业务公司编号" => "requireIf:level,2|max:255",
             "action|角色权限" => "require|array",
             "is_allow_see_price|是否允许查看价格" => "require|in:0,1",
-            'private_field|关键字段权限'=>'require|array|max:3',
+            'private_field|关键字段权限'=>'require|array|max:10',
             "level|角色级别"=>"require|number|in:1,2,3",
         ]);
         if ($valid->check($post) == false) return error_show(1004, $valid->getError());

app/admin/controller/UserCompany.php

@@ -49,28 +49,7 @@ class UserCompany extends Base
         ]);
 
         if (!$val->check($param)) return json_show(1004, $val->getError());
-
-//        $role = Db::name('role')
-//            ->field('id')
-//            ->where('id', $param['roleid'])
-//            ->where('level', '<>', 1)
-//            ->findOrEmpty();
-//
-//        if (empty($role)) return json_show(1004, '角色不存在或等级不符合要求');
-
-//        $item = Db::name('company_item')
-//            ->field('id')
-//            ->where(['id' => $param['itemid'], 'companyNo' => $param['companyNo']])
-//            ->findOrEmpty();
-//        if (empty($item)) return json_show(1004, '该公司部门不存在');
-
-//        $tmp = Db::name('user_role')
-//            ->field('id')
-//            ->where(['uid' => $param['account_id'], 'companyNo' => $param['companyNo'], 'is_del' => 0])
-//            ->findOrEmpty();
-
         $date = date('Y-m-d H:i:s');
-
         $tmp = Db::name('user_role')
             ->field('id')
             ->where(['uid' => $param['account_id'], 'companyNo' => $param['companyNo'], 'is_del' => 0])

app/admin/model/CompanyPlatformCatProfit.php

@@ -11,10 +11,11 @@ use think\Model;
 class CompanyPlatformCatProfit extends Model
 {
     public function GetRate($companyNo,$cat_id,$platform,$field){
-        $rate=$this->where(['companyNo'=>$companyNo,'cat_id'=>$cat_id,'platform_id'=>$platform])->value($field,0);
-        if($rate==0){
+        $rate=$this->where(['companyNo'=>$companyNo,'cat_id'=>$cat_id,'platform_id'=>$platform])->value($field,'');
+        if($rate===''){
         	$parent = $this->name('cat')->where(['id'=>$cat_id])->value('pid',0);
         	if($parent>0)$rate=$this->GetRate($companyNo,$parent,$platform,$field);
+        	else$rate=0;
         }
         return $rate;
     }

app/admin/route/app.php

@@ -21,7 +21,6 @@ Route::rule('menuactionstatus', 'admin/Action/ActionStatus');
 Route::rule('menuactionadd', 'admin/Action/ActionAdd');
 Route::rule("menuactionlist", "admin/Action/index");
 Route::rule("menuactiondel", "admin/Menu/MenuActionDel");
-
 Route::rule("actiondata", "admin/Action/DataAction");
 Route::rule("actionsave", "admin/Action/ActionSave");
 Route::rule("actionstatus", "admin/Action/ActionStatus");
@@ -46,7 +45,6 @@ Route::rule('rolestatus', 'admin/Role/roleStatus');
 Route::rule('role_process_info', 'admin/Role/roleProcessInfo');//获取角色对应的流程权限id
 Route::rule('role_process_detail', 'admin/Role/roleProcessDetail');//获取角色对应的流程权限详情
 Route::rule('role_process_save', 'admin/Role/roleProcessSave');//修改角色对应的流程权限
-
 Route::rule('ulist', 'admin/Newfill/list');
 Route::rule('add', 'admin/Newfill/add');
 Route::rule('refresh', "admin/Newfill/refresh");
@@ -59,49 +57,42 @@ Route::rule('attend', 'admin/Departuser/attend');
 Route::rule('useredit', 'admin/Departuser/useredit');
 Route::rule('ifound', 'admin/Departuser/found');
 Route::rule('iuserdel', 'admin/Departuser/userdel');
-
 Route::rule('customerlist', 'admin/Customer/list');
 Route::rule('customercreate', 'admin/Customer/create');
 Route::rule('customerupdate', 'admin/Customer/update');
 Route::rule('customerselect', 'admin/Customer/info');
 Route::rule('customerdelect', 'admin/Customer/delete');
 Route::rule('customerstatus', 'admin/Customer/status');
-
 Route::rule('supplierlist', 'admin/Supplier/list');
 Route::rule('suppliercreate', 'admin/Supplier/create');
 Route::rule('supplieredit', 'admin/Supplier/edit');
 Route::rule('supplierselec', 'admin/Supplier/selec');
 Route::rule('supplierdelect', 'admin/Supplier/del');
 Route::rule('comprehensiveList', 'admin/Supplier/comprehensiveList');//供应商和业务企业合并列表
-
 Route::rule('resultlist', 'admin/Result/list');
 Route::rule('resultcreate', 'admin/Result/create');
 Route::rule('resultselect', 'admin/Result/selec');
 Route::rule('resultedit', 'admin/Result/edit');
 Route::rule('resultdel', 'admin/Result/del');
 Route::rule('resultstatu', 'admin/Result/statu');
-
 Route::rule('Resigninfolist', 'admin/Resigninfo/list');//离职交接单列表
 Route::rule('Resigninfocreate', 'admin/Resigninfo/create');//离职交接单创建
 Route::rule('Resigninfoselect', 'admin/Resigninfo/selec');
 Route::rule('Resigninfoedit', 'admin/Resigninfo/edit');//离职交接单编辑
 Route::rule('Resigninfodel', 'admin/Resigninfo/del');//离职交接单作废
 Route::rule('Resigninfostatu', 'admin/Resigninfo/statu');//离职交接单审核
-
-Route::rule('Consultlist', 'admin/Consult/list');
-Route::rule('Consultinfo', 'admin/Consult/info');
-
+//Route::rule('Consultlist', 'admin/Consult/list');
+//Route::rule('Consultinfo', 'admin/Consult/info');
 Route::rule('infolist', 'admin/Listcustomer/list');
-
 Route::rule('salecreate', 'admin/Sale/create');//参加销售订单
 Route::rule('salelist', 'admin/Sale/list');//销售订单列表
 Route::rule('saleedit', 'admin/Sale/edit');//编辑销售订单
 Route::rule('saleinfo', 'admin/Sale/info');//销售订单详情
-Route::rule('saledelect', 'admin/Sale/del');//删除销售订单
-Route::rule('salestatus', 'admin/Sale/status');
-Route::rule('salefee', 'admin/Sale/fee');
-Route::rule('saleout', 'admin/Sale/out');
-Route::rule('salecustomer', 'admin/Sale/customer');
+//Route::rule('saledelect', 'admin/Sale/del');//删除销售订单
+//Route::rule('salestatus', 'admin/Sale/status');
+//Route::rule('salefee', 'admin/Sale/fee');
+//Route::rule('saleout', 'admin/Sale/out');
+//Route::rule('salecustomer', 'admin/Sale/customer');
 Route::rule('xsaleout', 'admin/Sale/saleout');//发货申请单列表
 Route::rule('saleoutinfo', 'admin/Sale/outinfo');
 Route::rule('saleaddr', 'admin/Sale/addAddr');
@@ -112,7 +103,6 @@ Route::rule('exportsaleout', 'admin/Sale/exportSaleOut');//发货申请单导出
 Route::rule('saleoutreceipt', 'admin/Sale/saleoutReceipt');//发货申请单确认收货
 Route::rule('saleoutbatch', 'admin/Sale/outSendBatchByImport');//库管批量发货
 Route::rule('getlogisticsinformation', 'admin/Sale/getLogisticsInformation');//获取物流信息
-
 Route::rule('checkflist', 'admin/Check/flist');
 Route::rule('checklist', 'admin/Check/list');
 Route::rule('checkgood', 'admin/Check/goodlist');
@@ -123,7 +113,6 @@ Route::rule('checkedell', 'admin/Check/dell');//作废盘点单
 Route::rule('checkestatus', 'admin/Check/statu');
 Route::rule('checkexport', 'admin/Check/exportGood');
 Route::rule('checkimport', 'admin/Check/importGood');
-
 Route::rule('allotlist', 'admin/Allot/list');
 Route::rule('allotcreate', 'admin/Allot/create');
 Route::rule('allotedit', 'admin/Allot/edit');
@@ -134,7 +123,6 @@ Route::rule('allotgetont', 'admin/Allot/getont');
 Route::rule('allotgetin', 'admin/Allot/getin');
 Route::rule('allotvesio', 'admin/Allot/vesio');
 Route::rule('allotgood', 'admin/Allot/goodlist');
-
 //【运营账号】
 Route::rule('login', 'admin/User/login');//登录
 Route::rule('userlist', 'admin/User/list');//列表
@@ -144,7 +132,6 @@ Route::rule('userinfo', 'admin/User/userInfo');
 Route::rule('userall', 'admin/User/userAll');
 Route::rule('usersinglelist', 'admin/User/userSingleList');//超管账号列表
 Route::rule('passSetByPassword', 'admin/User/passSetByPassword');
-
 //【公司账号管理】
 Route::rule('userCompanyBasicAdd', 'admin/UserCompanyBasic/add');
 Route::rule('userCompanyBasicList', 'admin/UserCompanyBasic/getList');
@@ -161,15 +148,12 @@ Route::rule('userCompanyUpdate', 'admin/UserCompany/update');
 Route::rule('userCompanyStatus', 'admin/UserCompany/status');
 Route::rule('myCompanyList', 'admin/UserCompany/myCompanyList');
 Route::rule('changeMain', 'admin/UserCompany/changeMain');
-
-
 Route::rule("sharelist", "admin/Share/index");
 Route::rule("shareadd", "admin/Share/create");
 Route::rule("sharesave", "admin/Share/save");
 Route::rule("sharestatus", "admin/Share/status");
 Route::rule("sharedel", "admin/Share/delete");
 Route::rule("shareinfo", "admin/Share/read");
-
 Route::rule("loglist", "admin/System/index");
 Route::rule("versionlist", "admin/System/version");
 Route::rule("lastversion", "admin/System/LastVersion");
@@ -177,7 +161,6 @@ Route::rule("uploadimg", "admin/System/upload");
 Route::rule("uploadfile", "admin/System/upload_file");
 Route::rule("uploadvideo", "admin/System/upload_video");
 Route::rule("versionAdd", "admin/System/add");//添加版本信息
-
 Route::rule("wareadd", "admin/WareHouse/add");
 Route::rule("wareinfo", "admin/WareHouse/info");
 Route::rule("waresave", "admin/WareHouse/save");
@@ -185,7 +168,6 @@ Route::rule("waredel", "admin/WareHouse/delete");
 Route::rule("warelist", "admin/WareHouse/list");
 Route::rule("warestatus", "admin/WareHouse/status");
 Route::rule("warequery", "admin/WareHouse/select");
-
 Route::rule("province", "admin/Addr/province");
 Route::rule("city", "admin/Addr/city");
 Route::rule("area", "admin/Addr/area");
@@ -195,10 +177,10 @@ Route::rule("addrquery", "admin/Addr/query");
 Route::rule("goodlist", "admin/Good/list");
 Route::rule("goodlistByYz", "admin/Good/listByYz");
 Route::rule("goodwarn", "admin/Good/SetWarn");
-Route::rule("goodstatus", "admin/Good/SetStatus");
+//Route::rule("goodstatus", "admin/Good/SetStatus");
 Route::rule("goodstat", "admin/Good/Stat");//库存概况
 Route::rule("goodstock", "admin/Good/GetStock");
-Route::rule("goodall", "admin/Good/all");
+//Route::rule("goodall", "admin/Good/all");
 Route::rule("getCombind", "admin/Good/getCombind");
 Route::rule("getstockgod", "admin/Good/GetStockGod");//库存统计
 Route::rule("getstockwsm", "admin/Good/GetStockWsm");//库存统计
@@ -246,7 +228,6 @@ Route::rule("orderinreturn", "admin/Purchin/ReturnAdd");
 Route::rule("returnsend", "admin/Purchin/ReturnSend");
 Route::rule("returnstatus", "admin/Purchin/ReturnStatus");
 
-
 Route::rule("processlist", "admin/Process/list");
 Route::rule("processinfo", "admin/Process/info");
 Route::rule("process", "admin/Process/process");
@@ -264,7 +245,6 @@ Route::rule("expresslist", "admin/Express/list");
 Route::rule("expressuse", "admin/Express/SetUse");
 Route::rule("express", "admin/Express/GetExpress");
 
-
 Route::rule('catlist', 'admin/Cat/list');
 Route::rule('catplist', 'admin/Cat/plist');
 Route::rule('catcreate', 'admin/Cat/create');
@@ -277,13 +257,12 @@ Route::rule('cattlist', 'admin/Cat/tlist');
 Route::rule('catratedit', 'admin/Cat/ratedit');
 Route::rule('catwlist', "admin/Cat/wlist");
 
-Route::rule('backcreate', 'admin/Purchback/create');
-//Route::rule('backlist','admin/Purchback/list');
+//Route::rule('backcreate', 'admin/Purchback/create');
 Route::rule('backlist', 'admin/Purchin/returnList');
-Route::rule('backstatus', 'admin/Purchback/status');
-Route::rule('backfe', 'admin/Purchback/backfe');
-Route::rule('backinfo', 'admin/Purchback/info');
-Route::rule('backdel', 'admin/Purchback/delete');
+//Route::rule('backstatus', 'admin/Purchback/status');
+//Route::rule('backfe', 'admin/Purchback/backfe');
+//Route::rule('backinfo', 'admin/Purchback/info');
+//Route::rule('backdel', 'admin/Purchback/delete');
 
 Route::rule('aftercreate', 'admin/After/create');
 Route::rule('afterinfo', 'admin/After/info');
@@ -314,11 +293,10 @@ Route::rule('orderbackcheck', 'admin/Orderback/check');
 Route::rule('orderbce', 'admin/Orderback/CheckExam');
 Route::rule('orderbackexam', 'admin/Orderback/Exam');
 Route::rule('orderbackexamnew', 'admin/Orderback/ExamNew');//新写退货接口
-
-Route::rule('goldlist', 'admin/Gold/list');
-Route::rule('goldadd', 'admin/Gold/add');
-Route::rule('gold', 'admin/Gold/GetByType');
-
+//
+//Route::rule('goldlist', 'admin/Gold/list');
+//Route::rule('goldadd', 'admin/Gold/add');
+//Route::rule('gold', 'admin/Gold/GetByType');
 Route::rule('reorderlist', 'admin/Reorder/list');//退货单列表
 Route::rule('reordercreate', 'admin/Reorder/create');//批量退货
 Route::rule('reorderinfo', 'admin/Reorder/info');
@@ -335,10 +313,10 @@ Route::rule('reorder_child_receive', 'admin/ReorderChild/receive');//退货工
 Route::rule('reorder_child_info', 'admin/ReorderChild/info');//退货工单详情
 Route::rule('reorder_child_set_record', 'admin/ReorderChild/setRecord');//更新退货工单标记
 
-Route::rule('salezxcreate', 'admin/Salezx/create');
-Route::rule('salezxedit', 'admin/Salezx/edit');
-Route::rule('salezxout', 'admin/Salezx/out');
-Route::rule('salezxaddr', 'admin/Salezx/outaddr');
+//Route::rule('salezxcreate', 'admin/Salezx/create');
+//Route::rule('salezxedit', 'admin/Salezx/edit');
+//Route::rule('salezxout', 'admin/Salezx/out');
+//Route::rule('salezxaddr', 'admin/Salezx/outaddr');
 
 Route::rule('saledifflist', 'admin/Sale/difflist');
 Route::rule('salediffcheck', 'admin/Sale/diffcheck');
@@ -373,7 +351,7 @@ Route::rule('brandedit', 'admin/Brand/edit');
 Route::rule('brandstatus', 'admin/Brand/status');
 Route::rule('branddel', 'admin/Brand/del');
 Route::rule('brandinfo', 'admin/Brand/info');
-
+//分类售后说明
 Route::rule('desccreate', 'admin/Catdesc/create');
 Route::rule('desclist', 'admin/Catdesc/list');
 Route::rule('descstatus', 'admin/Catdesc/status');
@@ -438,7 +416,6 @@ Route::rule('goodoffdetail', 'admin/GoodOfflineLog/getDetail');
 Route::rule("goodchangelog", "admin/Goodup/changeLog");
 Route::rule("goodcompliance", "admin/Goodup/AddCompliance");
 Route::rule('goodupbaseiczx', 'admin/Goodup/basicZixunGoods');//咨询成交商品池-商品上线
-
 Route::rule('goodproof', 'admin/Goodup/prooflist');
 
 Route::rule('activitylist', 'admin/Activity/list');
@@ -481,12 +458,11 @@ Route::rule('titledelete', 'admin/Title/del');
 Route::rule('titlestatus', 'admin/Title/status');
 
 Route::rule('ocrquery', 'admin/Ocrlicense/query');
-
 Route::rule('consultlists', 'admin/Consult/conlist');
-Route::rule('consultinfo', 'admin/Consult/info');
+//Route::rule('consultinfo', 'admin/Consult/info');
 Route::rule('consultdel', 'admin/Consult/delete');
 Route::rule('consultcreate', 'admin/Consult/create');
-Route::rule('consultzxadd', 'admin/Consult/zxadd');
+//Route::rule('consultzxadd', 'admin/Consult/zxadd');
 Route::rule('consultzxinfo', 'admin/Consult/zxinfo');
 Route::rule('consultbar', 'admin/Consult/bargain');
 Route::rule('consultfeed', 'admin/Consult/feadback');
@@ -503,7 +479,6 @@ Route::rule('bargainlist', 'admin/Consult/bragain_list');
 Route::rule('bidscheck', 'admin/Consult/bids_check');
 
 Route::rule('crontablist', 'admin/Consult/crontablist');
-
 Route::rule('supplercreate', 'admin/Suppler/create');
 Route::rule('supplerlist', 'admin/Suppler/list');
 Route::rule('suppleredit', 'admin/Suppler/edit');
@@ -524,7 +499,6 @@ Route::rule("projectfeeddheck", "admin/Project/feedCheck");
 Route::rule("plandheck", "admin/Project/planCheck");
 Route::rule("projectrate", "admin/Project/changeRate");
 Route::rule("projectfeeddel", "admin/Project/feeddel");
-
 Route::rule("exclulist", "admin/Exclusive/list");
 Route::rule("excluadd", "admin/Exclusive/add");
 Route::rule("exclustatus", "admin/Exclusive/status");//业务参数-专属类型管理的启用/禁用
@@ -625,8 +599,6 @@ Route::rule('r_goodCostZhaoExport', 'admin/ReportByRelaComNo/goodCostZhaoExport'
 Route::rule('r_goodPriceZhao', 'admin/ReportByRelaComNo/goodPriceZhao');//【商品信息】售价(赵丹要的)_列表
 Route::rule('r_goodPriceZhaoExport', 'admin/ReportByRelaComNo/goodPriceZhaoExport');//【商品信息】售价(赵丹要的)_导出
 
-
-
 //采购预约报表
 Route::rule("execlist", 'admin/Exec/list');
 Route::rule("execsave", 'admin/Exec/save');

app/command/OutChildSend.php

@@ -23,10 +23,8 @@ class OutChildSend extends Command
         // 指令输出
         $key='outchildsend';
         $rs = Cache::store('redis')->get($key);
-        if ($rs!=1){
-            Cache::store('redis')->set($key,1,3600);
-            return true;
-        }
+        if ($rs==1)return true;
+        Cache::store('redis')->set($key,1,3600);
         $date = date("Y-m-d H:i:s",time()-3600);
         $list = OrderOutChild::where([["addtime",">=",$date],["is_del","=",0]])->hidden(["id"])->select();
         if($list->isEmpty()==false){

app/command/handleYzOrderData.php

@@ -55,7 +55,6 @@ class handleYzOrderData extends Command
                     ->alias('py')
                     ->field('py.id,py.skuCode,py.spuCode,py.plat_code,p.platform_name,py.sale_price,g.*,py.platform_id')
                     ->leftJoin('platform p', 'p.id=py.platform_id AND p.is_del=0')
-//                    ->leftJoin('customer_org1 co', 'co.name=p.platform_name AND co.is_del=0')
                     ->leftJoin('good g', 'g.spuCode=py.spuCode AND g.is_del=0')
                     ->where('py.skuCode', $c_data['skuCode'])
                     ->where('py.exam_status', 6)//exam_status==3已上线

app/common.php

@@ -1017,8 +1017,8 @@ if (!function_exists('excelSaveFile')) {
 
         $dir = root_path() . 'public/storage/report/' . date("YmdHis") . "/";
         if (!is_dir($dir)) mkdir($dir, 0777, true);
-        PHPExcel_Settings::setCacheStorageMethod();
-        PHPExcel_CachedObjectStorageFactory::cache_in_memory_gzip;//单元格缓存为MemoryGZip
+//        PHPExcel_Settings::setCacheStorageMethod();
+//        PHPExcel_CachedObjectStorageFactory::cache_in_memory_gzip;//单元格缓存为MemoryGZip
         $objPHPExcel = new PHPExcel();
 
         $keyA = 0; // 设置表头
@@ -1627,11 +1627,6 @@ function endTime($time){
 if (function_exists('get_budget') == false) {
     function get_budget(int $cat_id = 0, string $relaComNo = '', int $platform_id = 0,bool $is_show_more=false)
     {
-//        $sale_rate_1 = (new \app\admin\model\CompanyCatProfit)->GetAllRate($relaComNo,$cat_id);
-//		if($sale_rate_1->isEmpty()) throw new \think\Exception("该分类未找到有关毛利信息");
-//        $sale_rate_2 = Db::name('company_platform_cat_profit')
-//            ->where(['is_del' => 0, 'companyNo' => $relaComNo, 'platform_id' => $platform_id, 'cat_id' => $cat_id, 'status' => 1])
-//            ->findOrEmpty();
 
         if ($is_show_more) {
 	        $sale_rate_1 = (new \app\admin\model\CompanyCatProfit)->GetAllRate($relaComNo,$cat_id);

app/txx/controller/Good.php

@@ -18,7 +18,7 @@ class Good extends BaseController
 {
 	protected $uid=0;
 	protected $uname='';
-	protected $platformid=37;
+	protected $platformid=[37,79];
 	/**@param array snArr 商品编号sn数组
      * @param string actCode 活动编号
 	* @return \think\response\Json
@@ -461,22 +461,27 @@ class Good extends BaseController
             'plat_code' => '',
             'exam_status' => '',
         ], 'post', 'trim');
-        $where = [["b.is_del", "=", 0],["b.platform_id","=",$this->platformid]];
+        $where = [["b.is_del", "=", 0],["b.platform_id","in",$this->platformid]];
         if ($param['good_name'] !== "") $where[] = ['a.good_name', 'like', '%' . $param['good_name'] . '%'];
         if ($param['skucode'] !== '') $where [] = ['b.skucode', 'like', '%' . $param['skucode'] . '%'];
         if ($param['plat_code'] !== '') $where[] = ["b.plat_code", "like", '%' . $param['plat_code'] . '%'];
         if ($param['exam_status'] !== '') {
-        	if($param['exam_status']==1){
-        		$where[] = ['b.exam_status', "=", 6];
-        	}else{
-        		$where[] = ['b.exam_status', "<>", 6];
-        	}
+        	 $where[]=[
+		        'b.exam_status' ,
+		        '=' ,
+		        $param['exam_status']
+	        ];
+//        	if($param['exam_status']==1){
+//        		$where[] = ['b.exam_status', "=", 6];
+//        	}else{
+//        		$where[] = ['b.exam_status', "<>", 6];
+//        	}
         }
 		if($this->request->isCx==1){
 			$field="b.skuCode,b.platform_id platform_code,b.plat_code,b.id as platform_youzan_id,a.cat_id,a.good_name,
-			a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,
-			a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,
-			a.creater purchase";
+			a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.supplierName,a.good_unit,
+			a.noble_metal,a.companyNo,a.companyName,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,
+			a.createrid purchase_id,a.creater purchase";
 		}else{
 			$field="b.skuCode,b.plat_code,b.id as platform_youzan_id,
             a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,a.brand_id,
@@ -513,18 +518,16 @@ class Good extends BaseController
 		    $unit = Db::name("unit")->where(["id" => array_column($list, 'good_unit')])->column('unit', 'id');
 		    if($this->request->isCx==1){
 			    $all_platform =Db::name("platform")->field('id,platform_name')->where(["id" =>array_column($list, 'platform_code')])->column('platform_name', 'id');
-			    $all_supplier = Db::name("supplier")->where(["code" =>array_column($list, 'supplierNo')])->column("name","code");
-			    $itemid_all =Db::name("depart_user")->where(["uid"=>array_column($list, 'purchase_id'),"is_del"=>0])->column("itemid",'uid');
+//			    $all_supplier = Db::name("supplier")->where(["code" =>array_column($list, 'supplierNo')])->column("name","code");
+			    $itemid_all =Db::connect("mysql_sys")->name("account_item")->where(["account_id"=>array_column($list,
+				    'purchase_id')])->column("itemid",'account_id');
 		    }
         foreach ($list as $value) {
-//            $brand = Db::name("brand")->field('id,brand_name')->where(["id" => $value['brand_id']])->find();
             $value["brand_name"] = $all_brand[$value['brand_id']]??"";
-
-//            $unit = Db::name("unit")->field('id,unit')->where(["id" => $value['good_unit']])->find();
             $value['unit'] = $unit[$value['good_unit']]??"";
-		    $value['exam_status'] = $value['exam_status']==6?1:0;
-            $value['origin_price'] =$yzadd[$value['skuCode']]? $yzadd[$value['skuCode']]['origin']??"":"";
-            $value['good_url'] =$yzadd[$value['skuCode']]? $yzadd[$value['skuCode']]['detail_url']??"":"";
+//		    $value['exam_status'] = $value['exam_status']==6?1:0;
+            $value['origin_price'] =isset($yzadd[$value['skuCode']])? $yzadd[$value['skuCode']]['origin']??"":"";
+            $value['good_url'] =isset($yzadd[$value['skuCode']])? $yzadd[$value['skuCode']]['detail_url']??"":"";
 
             $spec = Db::name("good_spec")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->select()->toArray();
             $speclist = [];
@@ -541,20 +544,15 @@ class Good extends BaseController
                 }
             }
             $value['good_img']=str_replace($this->origin_img_host,$this->ssl_img_host,$value['good_img']);
-            $value['good_info_img']=str_replace($this->origin_img_host,$this->ssl_img_host,$value['good_img']);
-            $value['good_thumb_img']=str_replace($this->origin_img_host,$this->ssl_img_host,$value['good_img']);
+            $value['good_info_img']=str_replace($this->origin_img_host,$this->ssl_img_host,$value['good_info_img']);
+            $value['good_thumb_img']=str_replace($this->origin_img_host,$this->ssl_img_host,$value['good_thumb_img']);
             if($this->request->isCx==1){
         	$value['cat_info'] = made($value['cat_id'], []);
-//            $platform = Db::name("platform")->field('id,platform_name')->where(["id" => $value['platform_code']])->find();
             $value['platform_name'] = $all_platform[$value['platform_code']]??"";
-//            $value['platform_code_en'] = isset($platform['platform_code_en']) ? $platform['platform_code_en'] : "";
-//            $supplier = Db::name("supplier")->field('id,name')->where(["code" => $value['supplierNo']])->find();
-            $value['supplier_name'] = $all_supplier[$value['supplierNo']]??"";
-//            $value['company'] = isset($company['company']) ? $company['company'] : "";
             $value['stock_total'] = Db::name("good_stock")->where(['spuCode' => $value['spuCode'], "is_del" => 0])->sum("usable_stock");
             $value['exclusive'] = makeExcluse($value['is_exclusive']);
             $value['noble_name'] = isset($value['noble_metal']) && $value['noble_metal'] != 0 ? $this->noble[$value['noble_metal']] : "";
-            $value['company_name'] = implode('/', array_column(GetPart($itemid_all[$value['purchase_id']]), 'name'));
+            $value['company_name'] = implode('/', array_column(GetPart($itemid_all[$value['purchase_id']]??0), 'name'));
         	}else{
             unset($value['brand_id']);
 			unset($value['good_unit']);

app/txx/controller/TxGood.php

@@ -15,7 +15,7 @@ use think\facade\Validate;
 
 class TxGood extends Base
 {
-	private $platform_id=37;
+	private $platform_id=[37,79];
 	public  $origin_img_host ='http://stock.api.wanyuhengtong.com';
     public  $ssl_img_host ='https://image.wanyuhengtong.com';
 	public function __construct(App $app) {
@@ -73,7 +73,7 @@ class TxGood extends Base
 	
 	public function list(){
 		$param = $this->request->param(["page"=>1,"size"=>15,"good_name"=>""],'post','trim');
-		$where = [['b.is_del', '=', 0],['a.is_del', '=', 0],['b.platform_id','=',$this->platform_id],['b.exam_status',
+		$where = [['b.is_del', '=', 0],['a.is_del', '=', 0],['b.platform_id','in',$this->platform_id],['b.exam_status',
 		'=',6]];
 		$param['good_name']!=''??$where[]=["c.good_name","like","%{$param['good_name']}%"];
 		$actUrl= new ActGoodurl();

app/txx/middleware/CheckAuth.php

@@ -47,7 +47,7 @@ class CheckAuth
     }
 	public function end(Response $response)
 	{
-//		Log::write("response:".json_encode($response->getContent(),JSON_UNESCAPED_UNICODE),"info");
+
 	}
 	/**数据接口签名验证
 	* @param $data