订单下单查询预约时间增加查询情况

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

@@ -1527,9 +1527,6 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 throw new BaseException("订单类型异常！");
         }
         List<SOrder> orderList = list(queryWrapper);
-        List<SOrder> sOrderList = list(sOrderLambdaQueryWrapper);
-        List<SOrder> orders = list(orderLambdaQueryWrapper);
-
         if (CollectionUtils.isNotEmpty(orderList)) {
             Optional<SOrder> lastOrderOp = orderList.stream().max(Comparator.comparing(SOrder::getPreEndDate));
             SOrder lastOrder = lastOrderOp.orElse(null);
@@ -1558,8 +1555,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             }
             throw new BaseException("下单时间已被预定！");
         }
-        if (CollectionUtils.isNotEmpty(sOrderList) || CollectionUtils.isNotEmpty(orders)) {
-            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)) {
+                throw new BaseException("下单时间已被预定！");
+            }
         }
     }