下单套餐校验bugfix

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

@@ -425,9 +425,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     }
                     //1 开始时段>结束时段，代表可用时段跨日，则应该预约开始时间<可用开始时间，预约结束时间>可用结束时间
                 } else {
-                    if (packaStartPeriod.compareTo(preStartHour) < 0 || preEndHour.compareTo(packaEndPeriod) < 0) {
+//                    if (packaStartPeriod.compareTo(preStartHour) < 0 || preEndHour.compareTo(packaEndPeriod) < 0) {
                         throw new BaseException("预约时段非套餐可用时段！");
-                    }
+//                    }
                 }
             }
         }
@@ -470,7 +470,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (CollectionUtils.isNotEmpty(orderList)) {
             Optional<SOrder> lastOrderOp = orderList.stream().max(Comparator.comparing(SOrder::getPreEndDate));
             SOrder lastOrder = lastOrderOp.orElse(null);
-            if(Objects.nonNull(lastOrder)&&Objects.nonNull(lastOrder.getEndDate())){
+            if(Objects.nonNull(lastOrder)&&Objects.nonNull(lastOrder.getEndDate())&&lastOrder.getEndDate().compareTo(request.getPreStartDate())<0){
                 SCleanRecords sCleanRecords = cleanRecordsService.lastCleanByRoomId(lastOrder.getRoomId());
                 if(sCleanRecords.getStatus().compareTo(CleaningStatusEnum.CLEANED.getCode())==0
                 &&sCleanRecords.getEndDate().compareTo(lastOrder.getEndDate())>0