定时器,欢迎语

src/main/java/com/kiisoo/ic/customer/CustomerService.java

@@ -211,6 +211,9 @@ public class CustomerService {
         log.info("回调参数: {}", turnBackDTOS);
         // TODO 测试用
         returnValue.put("welcome_code", "WELCOMECODE");
+        Map<String, Object> defaultContent = new HashMap<>();
+        defaultContent.put("content", null);
+        returnValue.put("text", defaultContent);
         Long storeId;
         if (turnBackDTOS.getUserId().equals("mayifei")) {
             storeId = 1962L;
@@ -230,32 +233,34 @@ public class CustomerService {
                 List<PmnActivityInstance> welcomes = pmnActivityInstanceService.list(Wrappers.<PmnActivityInstance>lambdaQuery().in(PmnActivityInstance::getId, instanceIds).eq(PmnActivityInstance::getCategoryCode, "welcome"));
                 if (welcomes.size() > 0) {
                     PmnActivityInstance welcome = welcomes.get(0);
-                    List<PmnActivityInstanceConfig> configs = pmnActivityInstanceConfigService.list(Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, welcome.getId()));
-                    List<PmnActivityPromotionParam> params = pmnActivityPromotionParamService.listByIds(configs.stream().map(PmnActivityInstanceConfig::getParamId).collect(Collectors.toSet()));
                     Map<String, Object> content = new HashMap<>();
                     content.put("content", welcome.getContent());
                     returnValue.put("text", content);
-                    for (PmnActivityPromotionParam param : params) {
+                    List<PmnActivityInstanceConfig> configs = pmnActivityInstanceConfigService.list(Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, welcome.getId()));
-                        if (param.getType().equals(1)) {
+                    if(configs.size() > 0) {
-                            //图片
+                        List<PmnActivityPromotionParam> params = pmnActivityPromotionParamService.listByIds(configs.stream().map(PmnActivityInstanceConfig::getParamId).collect(Collectors.toSet()));
-                            Map<String, Object> image = new HashMap<>();
+                        for (PmnActivityPromotionParam param : params) {
-                            image.put("media_id", param.getDefaultVal());
+                            if (param.getType().equals(1)) {
-                            returnValue.put("image", image);
+                                //图片
-                        } else if (param.getType().equals(2)) {
+                                Map<String, Object> image = new HashMap<>();
-                            //网页
+                                image.put("media_id", param.getDefaultVal());
-                            Map<String, Object> link = new HashMap<>();
+                                returnValue.put("image", image);
-                            link.put("title", param.getDescription());
+                            } else if (param.getType().equals(2)) {
-                            link.put("picurl", null);
+                                //网页
-                            link.put("desc", param.getDescription());
+                                Map<String, Object> link = new HashMap<>();
-                            link.put("url", param.getDefaultVal());
+                                link.put("title", param.getDescription());
-                            returnValue.put("link", link);
+                                link.put("picurl", null);
-                        } else if (param.getType().equals(3)) {
+                                link.put("desc", param.getDescription());
-                            Map<String, Object> mini = new HashMap<>();
+                                link.put("url", param.getDefaultVal());
-                            mini.put("title", param.getKey());
+                                returnValue.put("link", link);
-                            mini.put("pic_media_id", param.getLimitLower());
+                            } else if (param.getType().equals(3)) {
-                            mini.put("appid", param.getDefaultVal());
+                                Map<String, Object> mini = new HashMap<>();
-                            mini.put("page", param.getDescription());
+                                mini.put("title", param.getKey());
-                            returnValue.put("miniprogram", mini);
+                                mini.put("pic_media_id", param.getLimitLower());
+                                mini.put("appid", param.getDefaultVal());
+                                mini.put("page", param.getDescription());
+                                returnValue.put("miniprogram", mini);
+                            }
                         }
                     }
                 }