From c4cd165b862ceb3e8fb239c10a6b569a83759206 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Aug 2022 16:41:43 +0800
Subject: [PATCH] 20220810

---
 src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java          |    6 ++++--
 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java |   40 +++++++++++++++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java b/src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java
index b589957..0866511 100644
--- a/src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java
+++ b/src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java
@@ -10,8 +10,10 @@
 @ApiModel(value = "OrderStateMsgVo", description = "订单状态通知")
 public class OrderStateMsgVo {
 
-    private String toUser;//用户openid
-    private String templateId;//订阅消息模版id
+    private String touser;//用户openid
+    private String template_id;//订阅消息模版id
+    private String miniprogram_state="developer";//跳转小程序类型:developer为开发版;trial为体验版;formal为正式版;默认为正式版
+    private String lang="zh_CN";//进入小程序查看”的语言类型,支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文),默认为zh_CN
     private String page = "pages/index/index";//默认跳到小程序首页
     private Map<String, WxTemplateData> data;//推送文字
 
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 67a8a57..5521f37 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
@@ -44,13 +44,13 @@
 public class XcxPayServiceImpl implements IXcxPayService {
 
     @Autowired
-    MallOrderInfoMapper mallOrderInfoMapper;
+    private MallOrderInfoMapper mallOrderInfoMapper;
     @Autowired
-    MallMemberMapper mallMemberMapper;
+    private MallMemberMapper mallMemberMapper;
     @Autowired
     WeixinServiceUtil weixinServiceUtil;
     @Autowired
-    DataDictionaryCustomMapper dataDictionaryCustomMapper;
+    private DataDictionaryCustomMapper dataDictionaryCustomMapper;
     @Autowired
     RedisUtils redisUtils;
     @Autowired
@@ -84,8 +84,8 @@
         String url =  WechatConfigure.SEND_INFO_URL  + redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY);
         //拼接推送的模版
         OrderStateMsgVo orderStateMsgVo = new OrderStateMsgVo();
-        orderStateMsgVo.setToUser(info.getOpenId());//用户的openId
-        orderStateMsgVo.setTemplateId(info.getTemplateId());//订阅消息模板id
+        orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
+        orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
         Map<String, WxTemplateData> m = new HashMap<>(5);
         m.put("character_string1", new WxTemplateData(info.getOrderNo()));
         m.put("thing9", new WxTemplateData(info.getGoodsName()));
@@ -106,9 +106,35 @@
         RestTemplate restTemplate = new RestTemplate();
         String url =  WXAPPLETURl + redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY);
         //拼接推送的模版
+        /**
+         * {
+         *   "touser": "oJkRK4_pWN2kjp75B_G6oGSWawj0",
+         *   "template_id": "Yk3_M11Pw5rablln7kQBpasfG9ynRNwD9OKsyvUSoWg",
+         *   "page": "index",
+         *   "miniprogram_state":"developer",
+         *   "lang":"zh_CN",
+         *   "data": {
+         *         "character_string1": {
+         *             "value": "2022081214472943380"
+         *         },
+         *         "thing16": {
+         *             "value": "22704967"
+         *         },
+         *         "thing9": {
+         *             "value": "商品"
+         *         },
+         *         "thing13": {
+         *             "value": "测试"
+         *         },
+         *         "phrase2": {
+         *             "value": "已送达"
+         *         }
+         *   }
+         * }
+         */
         OrderStateMsgVo orderStateMsgVo = new OrderStateMsgVo();
-        orderStateMsgVo.setToUser(info.getOpenId());//用户的openId
-        orderStateMsgVo.setTemplateId(info.getTemplateId());//订阅消息模板id
+        orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
+        orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
         Map<String, WxTemplateData> m = new HashMap<>(5);
         m.put("character_string1", new WxTemplateData(info.getOrderNo()));
         m.put("thing9", new WxTemplateData(info.getGoodsName()));

--
Gitblit v1.9.1