From 1e518fe3d26857ab604345351a576575fc82a145 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 31 Aug 2022 16:22:14 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 9 ++++-----
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 1 +
src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index 0c6c018..3f3166d 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -342,6 +342,7 @@
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,10)+"...");
+ orderStateDto.setAmount(mallOrderInfo.getAmount().toString());
orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getCode());
orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
diff --git a/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java b/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java
index 525110e..9fedb33 100644
--- a/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java
+++ b/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java
@@ -17,6 +17,8 @@
private String addressArea;
//取货号
private String takeCode;
+ //金额
+ private String amount;
//用户openId
private String openId;
//订阅消息模版id
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 794a2e3..de55fee 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
@@ -173,11 +173,10 @@
orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
orderStateMsgVo.setPage(info.getPage());
Map<String, WxTemplateData> m = new HashMap<>(5);
- m.put("character_string1", new WxTemplateData(info.getOrderNo()));
- m.put("thing9", new WxTemplateData(info.getGoodsName()));
- m.put("phrase2", new WxTemplateData(info.getOrderState()));
- m.put("thing13", new WxTemplateData(info.getAddressArea()));
- m.put("thing16", new WxTemplateData(info.getTakeCode()));
+ m.put("character_string2", new WxTemplateData(info.getOrderNo()));
+ m.put("thing11", new WxTemplateData(info.getGoodsName()));
+ m.put("amount1", new WxTemplateData(info.getAmount()));
+ m.put("character_string9", new WxTemplateData(info.getTakeCode()));
orderStateMsgVo.setData(m);
String s = JSONUtil.toJsonStr(orderStateMsgVo);
log.info(s);
--
Gitblit v1.9.1