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

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

@@ -1456,16 +1456,26 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     private void checkOrderDate(CreateOrderRequest request) {
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<SOrder> sOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<SOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus());
+        sOrderLambdaQueryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus());
+        orderLambdaQueryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus());
         queryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
+        sOrderLambdaQueryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
+        orderLambdaQueryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
 //        queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
         queryWrapper.eq(SOrder::getIsDelete,YesNoEnum.no.getIndex());
+        sOrderLambdaQueryWrapper.eq(SOrder::getIsDelete, YesNoEnum.no.getIndex());
+        orderLambdaQueryWrapper.eq(SOrder::getIsDelete, YesNoEnum.no.getIndex());
         queryWrapper.eq(SOrder::getStoreId, request.getStoreId());
+        sOrderLambdaQueryWrapper.eq(SOrder::getStoreId, request.getStoreId());
+        orderLambdaQueryWrapper.eq(SOrder::getStoreId, request.getStoreId());
         queryWrapper.eq(SOrder::getRoomId, request.getRoomId());
-        LambdaQueryWrapper<SOrder> sOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        LambdaQueryWrapper<SOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        BeanUtils.copyProperties(queryWrapper, sOrderLambdaQueryWrapper);
-        BeanUtils.copyProperties(queryWrapper, orderLambdaQueryWrapper);
+        sOrderLambdaQueryWrapper.eq(SOrder::getRoomId, request.getRoomId());
+        orderLambdaQueryWrapper.eq(SOrder::getRoomId, request.getRoomId());
+        sOrderLambdaQueryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
+        orderLambdaQueryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
 //        queryWrapper.ne(SOrder::getConsumerId, user.getId());
         switch (OrderTypeEnum.getEnumByCode(request.getOrderType())) {
             case RESERVER://预定
@@ -1486,7 +1496,6 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreEndDate())
                         + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreEndDate()) +
                         "' " + "<= IFNULL(end_date,pre_end_date))");
-
                 orderLambdaQueryWrapper.apply("(IFNULL(start_date,pre_start_date) >= '"
                         + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreStartDate())
                         + "' AND IFNULL(start_date,pre_start_date) <= '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, request.getPreEndDate()) + "' " +