From e8310f69089bc0415040e6c27f1218e0b4fbeb83 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 14:05:09 +0800
Subject: [PATCH] 后台,设置成为合伙人的金额

---
 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 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..7f848cc 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
@@ -80,7 +80,7 @@
         MallMember mallMember = mallMemberMapper.selectById(apiRechargeWalletDto.getMemberId());
         String rechargeNo = "CZ_"+MallUtils.getOrderNum();
         Boolean debug = xcxProperties.getDebug();
-        String attrStr = "{'rechargeNo':"+rechargeNo+",'memberId':"+mallMember.getId()+"}";
+        String attrStr = "{'rechargeNo':"+rechargeNo+",'memberId':"+mallMember.getId()+",'type':"+apiRechargeWalletDto.getType()+"}";
         if (debug) {
             payData = weixinServiceUtil.createRechargeWallet("[测试]" + productNames, rechargeNo,
                     1, mallMember.getOpenId(), attrStr);
@@ -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