gx

@@ -86,12 +86,13 @@ class RemainDay extends Command
         $projectArr = $this->deployBuild->selectField(['seo_plan'=>1,'project_id'=>['not in',$this->ceaseProjectId]],'project_id');
         $projectArr = $this->deployBuild->selectField(['seo_plan'=>1,'project_id'=>['not in',$this->ceaseProjectId]],'project_id');
         $data = $this->project->list(['id'=>['in',$projectArr]],'id',['id','uptime','finish_remain_day']);
         $data = $this->project->list(['id'=>['in',$projectArr]],'id',['id','uptime','finish_remain_day']);
         foreach ($data as $item){
         foreach ($data as $item){
+            $deploy_build = $this->deployBuild->read(['project_id'=>$item['id']],['seo_service_duration']);
             if($item['uptime']){
             if($item['uptime']){
                 $diff = time() - strtotime($item['uptime']);
                 $diff = time() - strtotime($item['uptime']);
                 $item['finish_remain_day'] = floor($diff / (60 * 60 * 24));
                 $item['finish_remain_day'] = floor($diff / (60 * 60 * 24));
-                $seo_remain_day = $item['deploy_build']['seo_service_duration'] - floor($diff / (60 * 60 * 24));
+                $seo_remain_day = $deploy_build['seo_service_duration'] - floor($diff / (60 * 60 * 24));
             }else{
             }else{
-                $seo_remain_day = $item['deploy_build']['seo_service_duration'];
+                $seo_remain_day = $deploy_build['seo_service_duration'];
             }
             }
             $extend_type = 0;
             $extend_type = 0;
             if($seo_remain_day < 0){
             if($seo_remain_day < 0){
@@ -111,8 +112,9 @@ class RemainDay extends Command
      * @time   :2025/4/2 10:48
      * @time   :2025/4/2 10:48
      */
      */
     public function saveRemainDay(){
     public function saveRemainDay(){
-        $list = $this->project->list(['type'=>['in',[Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR]]],'id',['id','uptime','is_remain_today','pause_days','finish_remain_day']);
+        $list = $this->project->list(['type'=>['in',[Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR]]],'id',['id','uptime','remain_day','is_remain_today','pause_days','finish_remain_day']);
         foreach ($list as $item){
         foreach ($list as $item){
+            $deploy_build = $this->deployBuild->read(['project_id'=>$item['id']],['service_duration']);
             echo 'start->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
             echo 'start->项目id:' . $item['id'] . '执行时间：'. date('Y-m-d H:i:s') . PHP_EOL;
             if(in_array($item['id'],$this->ceaseProjectId)){//暂停的项目
             if(in_array($item['id'],$this->ceaseProjectId)){//暂停的项目
                 if(($item['type'] == Project::TYPE_TWO) && ($item['is_remain_today'] == 1)){
                 if(($item['type'] == Project::TYPE_TWO) && ($item['is_remain_today'] == 1)){
@@ -133,19 +135,19 @@ class RemainDay extends Command
                         continue;
                         continue;
                     }
                     }
                     $diff = time() - strtotime($opInfo['start_date'] ?? $item['uptime']);
                     $diff = time() - strtotime($opInfo['start_date'] ?? $item['uptime']);
-                    $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
+                    $remain_day = $deploy_build['service_duration'] - floor($diff / (60 * 60 * 24));
                 }else{
                 }else{
                     $compliance_day  = ($item['finish_remain_day'] ?? 0);
                     $compliance_day  = ($item['finish_remain_day'] ?? 0);
-                    $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
+                    $remain_day = $deploy_build['service_duration'] - $compliance_day;
                 }
                 }
             }else{
             }else{
                 //普通建站项目
                 //普通建站项目
                 if($item['uptime']){
                 if($item['uptime']){
                     $diff = time() - strtotime($item['uptime']);
                     $diff = time() - strtotime($item['uptime']);
                     $item['finish_remain_day'] = floor($diff / (60 * 60 * 24));
                     $item['finish_remain_day'] = floor($diff / (60 * 60 * 24));
-                    $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
+                    $remain_day = $deploy_build['service_duration'] - floor($diff / (60 * 60 * 24));
                 }else{
                 }else{
-                    $remain_day = $item['deploy_build']['service_duration'];
+                    $remain_day = $deploy_build['service_duration'];
                 }
                 }
             }
             }
             $extend_type = 0;
             $extend_type = 0;