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

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

@ -143,16 +143,15 @@ public class OrderServiceImpl implements OrderService {
orderMasterService.updateTimeout(order.getId(), 1);
timeout = true;
// 通知一次超时
// 主订单未约
if (order.getIsCall().equals("01")) {
// 通知师傅新订单
try {
// 推送公众号通知数据。
// 消息组装。
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());
paramsNew.put("thing2", address.getName());
// 预约时间
@ -164,28 +163,6 @@ public class OrderServiceImpl implements OrderService {
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);
}
}
}
}
if (flag && order.getWorkerId() != null) {
log.info("主订单[{}]超时60分钟", order.getId());
@ -214,7 +191,9 @@ public class OrderServiceImpl implements OrderService {
orderMasterService.updateTimeout(order.getId(), 1);
timeout = true;
//主单超时未约未排
log.info("主订单是否未约未排[{}]",order.getIsCall());
if (order.getIsCall().equals("01")) {
log.info("主订单未约[{}]",order.getIsCall());
try {
// 推送公众号通知数据。
// 消息组装。
@ -234,6 +213,29 @@ public class OrderServiceImpl implements OrderService {
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);
}
}
}
}
if (false) {
@ -279,9 +281,10 @@ public class OrderServiceImpl implements OrderService {
afterParam.setOrderDetailId(order.getId());
List<AfterServiceRecord> afterServiceRecord = afterServiceRecordService.selectAfterServiceRecordList(afterParam);
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);
if (afterTime.before(now)) {
if (afterTime.before(now)&&!timeout) {
log.info("售后订单[{}]超时30分钟", order.getId());
orderDetailService.updateAfterTimeout(order.getId(), 1, 0);
// 售后超时通知