作者 李宇航

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

变更数据



查看合并请求 !2837
@@ -444,20 +444,10 @@ class ProjectLogic extends BaseLogic @@ -444,20 +444,10 @@ class ProjectLogic extends BaseLogic
444 $record['end_time'] = $record['expire_at']; // ✅ 写回原数据 444 $record['end_time'] = $record['expire_at']; // ✅ 写回原数据
445 // 重新计算剩余天数 445 // 重新计算剩余天数
446 $diff = (strtotime($record['expire_at']) - strtotime(date('Y-m-d'))) / (60 * 60 * 24); 446 $diff = (strtotime($record['expire_at']) - strtotime(date('Y-m-d'))) / (60 * 60 * 24);
447 -  
448 if ($param['project_type'] == Project::PROJECT_TYPE_SEO) { 447 if ($param['project_type'] == Project::PROJECT_TYPE_SEO) {
449 - if($param['seo_remain_day'] > 0){  
450 $param['deploy_build']['seo_service_duration'] = $diff + $param['deploy_build']['seo_service_duration']; 448 $param['deploy_build']['seo_service_duration'] = $diff + $param['deploy_build']['seo_service_duration'];
451 - }else{  
452 - $param['deploy_build']['seo_service_duration'] = $diff + $param['bm_finish_remain_day'];  
453 - }  
454 } else { 449 } else {
455 - if($param['seo_remain_day'] > 0){  
456 $param['deploy_build']['service_duration'] = $diff + $param['deploy_build']['service_duration']; 450 $param['deploy_build']['service_duration'] = $diff + $param['deploy_build']['service_duration'];
457 - }else{  
458 - $param['deploy_build']['service_duration'] = $diff + $param['finish_remain_day'];  
459 - }  
460 -  
461 } 451 }
462 } 452 }
463 break; // 找到后跳出循环 453 break; // 找到后跳出循环