diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 5c828f2..e604bc7 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/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 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 welcomes = pmnActivityInstanceService.list(Wrappers.lambdaQuery().in(PmnActivityInstance::getId, instanceIds).eq(PmnActivityInstance::getCategoryCode, "welcome")); if (welcomes.size() > 0) { PmnActivityInstance welcome = welcomes.get(0); - List configs = pmnActivityInstanceConfigService.list(Wrappers.lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, welcome.getId())); - List params = pmnActivityPromotionParamService.listByIds(configs.stream().map(PmnActivityInstanceConfig::getParamId).collect(Collectors.toSet())); Map content = new HashMap<>(); content.put("content", welcome.getContent()); returnValue.put("text", content); - for (PmnActivityPromotionParam param : params) { - if (param.getType().equals(1)) { - //图片 - Map image = new HashMap<>(); - image.put("media_id", param.getDefaultVal()); - returnValue.put("image", image); - } else if (param.getType().equals(2)) { - //网页 - Map link = new HashMap<>(); - link.put("title", param.getDescription()); - link.put("picurl", null); - link.put("desc", param.getDescription()); - link.put("url", param.getDefaultVal()); - returnValue.put("link", link); - } else if (param.getType().equals(3)) { - Map mini = new HashMap<>(); - mini.put("title", param.getKey()); - mini.put("pic_media_id", param.getLimitLower()); - mini.put("appid", param.getDefaultVal()); - mini.put("page", param.getDescription()); - returnValue.put("miniprogram", mini); + List configs = pmnActivityInstanceConfigService.list(Wrappers.lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, welcome.getId())); + if(configs.size() > 0) { + List params = pmnActivityPromotionParamService.listByIds(configs.stream().map(PmnActivityInstanceConfig::getParamId).collect(Collectors.toSet())); + for (PmnActivityPromotionParam param : params) { + if (param.getType().equals(1)) { + //图片 + Map image = new HashMap<>(); + image.put("media_id", param.getDefaultVal()); + returnValue.put("image", image); + } else if (param.getType().equals(2)) { + //网页 + Map link = new HashMap<>(); + link.put("title", param.getDescription()); + link.put("picurl", null); + link.put("desc", param.getDescription()); + link.put("url", param.getDefaultVal()); + returnValue.put("link", link); + } else if (param.getType().equals(3)) { + Map mini = new HashMap<>(); + mini.put("title", param.getKey()); + mini.put("pic_media_id", param.getLimitLower()); + mini.put("appid", param.getDefaultVal()); + mini.put("page", param.getDescription()); + returnValue.put("miniprogram", mini); + } } } }