合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !2574

@@ -87,6 +87,9 @@ class CountProject extends Command
                 //剩余服务时常
                 //剩余服务时常
                 $arr['service_day'] = $projectInfo['remain_day'];
                 $arr['service_day'] = $projectInfo['remain_day'];
                 $arr = $this->inquiry($arr,$domain, $project_id,$projectInfo['is_upgrade'] ?? 0);
                 $arr = $this->inquiry($arr,$domain, $project_id,$projectInfo['is_upgrade'] ?? 0);
+                if($arr === false){
+                    continue;
+                }
                 //查询当天数据是否存在  存在则更新
                 //查询当天数据是否存在  存在则更新
                 $info = $count->read(['date'=>$v['updated_date'],'project_id'=>$project_id]);
                 $info = $count->read(['date'=>$v['updated_date'],'project_id'=>$project_id]);
                 if($info === false){
                 if($info === false){
@@ -146,7 +149,7 @@ class CountProject extends Command
     public function inquiry($arr,$domain,$project_id,$is_upgrade = 0){
     public function inquiry($arr,$domain,$project_id,$is_upgrade = 0){
         $inquiry_list = (new FormGlobalsoApi())->getInquiryAll($domain,$is_upgrade);
         $inquiry_list = (new FormGlobalsoApi())->getInquiryAll($domain,$is_upgrade);
         if($inquiry_list == false){
         if($inquiry_list == false){
-            return false;
+            return $arr;
         }
         }
 //        echo date('Y-m-d H:i:s') . '拉取询盘状态：' .json_encode($inquiry_list) . PHP_EOL;
 //        echo date('Y-m-d H:i:s') . '拉取询盘状态：' .json_encode($inquiry_list) . PHP_EOL;
         if($inquiry_list['status'] == self::STATUS_ERROR){
         if($inquiry_list['status'] == self::STATUS_ERROR){