gx剩余服务时常

@@ -122,7 +122,8 @@ class RemainDay extends Command
             if($deploy_build['seo_service_duration'] != 0){
             if($deploy_build['seo_service_duration'] != 0){
                 if($item['uptime']){
                 if($item['uptime']){
                     $diff = time() - strtotime($item['uptime']);
                     $diff = time() - strtotime($item['uptime']);
-                    $seo_remain_day = $deploy_build['seo_service_duration'] - floor($diff / (60 * 60 * 24));
+                    $compliance_day  = floor($diff / (60 * 60 * 24));
+                    $seo_remain_day = $deploy_build['seo_service_duration'] - $compliance_day;
                 }else{
                 }else{
                     $seo_remain_day = $deploy_build['seo_service_duration'];
                     $seo_remain_day = $deploy_build['seo_service_duration'];
                 }
                 }
@@ -130,10 +131,10 @@ class RemainDay extends Command
                     $seo_remain_day = 0;
                     $seo_remain_day = 0;
                 }
                 }
                 if($deploy_build['plan'] == 0 && $seo_remain_day == 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常未0，放入未续费中
                 if($deploy_build['plan'] == 0 && $seo_remain_day == 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常未0，放入未续费中
-                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
+                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
                 }else{
                 }else{
                     //同时包括白帽版本+默认版本的项目
                     //同时包括白帽版本+默认版本的项目
-                    $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);
+                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0],['id'=>$item['id']]);
                 }
                 }
             }
             }
         }
         }