gx脚本

@@ -93,11 +93,16 @@ class WeekProject extends Command
         $countModel = new Count();
         $countModel = new Count();
         $startOfThisWeek = date('Y-m-d', strtotime("monday this week"));
         $startOfThisWeek = date('Y-m-d', strtotime("monday this week"));
         $endOfLastWeekFormattedInfo = $countModel->read(['date'=>$startOfThisWeek,'project_id'=>$value['id']],['inquiry_num','country']);
         $endOfLastWeekFormattedInfo = $countModel->read(['date'=>$startOfThisWeek,'project_id'=>$value['id']],['inquiry_num','country']);
-        $data['inquiry_total'] = $endOfLastWeekFormattedInfo['inquiry_num'] ?? 0;//询盘数量
-        $data['inquiry_country'] = $endOfLastWeekFormattedInfo['country'] ?? json_encode([]);
+        $data['inquiry_total'] = $endOfLastWeekFormattedInfo['inquiry_num'] ?? 0;//询盘总数量
+        $data['inquiry_country'] = $endOfLastWeekFormattedInfo['country'] ?? json_encode([]);//询盘国家
         //获取上一周询盘数量
         //获取上一周询盘数量
         $result = (new FormGlobalsoApi())->getDateInquiry($value['domain'],$data['start_date'],$data['end_date']);
         $result = (new FormGlobalsoApi())->getDateInquiry($value['domain'],$data['start_date'],$data['end_date']);
-        $data['week_inquiry_total'] = ($endOfLastWeekFormattedInfo['inquiry_num'] ?? 0) - ($startOfLastWeekFormattedInfo['inquiry_num'] ?? 0);
+        if(isset($result['status'])){
+            $data['week_inquiry_total'] = $result['data'];
+        }else{
+            $data['week_inquiry_total'] = 0;
+            echo date('Y-m-d H:i:s') . '项目id：'.$value['id'].',域名：'.$value['domain'].',请求询盘错误。' . PHP_EOL;
+        }
         $rankDataModel = new RankData();
         $rankDataModel = new RankData();
         $rankInfo = $rankDataModel->read(['project_id'=>$value['id'],'lang'=>''],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']);
         $rankInfo = $rankDataModel->read(['project_id'=>$value['id'],'lang'=>''],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']);
         $data['google_indexed_num'] = $rankInfo['indexed_pages_num'] ?? 0;
         $data['google_indexed_num'] = $rankInfo['indexed_pages_num'] ?? 0;

@@ -209,7 +209,6 @@ class FormGlobalsoApi
         $queryString = http_build_query($data);
         $queryString = http_build_query($data);
         $url = 'https://www.globalso.site/api/external-interface/country_con/15243d63ed5a5738?'.$queryString;
         $url = 'https://www.globalso.site/api/external-interface/country_con/15243d63ed5a5738?'.$queryString;
         $res = http_get($url,['charset=utf-8']);
         $res = http_get($url,['charset=utf-8']);
-        echo date('Y-m-d H:i:s') . '数据：'.json_encode($res) . PHP_EOL;
         return $res;
         return $res;
     }
     }
 
 
@@ -234,7 +233,6 @@ class FormGlobalsoApi
         $queryString = http_build_query($data);
         $queryString = http_build_query($data);
         $url = 'https://www.globalso.site/api/external-interface/date_count?'.$queryString;
         $url = 'https://www.globalso.site/api/external-interface/date_count?'.$queryString;
         $res = http_get($url,['charset=utf-8']);
         $res = http_get($url,['charset=utf-8']);
-        echo date('Y-m-d H:i:s') . '数据：'.json_encode($res) . PHP_EOL;
         return $res;
         return $res;
     }
     }
 }
 }