修改续单时间判断

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1568,12 +1568,16 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 //                        + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreEndDate()) + "' ");
                 //订单开始时间在 【预定开始时间 和 预定结束时间+30分保洁】区间内
                 //订单结束时间在 【预定开始时间-30分钟保洁 和 预定结束时间】区间内
-                queryWrapper.apply("(IFNULL(start_date,pre_start_date) BETWEEN '"
+//                queryWrapper.apply("(IFNULL(start_date,pre_start_date) BETWEEN '"
+//                        + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreStartDate())
+//                        + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(request.getPreEndDate(), Constants.ROOM_LOCK_DELAY_MINUTE)) + "' " +
+//                        "OR IFNULL(end_date,pre_end_date) BETWEEN '"
+//                        + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(request.getPreStartDate(), -Constants.ROOM_LOCK_DELAY_MINUTE))
+//                        + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreEndDate()) + "' )");
+                queryWrapper.apply("IFNULL(start_date,pre_start_date) BETWEEN '"
                         + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreStartDate())
-                        + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(request.getPreEndDate(), Constants.ROOM_LOCK_DELAY_MINUTE)) + "' " +
-                        "OR IFNULL(end_date,pre_end_date) BETWEEN '"
-                        + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinutes(request.getPreStartDate(), -Constants.ROOM_LOCK_DELAY_MINUTE))
-                        + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreEndDate()) + "' )");
+                        + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,
+                        DateUtils.addMinutes(request.getPreEndDate(), Constants.ROOM_LOCK_DELAY_MINUTE)) + "' ");
                 break;
             default:
                 throw new BaseException("订单类型异常！");
@@ -1597,20 +1601,24 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 }
                 if (request.getOrderType().equals(OrderTypeEnum.RESERVER.getCode())) {
                     if (!(DateUtils.addMinutes(lastOrder.getEndDate(), Constants.ROOM_LOCK_DELAY_MINUTE).compareTo(request.getPreStartDate()) < 0)) {
+                        unLockOrder(request.getRoomId());
                         throw new BaseException("下单时间已被预定！");
                     }
                 } else if (request.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) {
                     if (!(lastOrder.getEndDate().compareTo(request.getPreStartDate()) < 0)) {
+                        unLockOrder(request.getRoomId());
                         throw new BaseException("下单时间已被预定！");
                     }
                 }
             }
+            unLockOrder(request.getRoomId());
             throw new BaseException("下单时间已被预定！");
         }
         if (request.getOrderType().equals(OrderTypeEnum.RESERVER.getCode())) {
             List<SOrder> sOrderList = list(sOrderLambdaQueryWrapper);
             List<SOrder> orders = list(orderLambdaQueryWrapper);
             if (CollectionUtils.isNotEmpty(sOrderList) || CollectionUtils.isNotEmpty(orders)) {
+                unLockOrder(request.getRoomId());
                 throw new BaseException("下单时间已被预定！");
             }
         }