周海龙 / globalso · 提交

转到一个项目

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

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

变更数据



查看合并请求 !2960
内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 10 行删除
... ... @@ -166,11 +166,8 @@ class SyncProject extends Command
];
$data['deploy_build']['plan'] = $this->versionData($param['plan_marketing'] ?? '');
$data['deploy_build']['seo_plan'] = $this->versionSeoData($param['geo_plan'] ?? '');
if(!empty($data['deploy_build']['plan'])){
$data['deploy_build']['service_duration'] = $param['years'] ?? 0;
}else{
$data['deploy_build']['seo_service_duration'] = $param['years'] ?? 0;
}
$data['deploy_build']['service_duration'] = $param['years'] ?? 0;
$data['deploy_build']['seo_service_duration'] = $param['geo_plan_day'] ?? 0;
$renewModel = new ProjectRenew();
$rs = $renewModel->add($data);
if($rs === false){
... ... @@ -256,11 +253,8 @@ class SyncProject extends Command
];
$data['deploy_build']['plan'] = $this->versionData($param['plan_marketing'] ?? '');
$data['deploy_build']['seo_plan'] = $this->versionSeoData($param['geo_plan'] ?? '');
if(!empty($data['deploy_build']['plan'])){
$data['deploy_build']['service_duration'] = $param['years'] ?? 0;
}else{
$data['deploy_build']['seo_service_duration'] = $param['years'] ?? 0;
}
$data['deploy_build']['service_duration'] = $param['years'] ?? 0;
$data['deploy_build']['seo_service_duration'] = $param['geo_plan_day'] ?? 0;
DB::beginTransaction();
try {
if(isset($data['deploy_build']['plan']) && in_array($data['deploy_build']['plan'],[4,5,15,16,17])){
... ...