细节优化，订单导入脚本不再使用队列

app/admin/common/User.php

@@ -6,8 +6,8 @@ namespace app\admin\common;
 
 class User
 {
-    private $appid = 'cx';
-    private $appkey = 'cx123123';
+    private $appid = '123';
+    private $appkey = '12345';
     private $Sign;
     private $param = [];
     private $header = ["Content-Type" => "multipart/json;charset=utf-8"];

app/admin/controller/Project.php

@@ -437,7 +437,7 @@ class Project extends Base
             $value['khName'] = $headquarters[$value['khNo']] ?? '';//isset($khinfo['companyName'])?$khinfo['companyName']:"";
 //            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
             $value['company'] = $headquarters[$value['companyNo']] ?? '';//isset($company['company'])?$company['company']:"";
-            $value['company_name'] = $item[$value['createrid']];
+            $value['company_name'] = $item[$value['createrid']]??'';
 
             //是否具有编辑权限
             $value['is_allow_update'] = 0;

app/admin/controller/Purchin.php

@@ -314,13 +314,13 @@ class Purchin extends Base
                 $sto = ["order_code"=>$wsm_in_code,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
                 ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname],$sto,"RKD",$status,$this->post);
                 if($status==1){
-                	  $uid = Db::name('user_role')
-                                ->where([
-                                    ['is_del', '=', 0],
-                                    ['roleid', 'in', [31, 41]],
-                                    ['status', '=', 1]
-                                ])->column('uid');
-                	  $handle_user_list = implode(',', $uid);
+//                	  $uid = Db::name('user_role')
+//                                ->where([
+//                                    ['is_del', '=', 0],
+//                                    ['roleid', 'in', [31, 41]],
+//                                    ['status', '=', 1]
+//                                ])->column('uid');
+//                	  $handle_user_list = implode(',', $uid);
                 }
 
                 $process=["order_code"=>$wsm_in_code,"order_id"=>$win,"order_status"=>$status,"order_type"=>'RKD',"before_status"=>$status,'holder_id' => $orin['apply_id'],"handle_user_list"=>$handle_user_list??""];

app/command/ImportOrderFromCAnalysisData.php

@@ -325,10 +325,10 @@ class ImportOrderFromCAnalysisData extends Command
 
             Db::commit();
 
-            if ($is && $res) Cache::store("redis")->handler()->lPush('import_order_from_c_key', $rs['id']);//校验无误，入队列
+//            if ($is && $res) Cache::store("redis")->handler()->lPush('import_order_from_c_key', $rs['id']);//校验无误，入队列
 
             // 指令输出
-            $output->writeln(date('Y-m-d H:i:s') . '|解析成功');
+//            $output->writeln(date('Y-m-d H:i:s') . '|解析成功');
 
         } catch (Exception $exception) {
             Db::rollback();

app/command/ImportOrderFromCHandleData.php

@@ -35,21 +35,21 @@ class ImportOrderFromCHandleData extends Command
     protected function execute(Input $input, Output $output)
     {
 
-        $key = 'import_order_from_c_key';
-        $c_data_id = Cache::store('redis')->handler()->rpop($key);
+//        $key = 'import_order_from_c_key';
+//        $c_data_id = Cache::store('redis')->handler()->rpop($key);
 
-        if (!$c_data_id) $output->writeln('没有符合条件的记录');
-        else {
+//        if (!$c_data_id) $output->writeln('没有符合条件的记录');
+//        else {
             $order_import_from_c_db = new OIFCModel();
 
             $c_data = $order_import_from_c_db
-                ->where(['is_del' => OIFCModel::$is_del_normal, 'status' => OIFCModel::$status_wait_relation, 'id' => $c_data_id])
+                ->where(['is_del' => OIFCModel::$is_del_normal, 'status' => OIFCModel::$status_wait_relation])
 //                ->lock(true)
                 ->field('id,createrid,creater')
-                ->find();
+                ->findOrEmpty()
+                ->toArray();
 
-            if (empty($c_data)) $output->writeln('未查询到该记录');
-            else {
+            if (!empty($c_data)) {
 
                 Db::startTrans();
                 try {
@@ -504,7 +504,7 @@ class ImportOrderFromCHandleData extends Command
                     $output->writeln(date('Y-m-d H:i:s') . '|处理失败，' . $exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
                 }
             }
-        }
+//        }
 
     }