From 0c82e06c91b290496bdd0be0d4139e25ad40a792 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Mon, 19 Feb 2024 17:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=8D=95=E7=AE=A1=E7=90=86=E5=B8=88?=
 =?UTF-8?q?=E5=82=85=E5=8F=B7=E7=A0=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E3=80=81?=
 =?UTF-8?q?=E6=B4=BE=E5=8D=95=E8=87=AA=E5=B7=B1=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B8=8D=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/order/OrderController.java     | 8 ++++++--
 .../src/main/resources/templates/order/pc-master.html     | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index dab9bcab..9566bf48 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -472,7 +472,6 @@ public class OrderController extends BaseController {
             Map<String, Object> params = new HashMap<>();
             params.put("thing1", "新订单通知");
             params.put("thing5", "收到师傅派单,请及时处理!");
-            wxMsgService.sendWxMsg(acceptWorker.getOpenId(), WxMsgEnum.ORDER_PLAN, params);
 
             // 推送公众号通知数据。
             // 消息组装。
@@ -483,7 +482,12 @@ public class OrderController extends BaseController {
             paramsNew.put("thing14", acceptWorker.getName());
             // 预约时间
             paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", om.getExpectTimeStart()));
-            WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), acceptWorker.getWxOpenId(), WxMsgEnum.TEXT, paramsNew);
+            // 非自己承接的订单需要通知
+            if (!om.getWorkerId().equals(request.getWorkerId())) {
+                wxMsgService.sendWxMsg(acceptWorker.getOpenId(), WxMsgEnum.ORDER_PLAN, params);
+                WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), acceptWorker.getWxOpenId(), WxMsgEnum.TEXT, paramsNew);
+            }
+
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html
index 925c3604..16d060f2 100644
--- a/ghy-admin/src/main/resources/templates/order/pc-master.html
+++ b/ghy-admin/src/main/resources/templates/order/pc-master.html
@@ -424,7 +424,7 @@
                             + '<small>' + row.code + '<small/> <br>'
                             + '<small> ' + row.consoleGoodsName + '<small/> <br>'
                             + '<small> 联系人：' + row.addressName + '</small> <br>'
-                            // + '<small> 联系电话：' + row.addressPhone + '</small> <br>'
+                            + '<small> 联系电话：' + row.addressPhone + '</small> <br>'
                             + '<small> 联系地址：' + row.address + '</small> <br>'
                             + '<small> 下单时间：' + row.createTime + '</small> <br>'
                             + '<small> 预约时间：' + row.mixExpectTime + '</small> <br>'
@@ -446,7 +446,7 @@
                     title: '接单信息',
                     formatter: function (value, row, index) {
                         if(value){
-                            return '<small>' + value.name + value.phone + '</small><br>'
+                            return '<small>' + value.name + '</small><br>'
                                 + '<small>接单时间：' + row.createTime + '</small>';
                         }
                     }