From 7ae0c7a93ba711df945c54cbf9765a04cb082ccc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Sep 2022 10:20:37 +0800
Subject: [PATCH] 20220822

---
 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java |   49 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 36 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 794a2e3..43192c9 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
@@ -10,6 +10,7 @@
 import cc.mrbird.febs.common.utils.RedisUtils;
 import cc.mrbird.febs.common.utils.SpringContextHolder;
 import cc.mrbird.febs.mall.dto.ApiRechargeWalletDto;
+import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
 import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
 import cc.mrbird.febs.mall.entity.MallMember;
 import cc.mrbird.febs.mall.entity.MallOrderInfo;
@@ -18,6 +19,7 @@
 import cc.mrbird.febs.mall.mapper.MallMemberMapper;
 import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
 import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
+import cc.mrbird.febs.mall.vo.RechargeWalletMessageSendVo;
 import cc.mrbird.febs.pay.model.*;
 import cc.mrbird.febs.pay.service.IXcxPayService;
 import cc.mrbird.febs.pay.util.WechatConfigure;
@@ -89,8 +91,31 @@
                 money,
                 MoneyFlowTypeEnum.RECHARGE.getValue(),
                 rechargeNo,
-                FlowTypeEnum.BALANCE.getValue());
+                FlowTypeEnum.BALANCE.getValue(),
+                "余额充值",1);
         return payData;
+    }
+
+    @Override
+    public void rechargeWalletMessageSend(RechargeWalletMessageSendDto info) {
+        RestTemplate restTemplate = new RestTemplate();
+        String url =  WechatConfigure.SEND_INFO_URL  + redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY);
+        //拼接推送的模版
+        RechargeWalletMessageSendVo orderStateMsgVo = new RechargeWalletMessageSendVo();
+        orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
+        orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
+        orderStateMsgVo.setPage(info.getPage());
+        Map<String, WxTemplateData> m = new HashMap<>(4);
+        m.put("character_string1", new WxTemplateData(info.getRechargeNo()));
+        m.put("amount3", new WxTemplateData(info.getRechargeAmount()));
+        m.put("amount4", new WxTemplateData(info.getBalance()));
+        m.put("date5", new WxTemplateData(info.getCreateTime()));
+        orderStateMsgVo.setData(m);
+        String s = JSONUtil.toJsonStr(orderStateMsgVo);
+        log.info(s);
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, orderStateMsgVo, String.class);
+        log.info(responseEntity.getBody());
+
     }
 
     @Override
@@ -122,12 +147,11 @@
         orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
         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()));
+        Map<String, WxTemplateData> m = new HashMap<>(4);
+        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);
@@ -172,12 +196,11 @@
         orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
         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()));
+        Map<String, WxTemplateData> m = new HashMap<>(4);
+        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