定时器,欢迎语

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,11 +233,12 @@ 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);
+                    List<PmnActivityInstanceConfig> configs = pmnActivityInstanceConfigService.list(Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, welcome.getId()));
+                    if(configs.size() > 0) {
+                        List<PmnActivityPromotionParam> params = pmnActivityPromotionParamService.listByIds(configs.stream().map(PmnActivityInstanceConfig::getParamId).collect(Collectors.toSet()));
                         for (PmnActivityPromotionParam param : params) {
                             if (param.getType().equals(1)) {
                                 //图片
@@ -261,6 +265,7 @@ public class CustomerService {
                     }
                 }
             }
+        }
         if (eaCode != null) {
             // 判断是否是活动扫码
             if (eaCode.contains(Constants.ACTIVITY_QR_CODE_PREFIX)) {