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-17 12:23:02 +08:00
parent 3f726ca439
commit 6920d3d554
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ public class OrderServiceImpl implements OrderService {
public void overTimeOrder(String orderStatus) { public void overTimeOrder(String orderStatus) {
LocalTime nowT = LocalTime.now(); LocalTime nowT = LocalTime.now();
// 晚上19点后 - 早上8点前不需要执行定时器 // 晚上19点后 - 早上8点前不需要执行定时器
if (nowT.getHour() < 8 || nowT.getHour() > 18) { if (nowT.getHour() < 8 || nowT.getHour() > 20) {
return; return;
} }
// 查询待接单状态的主单 // 查询待接单状态的主单
@ -263,6 +263,11 @@ public class OrderServiceImpl implements OrderService {
} }
} }
public boolean isInTimeRange(LocalTime now) {
LocalTime start = LocalTime.of(17, 29, 59); // 17:29:59
LocalTime end = LocalTime.of(17, 30, 59); // 17:30:59
return !now.isBefore(start) && !now.isAfter(end);
}
/** /**
* 判断是否超时 * 判断是否超时
* *
@ -324,7 +329,7 @@ public class OrderServiceImpl implements OrderService {
Date todayStart = DateUtils.truncate(order.getExpectTimeStart(), Calendar.DATE); Date todayStart = DateUtils.truncate(order.getExpectTimeStart(), Calendar.DATE);
// 2. 增加 1 天 // 2. 增加 1 天
Date tomorrowStart = DateUtils.addDays(todayStart, 1); Date tomorrowStart = DateUtils.addDays(todayStart, 1);
log.info("订单开始前一个小时 订单号：[{}]时间：{} 当前时间 {}", order.getId(),oneHourTime,now); log.info("订单开始前一个小时 订单号：[{}]时间：{} 当前时间 {} 是否为同一时间{}", order.getId(),oneHourTime,now,now.equals(oneHourTime));
if (overTime.before(now)) { if (overTime.before(now)) {
log.info("订单[{}]待上门状态超时30分钟", order.getId()); log.info("订单[{}]待上门状态超时30分钟", order.getId());
OrderTimeoutRecord record = new OrderTimeoutRecord(order.getId(), order.getWorkerId(), order.getDeptId(), order.getOrderStatus()); OrderTimeoutRecord record = new OrderTimeoutRecord(order.getId(), order.getWorkerId(), order.getDeptId(), order.getOrderStatus());
@ -354,7 +359,7 @@ public class OrderServiceImpl implements OrderService {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
if (now.equals(oneHourTime)){ if (now.after(oneHourTime)){
log.info("订单[{}]约一小时上门服务", order.getId()); log.info("订单[{}]约一小时上门服务", order.getId());
try { try {
// 推送公众号通知数据。 // 推送公众号通知数据。
@ -376,7 +381,9 @@ public class OrderServiceImpl implements OrderService {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
if(now.before(tomorrowStart)){ //TODO: 需要定时
LocalTime currentTime = LocalTime.now(); // 当前系统时间
if(now.before(tomorrowStart)&&isInTimeRange(currentTime)){
log.info("订单[{}]明日订单通知", order.getId()); log.info("订单[{}]明日订单通知", order.getId());
try { try {
// 推送公众号通知数据。 // 推送公众号通知数据。
@ -389,10 +396,10 @@ public class OrderServiceImpl implements OrderService {
// 名称 // 名称
paramsNew.put("thing7", "进入【我的订单--明日单】查看和准备"); paramsNew.put("thing7", "进入【我的订单--明日单】查看和准备");
CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId());
paramsNew.put("thing9", address.getName()); paramsNew.put("character_string23", "进入见详情");
// 预约时间 // 预约时间
paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));
WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TOMORROW_ORDER, paramsNew); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.DEFAULT_HANDLE_ORDER, paramsNew);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);