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 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 @@ + '' + row.code + '
' + ' ' + row.consoleGoodsName + '
' + ' 联系人:' + row.addressName + '
' - // + ' 联系电话:' + row.addressPhone + '
' + + ' 联系电话:' + row.addressPhone + '
' + ' 联系地址:' + row.address + '
' + ' 下单时间:' + row.createTime + '
' + ' 预约时间:' + row.mixExpectTime + '
' @@ -446,7 +446,7 @@ title: '接单信息', formatter: function (value, row, index) { if(value){ - return '' + value.name + value.phone + '
' + return '' + value.name + '
' + '接单时间:' + row.createTime + ''; } }