细节优化，暂时不记录日志及待办

app/admin/controller/Good.php

@@ -132,16 +132,16 @@ class Good extends Base
             ->alias("a")
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
 //            ->leftJoin("supplier s","a.supplierNo=s.code")
-            ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
+//            ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
             ->leftJoin("platform p","p.id=b.platform_code")
             ->where('p.platform_type',0)//只筛选非对接平台的商品
             ->where($where)
-            ->count();
+            ->count('a.id');
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good')
             ->alias("a")
-            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_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.is_stock")
+            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_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.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,a.is_stock,p.platform_name")
             //成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")
 //            ->leftJoin("supplier s","a.supplierNo=s.code")
@@ -165,16 +165,16 @@ class Good extends Base
             ->where(['id'=>array_column($list,'good_unit')])
             ->column('unit','id');
 
-        $userCommon = \app\admin\common\User::getIns();
-        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'companyNo'),
-        array_column($list,'supplierNo'))]);
+//        $userCommon = \app\admin\common\User::getIns();
+//        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'companyNo'),
+//        array_column($list,'supplierNo'))]);
 
         $data=[];
         foreach ($list as $value){
-            $value['cat_info']= made($value['cat_id'],[]);
-            $platform = Db::name("platform")->where(["id"=>$value['platform_code']])->find();
-            $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name']:"";
-            $value['platform_code_en'] = isset($platform['platform_code_en']) ? $platform['platform_code_en']:"";
+            $value['cat_info']= made($value['cat_id']);
+//            $platform = Db::name("platform")->where(["id"=>$value['platform_code']])->find();
+//            $value['platform_name'] = isset($platform['platform_name']) ? $platform['platform_name']:"";
+//            $value['platform_code_en'] = isset($platform['platform_code_en']) ? $platform['platform_code_en']:"";
 //            $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
 //            $value['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
 //            $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
@@ -182,8 +182,8 @@ class Good extends Base
 //            $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
             $value['unit'] =$unit[$value['good_unit']]??'';//isset($unit['unit'])?$unit['unit']:"";
 //            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
-            $value['company'] = $names['data'][$value['companyNo']]??'';//isset($company['company'])?$company['company']:"";
-            $value['supplierName'] = $names['data'][$value['supplierNo']]??'';//isset($company['company'])//?$company['company']:"";
+            $value['company'] = $value['companyName'];//$names['data'][$value['companyNo']]??'';//isset($company['company'])?$company['company']:"";
+//            $value['supplierName'] = $names['data'][$value['supplierNo']]??'';//isset($company['company'])//?$company['company']:"";
             $value['stock_total'] = Db::name("good_stock")->where(['spuCode'=>$value['spuCode'],"is_del"=>0])->sum("usable_stock");
             $value['status']=$value['exam_status'];
             $value['exclusive']=makeExcluse($value['is_exclusive']);
@@ -213,7 +213,7 @@ class Good extends Base
 
             $data[]=$value;
         }
-        return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
+        return app_show(0, "获取成功", ['count' => $count, 'list' => $data]);
     }
 
     //获取跟有赞对接的平台所属的商品上线信息

app/admin/controller/Goodup.php

@@ -176,7 +176,7 @@ class Goodup extends Base
 //            ->where(function ($Query) use ($wheror) {
 //                return $Query->whereOr($wheror);
 //            })
-            ->count();
+            ->count('gb.id');
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good_basic')
@@ -211,7 +211,7 @@ class Goodup extends Base
             ->where(['id'=>array_column($list,'good_unit')])
             ->column('unit','id');
 
-        $supplierInfo = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'companyNo'),array_column($list,'supplierNo'))]);
+//        $supplierInfo = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'companyNo'),array_column($list,'supplierNo'))]);
 
         foreach ($list as $value){
                 $value["cat_info"]= made($value['cat_id'],[]);
@@ -220,9 +220,9 @@ class Goodup extends Base
 //                $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
                 $value['unit'] =$unit[$value['good_unit']]??'';//isset($unit['unit'])?$unit['unit']:"";
 //                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
-                $value['company'] = $supplierInfo['data'][$value['companyNo']]??'';//isset($company['company'])?$company['company']:"";
+                $value['company'] = $value['companyName'];//$supplierInfo['data'][$value['companyNo']]??'';//isset($company['company'])?$company['company']:"";
 //                $supplier = Db::name("supplier")->where(['code'=>$value['supplierNo']])->find();
-                $value['supplier_name']=$supplierInfo['data'][$value['supplierNo']]??'';//isset($supplier['name'])?$supplier['name']:"";
+                $value['supplier_name']=$value['supplierName'];//$supplierInfo['data'][$value['supplierNo']]??'';//isset($supplier['name'])?$supplier['name']:"";
                 $value['exclusive']=makeExcluse($value['is_exclusive']);
                 $value['noble_name']=isset($value['noble_metal'])&&$value['noble_metal']!=0?$this->noble[$value['noble_metal']] :"";
 
@@ -241,7 +241,7 @@ class Goodup extends Base
 
             $data[] = $value;
         }
-        return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
+        return app_show(0, "获取成功", ['count' => $count, 'list' => $data]);
     }
 
     //商品成本列表，不受数据权限控制
@@ -1630,21 +1630,21 @@ class Goodup extends Base
                 //修改状态，添加待办
                 $create =Db::name("good_platform")->insert($tmp,true);
                 if($create>0){
-                    ActionLog::logAdd(['id'=>$createrid,'nickname'=>$creater], [
-                        "order_code" =>$skuCode,//咨询单详情编号
-                        "status" =>  $tmp['exam_status'],//这里的status是之前的值
-                        "action_remark" => '',//备注
-                        "action_type" => "create"//新建create，编辑edit，更改状态status
-                    ], "SPSX",$tmp['exam_status'],$tmp);
+//                    ActionLog::logAdd(['id'=>$createrid,'nickname'=>$creater], [
+//                        "order_code" =>$skuCode,//咨询单详情编号
+//                        "status" =>  $tmp['exam_status'],//这里的status是之前的值
+//                        "action_remark" => '',//备注
+//                        "action_type" => "create"//新建create，编辑edit，更改状态status
+//                    ], "SPSX",$tmp['exam_status'],$tmp);
 
-                    ProcessOrder::AddProcess(['id'=>$createrid,'nickname'=>$creater], [
-                        "order_type" => 'SPSX',
-                        "order_code" =>$skuCode,//咨询单详情编号
-                        "order_id" => $create,
-                        "order_status" =>$tmp['exam_status'],
-                        "before_status"=>$tmp['exam_status'],
-                        'holder_id' => $tmp['createrid'],
-                    ]);
+//                    ProcessOrder::AddProcess(['id'=>$createrid,'nickname'=>$creater], [
+//                        "order_type" => 'SPSX',
+//                        "order_code" =>$skuCode,//咨询单详情编号
+//                        "order_id" => $create,
+//                        "order_status" =>$tmp['exam_status'],
+//                        "before_status"=>$tmp['exam_status'],
+//                        'holder_id' => $tmp['createrid'],
+//                    ]);
                     $iso = Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                     if($iso==false){
                         unset($value['id']);

app/admin/controller/Reorder.php

@@ -550,7 +550,7 @@ class Reorder extends Base
         $orderinfo = Db::name("sale")->where(["orderCode" => $info["orderCode"]])->find();
         if ($orderinfo['order_type'] == 3 || $orderinfo['order_type'] == 4) {
             $goon = Db::name("good_zixun")
-                ->field('cat_id,is_stock')
+                ->field('cat_id,0 is_stock')
                 ->where(["spuCode" => $orderinfo['good_code'], "is_del" => 0])
                 ->findOrEmpty();
 

app/admin/controller/ReorderChild.php

@@ -134,7 +134,7 @@ class ReorderChild extends Base
 
         $list = Db::name('sale_return_child')
             ->alias('a')
-            ->field('a.id,a.saleReturnChildCode,a.type,a.outChildCode,a.outCode,a.companyNo,a.companyName,a.customer_code,a.customer_name,a.num,a.sale_price,a.total_price,a.status,a.addtime')
+            ->field('a.id,a.saleReturnChildCode,a.type,a.outChildCode,a.outCode,a.companyNo,a.companyName,a.customer_code,a.customerName,a.num,a.sale_price,a.total_price,a.status,a.addtime')
             ->where($where)
             ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])

app/admin/model/ActionLog.php

@@ -12,43 +12,44 @@ use think\facade\Db;
 class ActionLog extends Model
 {
     /**
-     * 记录操作日志
+     * 记录操作日志(于2023年03月08日暂时关闭)
      * @param $token
      * @param $order
      * @param $type
      * @param $status
      */
-    static function logAdd($token,$order,$type,$status,$post){
-        if(is_string($token)){
-            $user = GetUserInfo($token);
-            unset($post['token']);
-            $uid = isset($user['data']['id']) ? $user['data']['id'] :0;
-            $name = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
-        }else{
-            $uid = isset($token['id']) ? $token['id'] :0;
-            $name = isset($token['nickname']) ? $token['nickname'] :'';
-        }
-
-        $roleid=0;
-        if($uid!=0){
-         $userrole = Db::name("user_role")->where(["uid"=>$uid,"is_del"=>0,"status"=>1])->find();
-         $roleid = isset($userrole['roleid']) ? $userrole['roleid'] :0;
-        }
-        $data=[
-            "action_id"=>$uid,
-            "action_name"=>$name,
-            "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_type"=>$type,
-            "action_type"=>isset($order['action_type']) ? trim($order['action_type']) :"",
-            "action_data"=>json_encode($post),
-            "order_status"=>isset($order['status']) ? $order['status'] :"",
-            "addtime"=>date("Y-m-d H:i:s"),
-            "updatetime"=>date("Y-m-d H:i:s")
-        ];
-        self::insert($data);
-   }
+    static function logAdd(){}
+//    static function logAdd($token,$order,$type,$status,$post){
+//        if(is_string($token)){
+//            $user = GetUserInfo($token);
+//            unset($post['token']);
+//            $uid = isset($user['data']['id']) ? $user['data']['id'] :0;
+//            $name = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
+//        }else{
+//            $uid = isset($token['id']) ? $token['id'] :0;
+//            $name = isset($token['nickname']) ? $token['nickname'] :'';
+//        }
+//
+//        $roleid=0;
+//        if($uid!=0){
+//         $userrole = Db::name("user_role")->where(["uid"=>$uid,"is_del"=>0,"status"=>1])->find();
+//         $roleid = isset($userrole['roleid']) ? $userrole['roleid'] :0;
+//        }
+//        $data=[
+//            "action_id"=>$uid,
+//            "action_name"=>$name,
+//            "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_type"=>$type,
+//            "action_type"=>isset($order['action_type']) ? trim($order['action_type']) :"",
+//            "action_data"=>json_encode($post),
+//            "order_status"=>isset($order['status']) ? $order['status'] :"",
+//            "addtime"=>date("Y-m-d H:i:s"),
+//            "updatetime"=>date("Y-m-d H:i:s")
+//        ];
+//        self::insert($data);
+//   }
 
 }

app/admin/model/ProcessOrder.php

@@ -7,52 +7,54 @@ use think\facade\Config;
 class ProcessOrder extends \think\Model
 {
     //记录流程
-    public static function AddProcess($token,$order){
-
-        if (is_string($token)) {
-            $user = GetUserInfo($token);
-            $uid = isset($user['data']['id']) ? $user['data']['id'] : 0;
-            $name = isset($user['data']['nickname']) ? $user['data']['nickname'] : '';
-        } else {
-            //主要是某些脚本调用时没有token
-            $uid = isset($token['id']) ? $token['id'] : 0;
-            $name = isset($token['nickname']) ? $token['nickname'] : '';
-        }
-        $conf =Config::get("process");
-        $action = isset($conf[$order['order_type']]) ? $conf[$order['order_type']]:[];
-        $header =reset($action);
-        if((is_array($header)&&in_array($order['order_status'],$header))||$header==$order['order_status']){
-            $order_status=1; //流程新建
-        }else{
-            $order_status=2;
-        }
-        $data=[
-            "order_type"=>$order['order_type'],
-            "order_code"=>$order['order_code'],
-            "order_id"=>isset($order['order_id']) ?$order['order_id']:0 ,
-            "order_status"=>$order_status,
-            "action_process"=>$order['order_status'],
-            "action_status"=>$order['before_status'],
-            "action_uid"=>$uid,
-            "action_name"=>$name,
-            "addtime"=>date("Y-m-d H:i:s"),
-//            'holder_id'=>$order['holder_id'],//数据所有人
-        ];
-        OrderMsg::addmsg($data);
-
-        //手动排除竞价单ZXD
-        if($order['order_type']!='ZXD') {
-            ProcessWait::add(array_merge($data, ['holder_id' => $order['holder_id'] ?? 0,'person_id' => $order['person_id'] ?? 0]), isset($order['wait_id']) ? $order['wait_id'] : 0, isset($order['wait_name']) ? $order['wait_name'] : '',$order['handle_user_list']??'');
-        }
-
-        $insert = $data;
-        //如果是【供应商】应用，即abutment，增加字段source==2(操作来源为供应商)
-        if (strtolower(app('http')->getName()) == 'abutment') $insert['source'] = 2;
-
-        if (self::insert($insert)) {
-            Workflow::SaveFlow($data);
-        };
-    }
+    //(于2023年03月08日暂时关闭)
+    public static function AddProcess($token,$order){}
+//    public static function AddProcess($token,$order){
+//
+//        if (is_string($token)) {
+//            $user = GetUserInfo($token);
+//            $uid = isset($user['data']['id']) ? $user['data']['id'] : 0;
+//            $name = isset($user['data']['nickname']) ? $user['data']['nickname'] : '';
+//        } else {
+//            //主要是某些脚本调用时没有token
+//            $uid = isset($token['id']) ? $token['id'] : 0;
+//            $name = isset($token['nickname']) ? $token['nickname'] : '';
+//        }
+//        $conf =Config::get("process");
+//        $action = isset($conf[$order['order_type']]) ? $conf[$order['order_type']]:[];
+//        $header =reset($action);
+//        if((is_array($header)&&in_array($order['order_status'],$header))||$header==$order['order_status']){
+//            $order_status=1; //流程新建
+//        }else{
+//            $order_status=2;
+//        }
+//        $data=[
+//            "order_type"=>$order['order_type'],
+//            "order_code"=>$order['order_code'],
+//            "order_id"=>isset($order['order_id']) ?$order['order_id']:0 ,
+//            "order_status"=>$order_status,
+//            "action_process"=>$order['order_status'],
+//            "action_status"=>$order['before_status'],
+//            "action_uid"=>$uid,
+//            "action_name"=>$name,
+//            "addtime"=>date("Y-m-d H:i:s"),
+////            'holder_id'=>$order['holder_id'],//数据所有人
+//        ];
+//        OrderMsg::addmsg($data);
+//
+//        //手动排除竞价单ZXD
+//        if($order['order_type']!='ZXD') {
+//            ProcessWait::add(array_merge($data, ['holder_id' => $order['holder_id'] ?? 0,'person_id' => $order['person_id'] ?? 0]), isset($order['wait_id']) ? $order['wait_id'] : 0, isset($order['wait_name']) ? $order['wait_name'] : '',$order['handle_user_list']??'');
+//        }
+//
+//        $insert = $data;
+//        //如果是【供应商】应用，即abutment，增加字段source==2(操作来源为供应商)
+//        if (strtolower(app('http')->getName()) == 'abutment') $insert['source'] = 2;
+//
+//        if (self::insert($insert)) {
+//            Workflow::SaveFlow($data);
+//        };
+//    }
     public static function workdel($order){
         Workflow::where(["order_type"=>$order['order_type'],"order_code"=>$order['order_code']])->save(["is_del"=>1,"updatetime"=>date("y-m-d H:i:s")]);
     }

app/common.php

@@ -1,8 +1,10 @@
 <?php
 // 应用公共文件
 
-use app\admin\common\User as CommonUser;use think\facade\Config;
+use app\admin\common\User as CommonUser;
+use think\facade\Config;
 use think\facade\Db;
+use think\facade\Cache;
 use think\facade\Filesystem;
 use think\helper\Str;
 use app\admin\model\DataGroup as DataGroupModel;
@@ -444,21 +446,60 @@ function mai($var,$data=[]){
     }
 }
 
-function made($var,$data=[]){
-    $str = Db::name('cat')->where(['id'=>$var])->find();
-    if($str==false){
-        return [];
+//根据分类id获取分类结构数据
+if (function_exists('made') == false) {
+
+    function made($cat_id = 0)
+    {
+
+        $key = 'cat_made_id_' . $cat_id;
+
+        if (Cache::has($key)) return Cache::get($key);
+        else {
+            $rs = get_cat_data($cat_id);
+            Cache::set($key, $rs, 3600 * 24 * 30);
+            return $rs;
+        }
+//    $str = Db::name('cat')->where(['id'=>$var])->find();
+//    if($str==false){
+//        return [];
+//    }
+//    $vmn =[];
+//    $vmn['id'] =$str['id'];
+//    $vmn['name'] =$str['cat_name'];
+//    array_unshift($data,$vmn);
+//   // $var['id']=made();
+//    if($str['pid']==0){
+//       // krsort($data);
+//        return $data;
+//    }else{
+//        return made($str['pid'],$data);
+//    }
     }
-    $vmn =[];
-    $vmn['id'] =$str['id'];
-    $vmn['name'] =$str['cat_name'];
-    array_unshift($data,$vmn);
-   // $var['id']=made();
-    if($str['pid']==0){
-       // krsort($data);
-        return $data;
-    }else{
-        return made($str['pid'],$data);
+}
+
+if (function_exists('get_cat_data') == false) {
+    function get_cat_data($var, $data = [])
+    {
+        $str = Db::name('cat')
+            ->field('id,cat_name,pid')
+            ->where(['id' => $var])
+            ->findOrEmpty();
+        if (empty($str)) return [];
+
+//        $vmn =[];
+//        $vmn['id'] =$str['id'];
+//        $vmn['name'] =$str['cat_name'];
+        array_unshift($data, ['id' => $str['id'], 'name' => $str['cat_name']]);
+        // $var['id']=made();
+
+        return $str['pid'] == 0 ? $data : get_cat_data($str['pid'], $data);
+//        if($str['pid']==0){
+//            // krsort($data);
+//            return $data;
+//        }else{
+//            return get_cat_data($str['pid'],$data);
+//        }
     }
 }