From a740f17dab6666c30c680f693950ea0be6d6a16c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 18:22:00 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 7a25f8e..cdc13c5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -232,7 +232,7 @@
orderStateDto.setGoodsName(StrUtil.sub(productNames,0,20)+"...");
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
- orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,20)+"...");
+ orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,20)+"...");
orderStateDto.setLeaderPhone(mallTeamLeader.getPhone());
orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index a1f2b63..7897586 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -224,11 +224,10 @@
orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
orderStateMsgVo.setPage(info.getPage());
- Map<String, WxTemplateData> m = new HashMap<>(5);
- m.put("thing4.DATA", new WxTemplateData(info.getAddressArea()));
- m.put("phone_number14.DATA", new WxTemplateData(info.getLeaderPhone()));
+ Map<String, WxTemplateData> m = new HashMap<>(4);
+ m.put("thing19.DATA", new WxTemplateData(info.getAddressArea()));
+ m.put("phone_number18.DATA", new WxTemplateData(info.getLeaderPhone()));
m.put("thing3.DATA", new WxTemplateData(info.getGoodsName()));
- m.put("thing5.DATA", new WxTemplateData(info.getDetailAddress()));
m.put("thing15.DATA", new WxTemplateData(info.getRemark()));
orderStateMsgVo.setData(m);
String s = JSONUtil.toJsonStr(orderStateMsgVo);
--
Gitblit v1.9.1