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

Compare commits

base: clunt:e7e8583806599a1ffa8e11355126b2214019d459
Branches Tags
clunt:master
clunt:HEAD
clunt:old-version
clunt:multiple_refund
clunt:refund
..
compare: clunt:9df61f6a85ec8c8c505a29e069c4bcc8738a8448
Branches Tags
clunt:master
clunt:HEAD
clunt:old-version
clunt:multiple_refund
clunt:refund

No commits in common. "e7e8583806599a1ffa8e11355126b2214019d459" and "9df61f6a85ec8c8c505a29e069c4bcc8738a8448" have entirely different histories.
e7e8583806 ... 9df61f6a85

1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -222,7 +222,7 @@ public class OrderServiceImpl implements OrderService {
Integer fineTimes = order.getTimeoutFineTimes(); Integer fineTimes = order.getTimeoutFineTimes();
if (!timeout) { if (!timeout) {
log.info("主订单是否未约未排[{}]派单工id{}", order.getIsCall(),order.getWorkerId()); log.info("主订单是否未约未排[{}]派单工id{}", order.getIsCall(),order.getWorkerId());
if (overTime30min.before(now)) { if (overTime30min.before(now)&&order.getWorkerId() == null) {
// 30min未接单为超时 // 30min未接单为超时
log.info("主订单[{}]超时30分钟", order.getId()); log.info("主订单[{}]超时30分钟", order.getId());
orderMasterService.updateTimeout(order.getId(), 1); orderMasterService.updateTimeout(order.getId(), 1);
@ -250,7 +250,7 @@ public class OrderServiceImpl implements OrderService {
} }
} }
//主订单未排 //主订单未排
if (order.getHasDispatchedAll().equals(0)) { if (order.getIsCall().equals("02")) {
log.info("主订单未排[{}]", order.getIsCall()); log.info("主订单未排[{}]", order.getIsCall());
try { try {
// 推送公众号通知数据。 // 推送公众号通知数据。