From 3360208277b59ddcc54e8830148eb283b964a28c Mon Sep 17 00:00:00 2001
From: starrySky <1752476835@qq.com>
Date: Wed, 31 Jul 2024 11:10:58 +0800
Subject: [PATCH] fix

---
 .../impl/PlayOrderInfoServiceImpl.java        |  4 ++--
 .../weichat/service/WxCustomMpService.java    | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
index 55152a2..fd8c470 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
@@ -648,9 +648,9 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
         this.baseMapper.updateById(entity);
         // 接单后，发送微信消息
         PlayClerkUserInfoEntity clerkUserInfo = playClerkUserInfoService.selectById(acceptBy);
-        wxCustomMpService.sendOrderMessage(clerkUserInfo.getOpenid(), clerkUserInfo.getTenantId(), clerkUserInfo.getNickname(), orderInfo.getOrderNo(), orderInfo.getOrderMoney().toString());
+        wxCustomMpService.sendOrderMessage(clerkUserInfo.getTenantId(), clerkUserInfo.getOpenid(), "1", clerkUserInfo.getNickname(), orderInfo.getOrderNo(), orderInfo.getId(), orderInfo.getOrderMoney().toString());
         PlayCustomUserInfoEntity customUserInfo = playCustomUserInfoService.selectById(orderInfo.getPurchaserBy());
-        wxCustomMpService.sendOrderMessage(customUserInfo.getOpenid(), customUserInfo.getTenantId(), customUserInfo.getNickname(), orderInfo.getOrderNo(), orderInfo.getOrderMoney().toString());
+        wxCustomMpService.sendOrderMessage(customUserInfo.getTenantId(), customUserInfo.getOpenid(), "0", customUserInfo.getNickname(), orderInfo.getOrderNo(), orderInfo.getId(), orderInfo.getOrderMoney().toString());
     }
 
     /**
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 0a814ac..2016ec5 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
@@ -114,16 +114,29 @@ public class WxCustomMpService {
         }
     }
 
-    public void sendOrderMessage(String openId, String tenantId, String nickName, String orderNo, String amount) {
+    /**
+     * 通过微信公众号发送消息
+     *
+     * @param tenantId    租户ID
+     * @param openId      消息接收人openID
+     * @param userType    用户类型，0:顾客，1:店员
+     * @param nickName    消息内容-消息接收人昵称
+     * @param orderNo     消息内容-订单编号
+     * @param orderId     消息内容-订单ID
+     * @param orderAmount 消息内容-订单金额
+     * @author 杭州世平信息科技有限公司-xuhq
+     * @since 2024/7/31 10:51
+     **/
+    public void sendOrderMessage(String tenantId, String openId, String userType, String nickName, String orderNo, String orderId, String orderAmount) {
         String template_id = "d08mieMwK8w9o0bJkA9NtsStPFecz8iV_dOD3_6t0mM";
         String tenantKey = tenantService.selectSysTenantByTenantId(tenantId).getTenantKey();
-        String url = "http://" + tenantKey + ".july.hucs.top/clerk/";
+        String url = "http://" + tenantKey + ".july.hucs.top/" + ("0".equals(userType) ? "user/#/orderDetail/" : "clerk/#/orderDetail/") + orderId;
         WxMpTemplateMessage templateMessage = new WxMpTemplateMessage();
         templateMessage.setTemplateId(template_id);
         templateMessage.setToUser(openId);
         templateMessage.setUrl(url);
         List<WxMpTemplateData> data = new ArrayList<>();
-        data.add(new WxMpTemplateData("amount2", amount));
+        data.add(new WxMpTemplateData("amount2", orderAmount));
         data.add(new WxMpTemplateData("thing12", nickName));
         data.add(new WxMpTemplateData("character_string5", orderNo));
         data.add(new WxMpTemplateData("time4", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")));