Merge branch 'master' of https://git.opsoul.com/clunt/ghy-all

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

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