主单的update_time为null,改为用create_time判断超时
This commit is contained in:
parent
a500a5581d
commit
dd43a90d15
|
|
@ -82,7 +82,7 @@ public class OrderServiceImpl implements OrderService {
|
||||||
// 是否超时
|
// 是否超时
|
||||||
boolean timeout = ONE.equals(order.getTimeout());
|
boolean timeout = ONE.equals(order.getTimeout());
|
||||||
if (timeout) {
|
if (timeout) {
|
||||||
Date overTime = getOverTime(order.getUpdateTime(), 60 * 60 * 1000);
|
Date overTime = getOverTime(order.getCreateTime(), 60 * 60 * 1000);
|
||||||
if (overTime.before(now)) {
|
if (overTime.before(now)) {
|
||||||
log.info("主订单[{}]超时60分钟", order.getId());
|
log.info("主订单[{}]超时60分钟", order.getId());
|
||||||
// 已超时 60min后取消超时状态 清空workerId
|
// 已超时 60min后取消超时状态 清空workerId
|
||||||
|
|
@ -90,7 +90,7 @@ public class OrderServiceImpl implements OrderService {
|
||||||
orderMasterService.removeWorker(order.getId());
|
orderMasterService.removeWorker(order.getId());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Date overTime = getOverTime(order.getUpdateTime(), 30 * 60 * 1000);
|
Date overTime = getOverTime(order.getCreateTime(), 30 * 60 * 1000);
|
||||||
if (overTime.before(now)) {
|
if (overTime.before(now)) {
|
||||||
// 30min未接单为超时
|
// 30min未接单为超时
|
||||||
log.info("主订单[{}]超时30分钟", order.getId());
|
log.info("主订单[{}]超时30分钟", order.getId());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue