diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 668f1b7..5b580a0 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -681,15 +681,16 @@ public class JDUtil { // 询问是否需要继续转链 state.setCurrentField("confirm"); - wxUtil.sendTextMessage(fromWxid, "是否需要继续进行转链?\n回复 1 - 是\n回复 2 - 否", 1, fromWxid); - logger.info("转链流程 - 等待用户确认是否继续转链"); + wxUtil.sendTextMessage(fromWxid, "是否需要开通礼金?\n回复 1 - 是\n回复 2 - 否", 1, fromWxid); + logger.info("转链流程 - 等待用户确认是否需要开通礼金"); } else if ("confirm".equals(state.getCurrentField())) { + logger.info("转链流程 - 用户确认是否需要开通礼金:{}", message); if ("1".equals(message)) { // 继续转链逻辑 String transferredContent = transferContentWithLinks(message); - wxUtil.sendTextMessage(fromWxid, "转链完成:\n" + transferredContent, 1, fromWxid); + wxUtil.sendTextMessage(fromWxid, "开通礼金完成:\n" + transferredContent, 1, fromWxid); } else if ("2".equals(message)) { - wxUtil.sendTextMessage(fromWxid, "转链流程已取消", 1, fromWxid); + wxUtil.sendTextMessage(fromWxid, "开通礼金流程已取消", 1, fromWxid); } else { wxUtil.sendTextMessage(fromWxid, "无效的选择,请重新输入:\n回复 1 - 是\n回复 2 - 否", 1, fromWxid); } @@ -1142,21 +1143,27 @@ public class JDUtil { itemMap.put("shopId", String.valueOf(productInfo.getData()[0].getShopInfo().getShopId())); itemMap.put("shopName", productInfo.getData()[0].getShopInfo().getShopName()); itemMap.put("skuName", productInfo.getData()[0].getSkuName()); + String replaceAll = itemMap.get("skuName").replaceAll("国家", "").replaceAll("补贴", ""); itemMap.put("spuid", String.valueOf(productInfo.getData()[0].getSpuid())); couponInfo.append("商品信息:\n"); - for (HashMap.Entry entry : itemMap.entrySet()) { - couponInfo.append(" ").append(entry.getKey()).append(": ").append(entry.getValue()).append("\n"); - } - StringBuilder images = new StringBuilder(); + //for (HashMap.Entry entry : itemMap.entrySet()) { + //couponInfo.append(" ").append(entry.getKey()).append(": ").append(entry.getValue()).append("\n"); + //} + couponInfo.append(" ").append("店铺名称:\n").append(itemMap.get("shopName")).append("\n") + .append(itemMap.get("链接名称:\n")).append(replaceAll).append("\n") + .append("链接类型:\n").append(itemMap.get("owner")); + + + //StringBuilder images = new StringBuilder(); if (productInfo.getData()[0].getImageInfo() != null) { - images.append(" ").append("图片信息:\n"); - int index = 1; + //images.append(" ").append("图片信息:\n"); + //int index = 1; for (UrlInfo image : productInfo.getData()[0].getImageInfo().getImageList()) { - images.append("图片 ").append(index++).append("\n").append(image.getUrl()).append("\n"); + //images.append("图片 ").append(index++).append("\n").append(image.getUrl()).append("\n"); imagesList.add(image.getUrl()); } } - textList.add(String.valueOf(images)); + //textList.add(String.valueOf(images)); resultList.add(itemMap); }