From 57a83bef7cf3dd9a76561c979cfa98557bd239cf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 12:44:30 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

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 7b9231b..1c65d04 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
@@ -218,10 +218,10 @@
         orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
         orderStateMsgVo.setPage(info.getPage());
         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("thing15.DATA", new WxTemplateData(info.getRemark()));
+        m.put("thing19", new WxTemplateData(info.getAddressArea()));
+        m.put("phone_number18", new WxTemplateData(info.getLeaderPhone()));
+        m.put("thing3", new WxTemplateData(info.getGoodsName()));
+        m.put("thing15", new WxTemplateData(info.getRemark()));
         orderStateMsgVo.setData(m);
         String s = JSONUtil.toJsonStr(orderStateMsgVo);
         log.info(s);
@@ -285,15 +285,9 @@
         if(CollUtil.isNotEmpty(wxTemplateList)){
             for(DataDictionaryCustom dic : wxTemplateList){
                 HashMap<String, String> objectObjectHashMap = new HashMap<>();
-                //充值到账通知
-                if("WX_TEMPLATE_ID_TWO".equals(dic.getCode())){
-                    objectObjectHashMap.put("WX_TEMPLATE_ID_TWO",dic.getValue());
-                }
-                //提货通知
-                if("WX_TEMPLATE_ID_THREE".equals(dic.getCode())){
-                    objectObjectHashMap.put("WX_TEMPLATE_ID_THREE",dic.getValue());
-                }
-                wxTemplates.add( objectObjectHashMap);
+                objectObjectHashMap.put("name",dic.getCode());
+                objectObjectHashMap.put("value",dic.getValue());
+                wxTemplates.add(objectObjectHashMap);
             }
         }
         return wxTemplates;

--
Gitblit v1.9.1