1

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;

src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java

@@ -78,6 +78,7 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpl<PmnActivitySched
         boolean saveActivityPromotion = activityPromotionService.saveOrUpdate(pmnActivityPromotion);
         boolean saveAppId = true;
         boolean saveUri = true;
+        boolean saveWelcome = true;
         if (saveActivitySchedule && saveActivityPromotion) {
             //保存appid和uri, attr = 1
             PmnActivityPromotionParam appId = new PmnActivityPromotionParam();
@@ -98,23 +99,33 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpl<PmnActivitySched
             uri.setPromotionId(pmnActivityPromotion.getId());
             uri.setType(2);
             uri.setDefaultVal(activityScheduleVO.getUri());
+            PmnActivityPromotionParam welcome = new PmnActivityPromotionParam();
+            welcome.setName("welcome");
+            welcome.setKey(activityScheduleVO.getAppId());
+            welcome.setAttr(1);
+            welcome.setDescription(activityScheduleVO.getWelcome());
+            welcome.setIsRequired(1);
+            welcome.setPromotionId(pmnActivityPromotion.getId());
+            welcome.setType(2);
+            welcome.setDefaultVal("welcome");
             saveAppId = pmnActivityPromotionParamService.saveOrUpdate(appId, Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "appId"));
             saveUri = pmnActivityPromotionParamService.saveOrUpdate(uri, Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "uri"));
+            saveWelcome = pmnActivityPromotionParamService.saveOrUpdate(welcome, Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "welcome"));
             List<Long> 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.<PmnActivityPromotionParam>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 ServiceImpl<PmnActivitySched
         activityScheduleVO.setCategoryId(activitySchedule.getCategoryId());
         activityScheduleVO.setCategoryCode(activitySchedule.getCategoryCode());
         PmnActivityPromotion activityPromotion = activityPromotionService.getOne(Wrappers.<PmnActivityPromotion>lambdaQuery().eq(PmnActivityPromotion::getScheduleId, activitySchedule.getId()));
-        if(activityPromotion != null) {
+        if (activityPromotion != null) {
             List<PmnActivityPromotionParam> activityPromotionParams = new ArrayList<>();
             List<PmnActivityPromotionParam> activityPromotionParamsAll = pmnActivityPromotionParamService.list(Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, activityPromotion.getId()));
             for (PmnActivityPromotionParam activityPromotionParam : activityPromotionParamsAll) {
@@ -136,6 +147,8 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpl<PmnActivitySched
                     activityScheduleVO.setAppId(activityPromotionParam.getKey());
                 } else if (activityPromotionParam.getName().equals("uri")) {
                     activityScheduleVO.setUri(activityPromotionParam.getKey());
+                } else if (activityPromotionParam.getName().equals("welcome")) {
+                    activityScheduleVO.setWelcome(activityPromotionParam.getDescription());
                 } else {
                     activityPromotionParams.add(activityPromotionParam);
                 }