no message

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

@@ -149,7 +149,6 @@ public class OrderServiceImpl implements OrderService {
         }
 
 
-
         // 查询待接单状态的主单
         List<OrderMaster> orderMasters = orderMasterService.selectByStatus(orderMasterTimeoutStatus);
         log.info("扫描到{}条未完成的主订单", orderMasters.size());
@@ -186,9 +185,9 @@ public class OrderServiceImpl implements OrderService {
             Date overTime1h = getOverTime(createTime, 30 * 60 * 1000);
             boolean flag;
             if (order.getUpdateTime() != null) {
-                flag = getOverTime(order.getUpdateTime(), 45 * 60 * 1000).before(now);
+                flag = getOverTime(order.getUpdateTime(), 8 * 60 * 60 * 1000).before(now);
             } else {
-                flag = getOverTime(createTime, 45 * 60 * 1000).before(now);
+                flag = getOverTime(createTime, 8 * 60 * 60 * 1000).before(now);
                 log.info("判断时间:{},当前时间:{},结果:{}", getOverTime(createTime, 45 * 60 * 1000), now, flag);
             }
             // 是否已经超时
@@ -845,7 +844,6 @@ public class OrderServiceImpl implements OrderService {
     }
 
 
-
     public long appMixOrderCount(OrderListRequest orderListRequest) {
         long count = 0;
 
@@ -933,6 +931,7 @@ public class OrderServiceImpl implements OrderService {
         }
         return count;
     }
+
     public AjaxResult appMixAfterList(@RequestBody OrderListRequest orderListRequest) {
         List<OrderListResponse> orderListResponses = new ArrayList<>();
 
@@ -984,6 +983,7 @@ public class OrderServiceImpl implements OrderService {
 
         return AjaxResult.success(orderListResponses);
     }
+
     public List<OrderListResponse> getMasterAfterList(OrderMaster orderMaster) {
 
         // 查所有售后的单
@@ -1260,6 +1260,7 @@ public class OrderServiceImpl implements OrderService {
         });
         return orderListResponses;
     }
+
     private boolean checkIsOnlyServer(Long orderMasterId, Long workId) {
         // 找出原单的数量
         List<OrderGoods> orderGoodsList = orderGoodsService.selectByOrderMasterId(orderMasterId);
@@ -1289,6 +1290,7 @@ public class OrderServiceImpl implements OrderService {
         }
         return true;
     }
+
     /*判断超时4小时的时间 如果超过晚上八点则剩余的时间从第二天早上开始计时*/
     public static Date calculateOverTime(Date updateTime) {
         // 1. 增加4小时
@@ -1313,6 +1315,7 @@ public class OrderServiceImpl implements OrderService {
         }
         return Date.from(overTime.atZone(java.time.ZoneId.systemDefault()).toInstant());
     }
+
     //单独处理待上门通知
     public void checkTimeoutDoor(OrderDetail order) {
         log.info("子单超时开始:单号:{}, 内容:{}", order.getCode(), order);
@@ -1392,6 +1395,7 @@ public class OrderServiceImpl implements OrderService {
         }
 
     }
+
     public static boolean isSameYearMonthDay(Date date1, Date date2) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         // 格式化为本地时间的字符串（忽略时间部分）
@@ -1399,6 +1403,7 @@ public class OrderServiceImpl implements OrderService {
         String dateStr2 = sdf.format(date2);
         return dateStr1.equals(dateStr2);
     }
+
     @Override
     public void orderServerToFinishCheck() {
         List<OrderDetail> orderDetails = orderDetailService.selectByStatus(Collections.singletonList(OrderStatus.SERVER.code()));