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

no message

This commit is contained in:
cb 2025-04-14 18:31:02 +08:00
parent 0c015748fc
commit 20ce2319e7
1 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -143,47 +143,24 @@ public class OrderServiceImpl implements OrderService {
orderMasterService.updateTimeout(order.getId(), 1); orderMasterService.updateTimeout(order.getId(), 1);
timeout = true; timeout = true;
// 通知一次超时 // 通知一次超时
// 主订单未约 // 通知师傅新订单
if (order.getIsCall().equals("01")) { try {
try { // 推送公众号通知数据。
// 推送公众号通知数据。 // 消息组装。
// 消息组装。 Map<String, Object> paramsNew = new HashMap<>();
Map<String, Object> paramsNew = new HashMap<>(); // 订单编号
// 订单编号 paramsNew.put("thing9", "您帐号有1条新订单超时未接");
paramsNew.put("thing9", "您有1条订单，超时未联系客户"); // 名称
// 名称 paramsNew.put("thing10", "请进入【我的订单--新订单】操作处理");
paramsNew.put("thing10", "进入【我的订单--未约未排】操作处理"); CustomerAddress address = customerAddressService.selectByCustomerAddressId(order.getAddressId());
CustomerAddress address = customerAddressService.selectByCustomerAddressId(order.getAddressId()); paramsNew.put("thing2", address.getName());
paramsNew.put("thing2", address.getName()); // 预约时间
// 预约时间 paramsNew.put("time8", 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());
Worker worker = workerService.selectById(order.getWorkerId()); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew);
WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew); } catch (Exception e) {
} catch (Exception e) { log.error(e.getMessage(), e);
log.error(e.getMessage(), e);
}
}
//主订单未排
if (order.getIsCall().equals("02")) {
try {
// 推送公众号通知数据。
// 消息组装。
Map<String, Object> paramsNew = new HashMap<>();
// 订单编号
paramsNew.put("thing9", "您有1条订单联系客户后，未排时间");
// 名称
paramsNew.put("thing10", "进入【我的订单--未约未排--预约时间】");
CustomerAddress address = customerAddressService.selectByCustomerAddressId(order.getAddressId());
paramsNew.put("thing2", address.getName());
// 预约时间
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);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
} }
} }
} }
@ -214,24 +191,49 @@ public class OrderServiceImpl implements OrderService {
orderMasterService.updateTimeout(order.getId(), 1); orderMasterService.updateTimeout(order.getId(), 1);
timeout = true; timeout = true;
//主单超时未约未排 //主单超时未约未排
log.info("主订单是否未约未排[{}]",order.getIsCall());
try { if (order.getIsCall().equals("01")) {
// 推送公众号通知数据。 log.info("主订单未约[{}]",order.getIsCall());
// 消息组装。 try {
Map<String, Object> paramsNew = new HashMap<>(); // 推送公众号通知数据。
// 订单编号 // 消息组装。
paramsNew.put("thing9", "您有1条订单，超时未联系客户"); Map<String, Object> paramsNew = new HashMap<>();
// 名称 // 订单编号
paramsNew.put("thing10", "进入【我的订单--未约未排】操作处理"); paramsNew.put("thing9", "您有1条订单，超时未联系客户");
CustomerAddress address = customerAddressService.selectByCustomerAddressId(order.getAddressId()); // 名称
paramsNew.put("thing2", address.getName()); paramsNew.put("thing10", "进入【我的订单--未约未排】操作处理");
// 预约时间 CustomerAddress address = customerAddressService.selectByCustomerAddressId(order.getAddressId());
paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); paramsNew.put("thing2", address.getName());
// 查师傅信息 // 预约时间
Worker worker = workerService.selectById(order.getWorkerId()); 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) { Worker worker = workerService.selectById(order.getWorkerId());
log.error(e.getMessage(), e); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
//主订单未排
if (order.getIsCall().equals("02")) {
log.info("主订单未排[{}]",order.getIsCall());
try {
// 推送公众号通知数据。
// 消息组装。
Map<String, Object> paramsNew = new HashMap<>();
// 订单编号
paramsNew.put("thing9", "您有1条订单联系客户后，未排时间");
// 名称
paramsNew.put("thing10", "进入【我的订单--未约未排--预约时间】");
CustomerAddress address = customerAddressService.selectByCustomerAddressId(order.getAddressId());
paramsNew.put("thing2", address.getName());
// 预约时间
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);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
} }
} }
} }
@ -279,9 +281,10 @@ public class OrderServiceImpl implements OrderService {
afterParam.setOrderDetailId(order.getId()); afterParam.setOrderDetailId(order.getId());
List<AfterServiceRecord> afterServiceRecord = afterServiceRecordService.selectAfterServiceRecordList(afterParam); List<AfterServiceRecord> afterServiceRecord = afterServiceRecordService.selectAfterServiceRecordList(afterParam);
if (CollectionUtil.isNotEmpty(afterServiceRecord) && (afterServiceRecord.get(0).getCustomerFinalCheck() == null || afterServiceRecord.get(0).getCustomerFinalCheck() != 1L)) { if (CollectionUtil.isNotEmpty(afterServiceRecord) && (afterServiceRecord.get(0).getCustomerFinalCheck() == null || afterServiceRecord.get(0).getCustomerFinalCheck() != 1L)) {
log.info("售后订单更新时间[{}]",afterServiceRecord.get(0).getUpdateTime());
// 查询一下售后单时间 // 查询一下售后单时间
Date afterTime = getOverTime(afterServiceRecord.get(0).getUpdateTime(), 30 * 60 * 1000); Date afterTime = getOverTime(afterServiceRecord.get(0).getUpdateTime(), 30 * 60 * 1000);
if (afterTime.before(now)) { if (afterTime.before(now)&&!timeout) {
log.info("售后订单[{}]超时30分钟", order.getId()); log.info("售后订单[{}]超时30分钟", order.getId());
orderDetailService.updateAfterTimeout(order.getId(), 1, 0); orderDetailService.updateAfterTimeout(order.getId(), 1, 0);
// 售后超时通知 // 售后超时通知