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

变更数据



查看合并请求 !2983

@@ -63,7 +63,7 @@ class GeoCount extends Command
             return true;
             return true;
         }
         }
         $projectModel = new Project();
         $projectModel = new Project();
-        $geo_qualify_day = $projectModel->getValue(['id'=>$project_id],['geo_qualify_day']);
+        $geo_qualify_day = $projectModel->getValue(['id'=>$project_id],'geo_qualify_day');
         $geoQuestionResModel = new GeoQuestionResult();
         $geoQuestionResModel = new GeoQuestionResult();
         $platforms = ['gemini','openai','deepseek','poe','perplexity','google_ai_overview','openai-not-network','claude'];
         $platforms = ['gemini','openai','deepseek','poe','perplexity','google_ai_overview','openai-not-network','claude'];
         foreach ($project_id as $item){
         foreach ($project_id as $item){

@@ -67,7 +67,7 @@ class GeoCountAll extends Command
                 return true;
                 return true;
             }
             }
             $projectModel = new Project();
             $projectModel = new Project();
-            $geo_qualify_day = $projectModel->getValue(['id'=>$project_id],['geo_qualify_day']);
+            $geo_qualify_day = $projectModel->getValue(['id'=>$project_id],'geo_qualify_day');
             $geoQuestionResModel = new GeoQuestionLog();
             $geoQuestionResModel = new GeoQuestionLog();
             $platforms = ['gemini','openai','deepseek','poe','perplexity','google_ai_overview','openai-not-network','claude'];
             $platforms = ['gemini','openai','deepseek','poe','perplexity','google_ai_overview','openai-not-network','claude'];
             foreach ($project_id as $item){
             foreach ($project_id as $item){

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Bside\HomeCount;
 
 
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Geo\GeoCount;
 use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BCustomTemplate;
 use App\Models\Visit\Visit;
 use App\Models\Visit\Visit;
 use App\Models\Visit\VisitItem;
 use App\Models\Visit\VisitItem;
@@ -102,9 +103,6 @@ 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 = [
@@ -121,6 +119,14 @@ class CountLogic extends BaseLogic
                 $data = [];
                 $data = [];
             }
             }
         }
         }
+        if(!empty($version) && $version != '7.5'){
+            $geoCountModel = new GeoCount();
+            $geoInfo = $geoCountModel->where('project_id',$this->user['project_id'])->where('date', '<=', date('Y-m-d'))->orderBy('date', 'desc')->first();
+            if($geoInfo !== false){
+                $data['geo_qualify_total'] = $geoInfo['qualify_total'];
+                $data['total_count'] = $geoInfo['qualify_total'] + $data['geo_qualify_total'];
+            }
+        }
         return $this->success($data);
         return $this->success($data);
     }
     }