周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 1e8d722eef998fb0d56f690580d9a016f2b27396 2 个父辈 8aa32d6d 1812ab11

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

变更数据



查看合并请求 !2960
内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 8 行删除
@@ -166,11 +166,8 @@ class SyncProject extends Command @@ -166,11 +166,8 @@ class SyncProject extends Command
166 ]; 166 ];
167 $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing'] ?? ''); 167 $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing'] ?? '');
168 $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['geo_plan'] ?? ''); 168 $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['geo_plan'] ?? '');
169 - if(!empty($data['deploy_build']['plan'])){  
170 $data['deploy_build']['service_duration'] = $param['years'] ?? 0; 169 $data['deploy_build']['service_duration'] = $param['years'] ?? 0;
171 - }else{  
172 - $data['deploy_build']['seo_service_duration'] = $param['years'] ?? 0;  
173 - } 170 + $data['deploy_build']['seo_service_duration'] = $param['geo_plan_day'] ?? 0;
174 $renewModel = new ProjectRenew(); 171 $renewModel = new ProjectRenew();
175 $rs = $renewModel->add($data); 172 $rs = $renewModel->add($data);
176 if($rs === false){ 173 if($rs === false){
@@ -256,11 +253,8 @@ class SyncProject extends Command @@ -256,11 +253,8 @@ class SyncProject extends Command
256 ]; 253 ];
257 $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing'] ?? ''); 254 $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing'] ?? '');
258 $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['geo_plan'] ?? ''); 255 $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['geo_plan'] ?? '');
259 - if(!empty($data['deploy_build']['plan'])){  
260 $data['deploy_build']['service_duration'] = $param['years'] ?? 0; 256 $data['deploy_build']['service_duration'] = $param['years'] ?? 0;
261 - }else{  
262 - $data['deploy_build']['seo_service_duration'] = $param['years'] ?? 0;  
263 - } 257 + $data['deploy_build']['seo_service_duration'] = $param['geo_plan_day'] ?? 0;
264 DB::beginTransaction(); 258 DB::beginTransaction();
265 try { 259 try {
266 if(isset($data['deploy_build']['plan']) && in_array($data['deploy_build']['plan'],[4,5,15,16,17])){ 260 if(isset($data['deploy_build']['plan']) && in_array($data['deploy_build']['plan'],[4,5,15,16,17])){