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

Lyh server



查看合并请求 !2829

@@ -761,11 +761,11 @@ class ProjectLogic extends BaseLogic
             // 获取最大日期（如果有）
             // 获取最大日期（如果有）
             $maxExpireAt = $validDates ? max($validDates) : null;
             $maxExpireAt = $validDates ? max($validDates) : null;
             if(!empty($maxExpireAt)){
             if(!empty($maxExpireAt)){
-                $diff = (strtotime($maxExpireAt) - strtotime($param['uptime'] ?? date('Y-m-d'))) / (60 * 60 * 24);
+                $diff = (strtotime($maxExpireAt) - strtotime( date('Y-m-d'))) / (60 * 60 * 24);
                 if($param['project_type'] == Project::PROJECT_TYPE_SEO){
                 if($param['project_type'] == Project::PROJECT_TYPE_SEO){
-                    $param['deploy_build']['seo_service_duration'] = $diff;
+                    $param['deploy_build']['seo_service_duration'] = $diff + $param['bm_finish_remain_day'];
                 }else{
                 }else{
-                    $param['deploy_build']['service_duration'] = $diff;
+                    $param['deploy_build']['service_duration'] = $diff + $param['finish_remain_day'];
                 }
                 }
             }
             }
         }
         }