From 701d5d0a63efeb696b884f89349493885c87fbd8 Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Tue, 27 Aug 2024 09:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=A8=A1=E6=9D=BF=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weichat/service/WxCustomMpService.java    | 71 ++++++++-----------
 1 file changed, 29 insertions(+), 42 deletions(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
index 4a22a8b..f0c1e27 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -53,6 +54,7 @@ public class WxCustomMpService {
     private IPlayClerkUserInfoService clerkUserInfoService;
 
 
+
     /**
      * 支付成功回调地址
      */
@@ -103,29 +105,25 @@ public class WxCustomMpService {
     }
 
 
+    /**
+     * 充值成功-发送微信消息
+     *
+     * @param order 订单信息
+     */
     public void sendBalanceMessage(PlayOrderInfoEntity order) {
         PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(order.getPurchaserBy());
-        String touser = customUserInfo.getOpenid();
         SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(order.getTenantId());
-        String tenantKey = tenant.getTenantKey();
-        String url = "http://" + tenantKey + ".july.hucs.top/user/";
-        String template_id = tenant.getCzcgtzTemplateId();
-
-        WxMpTemplateMessage templateMessage = new WxMpTemplateMessage();
-        templateMessage.setTemplateId(template_id);
-        templateMessage.setToUser(touser);
-        templateMessage.setUrl(url);
+        WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getCzcgtzTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".july.hucs.top/user/");
         List<WxMpTemplateData> data = new ArrayList<>();
-        data.add(new WxMpTemplateData("thing18", "陪陪船票"));
-        data.add(new WxMpTemplateData("amount4", order.getOrderMoney().toString()));
-        data.add(new WxMpTemplateData("phrase5", "船票充值"));
-        data.add(new WxMpTemplateData("amount10", customUserInfo.getAccountBalance().toString()));
+        data.add(new WxMpTemplateData("time4", LocalDate.now().toString()));
+        data.add(new WxMpTemplateData("amount2", order.getOrderMoney().toString()));
+        data.add(new WxMpTemplateData("amount17", "0"));
+        data.add(new WxMpTemplateData("thing10", tenant.getTenantName()));
         templateMessage.setData(data);
         try {
             proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage);
         } catch (WxErrorException e) {
-            log.error(e.getMessage(), e);
-
+            log.error("充值成功发送消息异常", e);
         }
     }
 
@@ -169,7 +167,7 @@ public class WxCustomMpService {
     }
 
     /**
-     * 通过微信公众号发送消息
+     * 店员接单后，通过微信公众号发送消息
      *
      * @param tenantId    租户ID
      * @param openId      消息接收人openID
@@ -262,30 +260,19 @@ public class WxCustomMpService {
 
     }
 
-    // 发送新订单通知给店员
-//    public void sendNewOrderMessageForClerk(PlayClerkUserInfoEntity clerkUserInfo, String orderNo, String commodityName, BigDecimal money) {
-//        String touser = clerkUserInfo.getOpenid();
-//        SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(clerkUserInfo.getTenantId());
-//        String tenantKey = tenant.getTenantKey();
-//        String url = "http://" + tenantKey + ".july.hucs.top/user/";
-//        String template_id = tenant.getSdxddtzTemplateId();
-//
-//        WxMpTemplateMessage templateMessage = new WxMpTemplateMessage();
-//        templateMessage.setTemplateId(template_id);
-//        templateMessage.setToUser(touser);
-//        templateMessage.setUrl(url);
-//        List<WxMpTemplateData> data = new ArrayList<>();
-//        data.add(new WxMpTemplateData("thing6", commodityName));
-//        data.add(new WxMpTemplateData("time5", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")));
-//        data.add(new WxMpTemplateData("time7", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")));
-//        data.add(new WxMpTemplateData("character_string2", orderNo));
-//        data.add(new WxMpTemplateData("amount8", money.toString()));
-//        templateMessage.setData(data);
-//        try {
-//            proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage);
-//        } catch (WxErrorException e) {
-//            log.error(e.getMessage(), e);
-//
-//        }
-//    }
+    /**
+     * 获取微信发啥消息模板
+     *
+     * @param templateId 消息模板ID
+     * @param toUser     发送目标用户ID
+     * @param url        消息回调地址
+     * @return WxMpTemplateMessage
+     */
+    public WxMpTemplateMessage getWxMpTemplateMessage(String templateId, String toUser, String url) {
+        WxMpTemplateMessage templateMessage = new WxMpTemplateMessage();
+        templateMessage.setTemplateId(templateId);
+        templateMessage.setToUser(toUser);
+        templateMessage.setUrl(url);
+        return templateMessage;
+    }
 }