脚本优化

app/admin/model/ActionLog.php

@@ -19,10 +19,16 @@ class ActionLog extends Model
      * @param $status
      */
     static function logAdd($token,$order,$type,$status,$post){
-        $user = GetUserInfo($token);
-        unset($post['token']);
-        $uid = isset($user['data']['id']) ? $user['data']['id'] :0;
-        $name = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
+        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();

app/command/ImportOrderFromCAnalysisData.php

@@ -90,7 +90,7 @@ class ImportOrderFromCAnalysisData extends Command
             //销售渠道
             $sale_source_temp = Db::name('platform_source')
                 ->field('id')
-                ->where(['source' => $val, 'is_del' => 0])
+                ->where(['source' => $rs['sale_source'], 'is_del' => 0])
                 ->find();
             if (empty($sale_source_temp)) {
                 $update_c_data['status'] = OIFCModel::$status_wait_confirm;
@@ -188,7 +188,8 @@ class ImportOrderFromCAnalysisData extends Command
                 ->leftJoin('platform p', 'p.id=gp.platform_code AND p.is_del=0')
                 ->leftJoin('customer_org1 co', 'co.name=p.platform_name AND co.is_del=0')
                 ->where('gp.plat_code', $rs['plat_code'])
-                ->field('co.id,co.name')->find();
+                ->field('co.id,co.name')
+                ->find();
 
             if ($co) {
                 $customer_code = Db::name('customer_info')