diff --git a/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java b/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java index 1df0931..49a952c 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java @@ -35,6 +35,10 @@ public class ActivityScheduleVO { @NotBlank(message = "请输入APPID") private String appId; + @ApiModelProperty(value = "welcome", required = true) + @NotBlank(message = "请输入欢迎语") + private String welcome; + @ApiModelProperty(value = "URI", required = true) @NotBlank(message = "请输入uri") private String uri; diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java index 0cee086..1a31ff0 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java @@ -78,6 +78,7 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpllambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "appId")); saveUri = pmnActivityPromotionParamService.saveOrUpdate(uri, Wrappers.lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "uri")); + saveWelcome = pmnActivityPromotionParamService.saveOrUpdate(welcome, Wrappers.lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "welcome")); List paramIds = new ArrayList<>(); for (PmnActivityPromotionParam param : activityScheduleVO.getParams()) { param.setPromotionId(pmnActivityPromotion.getId()); param.setAttr(2); boolean saveParam = pmnActivityPromotionParamService.saveOrUpdate(param); - if(param.getId() != null && param.getId() > 0) { + if (param.getId() != null && param.getId() > 0) { paramIds.add(param.getId()); } if (!saveParam) throw new RuntimeException("活动类型保存失败"); } - if(paramIds.size() > 0) { + if (paramIds.size() > 0) { pmnActivityPromotionParamService.remove(Wrappers.lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).notIn(PmnActivityPromotionParam::getId, paramIds).eq(PmnActivityPromotionParam::getAttr, 2)); } } - return saveActivitySchedule && saveActivityPromotion && saveAppId && saveUri; + return saveActivitySchedule && saveActivityPromotion && saveAppId && saveUri && saveWelcome; } @Override @@ -128,7 +139,7 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpllambdaQuery().eq(PmnActivityPromotion::getScheduleId, activitySchedule.getId())); - if(activityPromotion != null) { + if (activityPromotion != null) { List activityPromotionParams = new ArrayList<>(); List activityPromotionParamsAll = pmnActivityPromotionParamService.list(Wrappers.lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, activityPromotion.getId())); for (PmnActivityPromotionParam activityPromotionParam : activityPromotionParamsAll) { @@ -136,6 +147,8 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpl