From d266225943f89b5f54855b23106e9effb6ef0bfc Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Sun, 18 Feb 2024 17:59:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=82=AC=E5=8D=95/=E7=BA=A6=E5=8D=95,=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=85=AC=E4=BC=97=E5=8F=B7=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ghy/web/controller/order/OrderMasterController.java   | 1 +
 .../web/controller/order/OrderWarnRecordController.java   | 2 +-
 .../src/main/java/com/ghy/common/enums/WxMsgEnum.java     | 2 +-
 .../main/java/com/ghy/common/utils/WechatMsgUtils.java    | 8 +-------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 95da3a4f..c5b27364 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -1097,6 +1097,7 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
             orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
             orderListResponse.setPayMoney(totalPayMoney);
+            orderListResponse.setWorkerId(worker == null ? null : worker.getWorkerId());
             orderListResponse.setWorkerName(workerName);
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
             orderListResponse.setCustomerName(customerAddress.getName());
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderWarnRecordController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderWarnRecordController.java
index a31bd9aa..9783935d 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderWarnRecordController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderWarnRecordController.java
@@ -116,7 +116,7 @@ public class OrderWarnRecordController extends BaseController
             // 订单编号
             params.put("thing3", customer.getName());
             // 名称
-            params.put("thing14", orderWarnRecord.getContent());
+            params.put("thing2", orderWarnRecord.getContent());
             // 反馈时间
             params.put("time6", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));
             // 消息推送
diff --git a/ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java b/ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java
index 59e0152d..80f423cd 100644
--- a/ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java
+++ b/ghy-common/src/main/java/com/ghy/common/enums/WxMsgEnum.java
@@ -14,7 +14,7 @@ public enum WxMsgEnum {
     /** 商城端消息通知 */
     CUSTOMER_ORDER("", "JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM"),
     /** 测试 **/
-    TEXT("", "JtsGFPDjYhL2GbHfKxvTJaR_lLp8xLyw8VeR01Y0JHM"),
+    TEXT("", "dnjTqmqr7OsnOXJR_SikVNNQOPSZLJ6pcDoysOksjNQ"),
 
     /** 急报 **/
     WARN_ORDER("", "0RSuVHHP_okErJ1acQmIirBU7TrQYR0xPBgBHyt_azA")
diff --git a/ghy-common/src/main/java/com/ghy/common/utils/WechatMsgUtils.java b/ghy-common/src/main/java/com/ghy/common/utils/WechatMsgUtils.java
index 0f8cf618..0825c649 100644
--- a/ghy-common/src/main/java/com/ghy/common/utils/WechatMsgUtils.java
+++ b/ghy-common/src/main/java/com/ghy/common/utils/WechatMsgUtils.java
@@ -67,13 +67,7 @@ public class WechatMsgUtils {
         Map<String, Object> paramMap = new HashMap<String, Object>();
         paramMap.put("touser", userOpenId);
         paramMap.put("page", "index");
-        switch (mesType) {
-            case TEXT:
-                paramMap.put("template_id", "dnjTqmqr7OsnOXJR_SikVNNQOPSZLJ6pcDoysOksjNQ");
-                break;
-            default:
-                break;
-        }
+        paramMap.put("template_id", mesType.getTempCode());
         JSONObject jsonObject = new JSONObject();
         for (Map.Entry<String, Object> objectEntry : dataMap.entrySet()) {
             JSONObject model = new JSONObject();