clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

发单管理师傅号码不显示、派单自己的时候不通知

This commit is contained in:
kuang.yife 2024-02-19 17:14:58 +08:00
parent d266225943
commit 0c82e06c91
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -472,7 +472,6 @@ public class OrderController extends BaseController {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("thing1", "新订单通知"); params.put("thing1", "新订单通知");
params.put("thing5", "收到师傅派单,请及时处理!"); 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("thing14", acceptWorker.getName());
// 预约时间 // 预约时间
paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", om.getExpectTimeStart())); 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) { } catch (Exception e) {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
} }

4
ghy-admin/src/main/resources/templates/order/pc-master.html
View File

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