diff --git a/src/main/java/com/kiisoo/ic/activity/service/FissionService.java b/src/main/java/com/kiisoo/ic/activity/service/FissionService.java index 6e1d6d7..16c02f2 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/FissionService.java +++ b/src/main/java/com/kiisoo/ic/activity/service/FissionService.java @@ -23,8 +23,7 @@ public class FissionService { public boolean save(ActivityInstanceVO activityInstanceVO) { - - return iPmnActivityInstanceService.saveVO(activityInstanceVO, false); + return iPmnActivityScheduleService.saveVO(activityInstanceVO.getScheduleVO()) && iPmnActivityInstanceService.saveVO(activityInstanceVO, false); } diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java index 3cdacb3..753517e 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java @@ -26,6 +26,7 @@ import com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper; import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.omg.SendingContext.RunTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.scheduling.annotation.Async; @@ -101,63 +102,68 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpllambdaQuery().eq(PmnActivityPromotionCase::getInstanceId, pmnActivityInstance.getId())); - if (oldPmnActivityPromotionCase != null) { - pmnActivityPromotionCase.setCreateTime(null); - pmnActivityPromotionCase.setId(oldPmnActivityPromotionCase.getId()); - } - boolean saveCase = pmnActivityPromotionCaseService.saveOrUpdate(pmnActivityPromotionCase); - for (PmnActivityPromotionParam param : activityInstanceVO.getParams()) { - PmnActivityInstanceConfig config = new PmnActivityInstanceConfig(); - config.setCaseId(pmnActivityPromotionCase.getId()); - config.setCreateTime(new Date()); - config.setInstanceId(pmnActivityInstance.getId()); - config.setKey(param.getName()); - config.setVal(param.getKey()); - config.setStatus(pmnActivityInstance.getStatus()); - config.setUpdateTime(new Date()); - config.setParamId(param.getId()); - config.setName(param.getName()); - config.setType(Long.valueOf(param.getType())); - pmnActivityInstanceConfigService.saveOrUpdate(config, Wrappers.lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityInstanceConfig::getParamId, param.getId())); + PmnActivityPromotionCase pmnActivityPromotionCase = new PmnActivityPromotionCase(); + pmnActivityPromotionCase.setCreateTime(new Date()); + pmnActivityPromotionCase.setInstanceId(pmnActivityInstance.getId()); + pmnActivityPromotionCase.setStatus(pmnActivityInstance.getStatus()); + pmnActivityPromotionCase.setUpdateTime(new Date()); + pmnActivityPromotionCase.setTag(""); + PmnActivityPromotionCase oldPmnActivityPromotionCase = pmnActivityPromotionCaseService.getOne(Wrappers.lambdaQuery().eq(PmnActivityPromotionCase::getInstanceId, pmnActivityInstance.getId()).last("limit 0,1")); + if (oldPmnActivityPromotionCase != null) { + pmnActivityPromotionCase.setCreateTime(null); + pmnActivityPromotionCase.setId(oldPmnActivityPromotionCase.getId()); + } + boolean saveCase = pmnActivityPromotionCaseService.saveOrUpdate(pmnActivityPromotionCase); + for (PmnActivityPromotionParam param : activityInstanceVO.getParams()) { + PmnActivityInstanceConfig config = new PmnActivityInstanceConfig(); + config.setCaseId(pmnActivityPromotionCase.getId()); + config.setCreateTime(new Date()); + config.setInstanceId(pmnActivityInstance.getId()); + config.setKey(param.getName()); + config.setVal(param.getKey()); + config.setStatus(pmnActivityInstance.getStatus()); + config.setUpdateTime(new Date()); + config.setParamId(param.getId()); + config.setName(param.getName()); + config.setType(Long.valueOf(param.getType())); + pmnActivityInstanceConfigService.saveOrUpdate(config, Wrappers.lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityInstanceConfig::getParamId, param.getId())); + } + applicationContext.publishEvent(new ActivityInstanceCreatedEvent(this, pmnActivityInstance, activityInstanceVO)); + return saveInstance && saveCase; + }catch (Exception e) { + e.printStackTrace(); + throw e; } - applicationContext.publishEvent(new ActivityInstanceCreatedEvent(this, pmnActivityInstance, activityInstanceVO)); - return saveInstance && saveCase; } @Override