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

变更数据



查看合并请求 !2982

@@ -70,7 +70,8 @@ class GeoCount extends Command
             $this->output('执行的项目ID----'.$item);
             $this->output('执行的项目ID----'.$item);
             //收录总数
             //收录总数
             $total = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'created_at' => ['between',[$start,$end]]]);
             $total = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'created_at' => ['between',[$start,$end]]]);
-            if($total > $geo_qualify_day){
+            $qualify_total = $geoQuestionResModel->counts(['platform'=>['in',['openai', 'gemini','google_ai_overview']],'project_id' => $item,'hit'=>['!=',0],'created_at' => ['between',[$start,$end]]]);
+            if($qualify_total > $geo_qualify_day){
                 $is_qualify = 1;
                 $is_qualify = 1;
             }
             }
             $data = [
             $data = [
@@ -80,6 +81,7 @@ class GeoCount extends Command
                 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
                 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
                 'total'=>$total,//收录总数
                 'total'=>$total,//收录总数
                 'is_qualify'=>$is_qualify,
                 'is_qualify'=>$is_qualify,
+                'qualify_total'=>$qualify_total
             ];
             ];
             foreach ($platforms as $platform){
             foreach ($platforms as $platform){
                 if($platform == 'openai-not-network'){
                 if($platform == 'openai-not-network'){

@@ -74,6 +74,7 @@ class GeoCountAll extends Command
                 $this->output('执行的项目ID----'.$item);
                 $this->output('执行的项目ID----'.$item);
                 //收录总数
                 //收录总数
                 $total = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'created_at' => ['between',[$start,$end]]]);
                 $total = $geoQuestionResModel->counts(['project_id' => $item,'hit'=>['!=',0],'created_at' => ['between',[$start,$end]]]);
+                $qualify_total = $geoQuestionResModel->counts(['platform'=>['in',['openai', 'gemini','google_ai_overview']],'project_id' => $item,'hit'=>['!=',0],'created_at' => ['between',[$start,$end]]]);
                 if($total > $geo_qualify_day){
                 if($total > $geo_qualify_day){
                     $is_qualify = 1;
                     $is_qualify = 1;
                 }
                 }
@@ -84,6 +85,7 @@ class GeoCountAll extends Command
                     'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
                     'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
                     'total'=>$total,//收录总数
                     'total'=>$total,//收录总数
                     'is_qualify'=>$is_qualify,
                     'is_qualify'=>$is_qualify,
+                    'qualify_total'=>$qualify_total
                 ];
                 ];
                 foreach ($platforms as $platform){
                 foreach ($platforms as $platform){
                     if($platform == 'openai-not-network'){
                     if($platform == 'openai-not-network'){

@@ -102,6 +102,9 @@ class CountLogic extends BaseLogic
      */
      */
     public function keyword_data_count(){
     public function keyword_data_count(){
         $version = $this->project['version'] ?? '';
         $version = $this->project['version'] ?? '';
+        if(!empty($version) && $version != '7.5'){
+
+        }
         $yesterday = date('Y-m-d');
         $yesterday = date('Y-m-d');
         $rankDataModel = new RankDataModel();
         $rankDataModel = new RankDataModel();
         $param = [
         $param = [