diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index fe08ee1f..67ad9f0d 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -1205,18 +1205,19 @@ public class OrderDetailController extends BaseController { orderBehaviorService.insert(orderBehavior); // 拒单 + //TODO:待完善拒单人员 try { // 推送公众号通知数据。 // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您有派出的订单被拒接/退单，已退回"); + paramsNew.put("thing11", "您有派出的订单被拒接/退单，已退回"); // 名称 - paramsNew.put("thing18", "请进入【我的订单--未约未排】查看"); + paramsNew.put("thing12", "请进入【我的订单--未约未排】查看"); CustomerAddress address = addressService.selectByCustomerAddressId(om.getAddressId()); - paramsNew.put("thing14", address.getName()); + paramsNew.put("thing7", address.getName()); // 预约时间 - paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + paramsNew.put("time5", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.NORMAL_ORDER, paramsNew); } catch (Exception e) { 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 0b0c9602..99f7445f 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 @@ -17,7 +17,12 @@ public enum WxMsgEnum { TEXT("", "dnjTqmqr7OsnOXJR_SikVNNQOPSZLJ6pcDoysOksjNQ"), NORMAL_ORDER("", "dnjTqmqr7OsnOXJR_SikVCa9lzVlYx3EdFBdu6DNEdk"), - TIMEOUT_ORDER("", "dnjTqmqr7OsnOXJR_SikVFa-walminp2qVeUZgNfw6M"), + /** 拒单 **/ + REJECT_ORDER("", "lJUpyU7h6ipzjgBCdLW0vShjaG3uPxPZ4tQNwfv_XPM"), + /** 默认 **/ + DEFAULT_ORDER("", "dnjTqmqr7OsnOXJR_SikVOyDJbbVjdfiDXCHbs4xDfM"), + + TIMEOUT_ORDER("", "xdWLWqUbNY2iPYSDxG04Dr2fSTktqXN23xsoBU_9zhc"), /** 急报 **/ WARN_ORDER("", "0RSuVHHP_okErJ1acQmIirBU7TrQYR0xPBgBHyt_azA") diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java index 4617d367..79ff662d 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java @@ -131,14 +131,14 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您有订单被申请售后/投诉"); + paramsNew.put("thing21", "您收到1条售后/投诉单"); // 名称 - paramsNew.put("thing18", "请进入【我的订单--售后单】操作处理"); + paramsNew.put("thing31", "请进入【我的订单--售后单】操作处理"); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); paramsNew.put("thing14", address.getName()); // 预约时间 - paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); - WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.NORMAL_ORDER, paramsNew); + paramsNew.put("time15", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.DEFAULT_ORDER, paramsNew); } catch (Exception e) { log.error(e.getMessage(), e); @@ -195,14 +195,14 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您有售后/投诉单，客户已回复您方案"); + paramsNew.put("thing21", "您有1条售后/投诉单，客户已回复"); // 名称 - paramsNew.put("thing18", "请进入【我的订单--售后单】查看处理"); + paramsNew.put("thing31", "请进入【我的订单--售后单】查看处理"); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); paramsNew.put("thing14", address.getName()); // 预约时间 - paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); - WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.NORMAL_ORDER, paramsNew); + paramsNew.put("time15", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.DEFAULT_ORDER, paramsNew); } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderAlertTaskServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderAlertTaskServiceImpl.java index 5f123887..d4531ec9 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderAlertTaskServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderAlertTaskServiceImpl.java @@ -76,13 +76,13 @@ public class OrderAlertTaskServiceImpl implements OrderAlertTaskService { // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "需求大厅有新订单"); + paramsNew.put("thing21", "订单大厅/需求大厅有新订单"); // 名称 - paramsNew.put("thing18", "请进入【需求大厅】查看或操作处理"); + paramsNew.put("thing31", "请进入【需求大厅】查看或操作处理"); paramsNew.put("thing14", "newOrer"); // 预约时间 - paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); - WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.NORMAL_ORDER, paramsNew); + paramsNew.put("time15", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.DEFAULT_ORDER, paramsNew); } catch (Exception e) { e.printStackTrace(); } diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java index 598494e3..1f908e7b 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java @@ -145,13 +145,13 @@ public class OrderServiceImpl implements OrderService { // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您帐号有1条新订单超时未接"); + paramsNew.put("thing9", "您帐号有1条新订单超时未接"); // 名称 - paramsNew.put("thing18", "请进入【我的订单--新订单】操作处理"); + paramsNew.put("thing10", "请进入【我的订单--新订单】操作处理"); CustomerAddress address = customerAddressService.selectByCustomerAddressId(order.getAddressId()); - paramsNew.put("thing14", address.getName()); + paramsNew.put("thing2", address.getName()); // 预约时间 - paramsNew.put("time12", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); // 查师傅信息 Worker worker = workerService.selectById(order.getWorkerId()); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew); @@ -247,13 +247,13 @@ public class OrderServiceImpl implements OrderService { // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您有售后/投诉单超时未处理"); + paramsNew.put("thing9", "您有1条售后/投诉单，超时未处理"); // 名称 - paramsNew.put("thing18", "进入【我的订单--售后单】操作处理"); + paramsNew.put("thing10", "进入【我的订单--售后单】操作处理"); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); - paramsNew.put("thing14", address.getName()); + paramsNew.put("thing2", address.getName()); // 预约时间 - paramsNew.put("time12", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew); } catch (Exception e) { log.error(e.getMessage(), e); @@ -282,13 +282,13 @@ public class OrderServiceImpl implements OrderService { // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您有订单超时未上门/未服务"); + paramsNew.put("thing9", "您有1条订单超时未上门/未服务"); // 名称 - paramsNew.put("thing18", "请进入【我的订单--待上门--立即上门】处理"); + paramsNew.put("thing10", "请进入【我的订单--待上门--立即上门】处理"); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); - paramsNew.put("thing14", address.getName()); + paramsNew.put("thing2", address.getName()); // 预约时间 - paramsNew.put("time12", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew); } catch (Exception e) { @@ -315,14 +315,14 @@ public class OrderServiceImpl implements OrderService { // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您有订单超时未完单"); + paramsNew.put("thing9", "您有1条订单，超时未完单"); // 名称 - paramsNew.put("thing18", "请进入【我的订单--服务中--报价/完单】"); + paramsNew.put("thing10", "进入【我的订单--服务中--打卡--报价完单】"); OrderMaster orderMaster = orderMasterService.selectById(order.getOrderMasterId()); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); - paramsNew.put("thing14", address.getName()); + paramsNew.put("thing2", address.getName()); // 预约时间 - paramsNew.put("time12", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew); } catch (Exception e) { @@ -344,14 +344,14 @@ public class OrderServiceImpl implements OrderService { // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您有订单超时未联系客户"); + paramsNew.put("thing9", "您有1条订单，超时未联系客户"); // 名称 - paramsNew.put("thing18", "请进入【我的订单--未约未排--预约时间】"); + paramsNew.put("thing10", "请进入【我的订单--未约未排--预约时间】"); OrderMaster orderMaster = orderMasterService.selectById(order.getOrderMasterId()); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); - paramsNew.put("thing14", address.getName()); + paramsNew.put("thing2", address.getName()); // 预约时间 - paramsNew.put("time12", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew); } catch (Exception e) { @@ -368,14 +368,14 @@ public class OrderServiceImpl implements OrderService { // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 - paramsNew.put("thing10", "您有订单联系客户后未排上门时间"); + paramsNew.put("thing9", "您有1条订单联系客户后，未排时间"); // 名称 - paramsNew.put("thing18", "请进入【我的订单--未约未排--预约时间】"); + paramsNew.put("thing10", "请进入【我的订单--未约未排--预约时间】"); OrderMaster orderMaster = orderMasterService.selectById(order.getOrderMasterId()); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); - paramsNew.put("thing14", address.getName()); + paramsNew.put("thing2", address.getName()); // 预约时间 - paramsNew.put("time12", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); + paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); // 非自己承接的订单需要通知 WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew);