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

Lyh server



查看合并请求 !2984

@@ -62,11 +62,11 @@ class GeoCount extends Command
         if(empty($project_id)){
         if(empty($project_id)){
             return true;
             return true;
         }
         }
-        $projectModel = new Project();
-        $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){
+            $projectModel = new Project();
+            $geo_qualify_day = $projectModel->getValue(['id'=>$item],'geo_qualify_day');
             $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]]]);

@@ -66,11 +66,11 @@ class GeoCountAll extends Command
             if(empty($project_id)){
             if(empty($project_id)){
                 return true;
                 return true;
             }
             }
-            $projectModel = new Project();
-            $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){
+                $projectModel = new Project();
+                $geo_qualify_day = $projectModel->getValue(['id'=>$item],'geo_qualify_day');
                 $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]]]);

@@ -6,6 +6,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\Geo\GeoCount;
+use App\Models\RankData\RankDataBmseo;
 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;
@@ -104,7 +105,11 @@ class CountLogic extends BaseLogic
     public function keyword_data_count(){
     public function keyword_data_count(){
         $version = $this->project['version'] ?? '';
         $version = $this->project['version'] ?? '';
         $yesterday = date('Y-m-d');
         $yesterday = date('Y-m-d');
-        $rankDataModel = new RankDataModel();
+        if($this->user['project_seo_type'] == 1){
+            $rankDataModel = new RankDataBmseo();
+        }else{
+            $rankDataModel = new RankDataModel();
+        }
         $param = [
         $param = [
             'updated_date' => $yesterday,
             'updated_date' => $yesterday,
             'project_id' => $this->user['project_id']
             'project_id' => $this->user['project_id']
@@ -122,10 +127,8 @@ class CountLogic extends BaseLogic
         if(!empty($version) && $version != '7.5'){
         if(!empty($version) && $version != '7.5'){
             $geoCountModel = new GeoCount();
             $geoCountModel = new GeoCount();
             $geoInfo = $geoCountModel->where('project_id',$this->user['project_id'])->where('date', '<=', date('Y-m-d'))->orderBy('date', 'desc')->first();
             $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'];
-            }
+            $data['geo_qualify_total'] = $geoInfo['qualify_total'] ?? 0;
+            $data['total_count'] = ($this->project['deploy_build']['keyword_num'] ?? 0) + ($this->project['geo_qualify_day'] ?? 0);
         }
         }
         return $this->success($data);
         return $this->success($data);
     }
     }