Merge remote-tracking branch 'origin/master' into akun

@@ -241,14 +241,15 @@ class FetchTicketProjects extends Command
                     //todo::建站或同时为v6版本+GEO的，建站中项目给项目经理
                     //todo::建站或同时为v6版本+GEO的，建站中项目给项目经理
                     if(($status == 1) && ($item->deploy_build->plan > 0) && ($item->deploy_build->seo_plan > 0)){
                     if(($status == 1) && ($item->deploy_build->plan > 0) && ($item->deploy_build->seo_plan > 0)){
                         $engineer_id = $pm_id; //找项目经理
                         $engineer_id = $pm_id; //找项目经理
-                    }elseif (($item->is_upgrade == 1) || ($item->project_type == 1)){
-                        $engineer_id = $assm_id; // V5升V6，白帽SEO，GEO,找售后服务经理
-                    }elseif ($status == 1){
-                        $engineer_id = $pm_id; // 建站中找项目经理
-                    }elseif ($status == 2){
-                        $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
                     }else{
                     }else{
-                        $engineer_id = $assm_id; // 推广找售后服务经理
+                        if ($item->is_upgrade || $item->project_type == 1 || $item->deploy_build->seo_plan > 0)
+                            $engineer_id = $assm_id; // V5升V6，白帽SEO，GEO,找售后服务经理
+                        elseif ($status == 1)
+                            $engineer_id = $pm_id; // 建站中找项目经理
+                        elseif ($status == 2)
+                            $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
+                        else
+                            $engineer_id = $assm_id; // 推广找售后服务经理
                     }
                     }
                     $is_del = (
                     $is_del = (
                         $item->extend_type == 5
                         $item->extend_type == 5

@@ -59,8 +59,37 @@ class ProcessRecordsLogic extends BaseLogic
                 'item' => ['资料上传', '网站修改中', '网站搭建完成，客户确认中', '等待网站品控审核后上线']
                 'item' => ['资料上传', '网站修改中', '网站搭建完成，客户确认中', '等待网站品控审核后上线']
             ]
             ]
         ];
         ];
+//        $data['record'] = array_filter($data['record'], function($item) {
+//            return $item['date'] > '2025-09-01';
+//        });
         if($project['type'] == 2){
         if($project['type'] == 2){
-            $data['date_project_record'] = Project::projectProgress('optimize');
+            //优化项目  默认在seo优化中
+            if($data['optimize_record'] == 0) {
+                $data['optimize_record'] = 1;
+            }
+            //时间大于优化时间，默认
+            if(date('Y-m-d') > $project['deploy_optimize']['start_date']){
+                $data['optimize_record'] = 2;
+            }
+            //首次达标时间
+            if(!empty($project['deploy_optimize']['first_compliance_time'])){
+                $data['optimize_record'] = 3;
+            }
+            //无剩余时间
+            if($project['project_type'] == 1){
+                if($project['remain_day'] == 0){
+                    $data['optimize_record'] = 4;
+                }
+            }else{
+                if($project['seo_remain_day'] == 0){
+                    $data['optimize_record'] = 4;
+                }
+            }
+            if(in_array(2,$project['level'])){
+                $data['date_project_record'] = ['暂停优化'];
+            }else{
+                $data['date_project_record'] = Project::projectProgress('optimize');
+            }
         }else{
         }else{
             $data['date_project_record'] = Project::projectProgress('build');
             $data['date_project_record'] = Project::projectProgress('build');
         }
         }

@@ -228,12 +228,12 @@ class RankDataLogic extends BaseLogic
             $api_no = $project['deploy_optimize']['api_no'] ?? 0;
             $api_no = $project['deploy_optimize']['api_no'] ?? 0;
         }
         }
 
 
-//        if(!$api_no || Str::endsWith($api_no, '_bmseo')){
+        if(!$api_no || Str::endsWith($api_no, '_bmseo')){
             $bm_api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
             $bm_api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
             if($bm_api_no){
             if($bm_api_no){
                 $api_no = $bm_api_no;
                 $api_no = $bm_api_no;
             }
             }
-//        }
+        }
 
 
         $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain_arr = parse_url($domain);
         $domain_arr = parse_url($domain);

@@ -196,8 +196,8 @@ class Project extends Base
                 7 => '正式网站上线'
                 7 => '正式网站上线'
             ],
             ],
             'optimize' => [
             'optimize' => [
-                1 => '开始推广',
-                2 => 'SEO设置',
+                1 => 'SEO设置',
+                2 => '开始推广',
                 3 => '排名达标',
                 3 => '排名达标',
                 4 => '剩余服务时常'
                 4 => '剩余服务时常'
             ]
             ]

@@ -19,7 +19,7 @@ class TicketProject extends Base
     public function projectV6()
     public function projectV6()
     {
     {
         return $this->hasOne(Project::class, 'id', 'table_id')
         return $this->hasOne(Project::class, 'id', 'table_id')
-            ->select(['id', 'title', 'company', 'is_upgrade', 'project_type']);
+            ->select(['id', 'title', 'company', 'is_upgrade' ,'project_type']);
     }
     }
 
 
     // 项目经理
     // 项目经理