修改续单下单时间判断

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

@@ -1029,7 +1029,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         queryWrapper.eq(SOrder::getIsDelete,YesNoEnum.no.getIndex());
         queryWrapper.eq(SOrder::getStoreId, request.getStoreId());
         queryWrapper.eq(SOrder::getRoomId, request.getRoomId());
-        queryWrapper.ne(SOrder::getConsumerId, user.getId());
+//        queryWrapper.ne(SOrder::getConsumerId, user.getId());
         switch (OrderTypeEnum.getEnumByCode(request.getOrderType())) {
             case RESERVER://预定
                 //订单开始时间在 【预定开始时间 和 预定结束时间+30分保洁】区间内
@@ -1067,6 +1067,9 @@ 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 (lastOrder.getConsumerId().equals(user.getId())) {
+                return;
+            }
             if(Objects.nonNull(lastOrder)&&Objects.nonNull(lastOrder.getEndDate())&&lastOrder.getEndDate().compareTo(request.getPreStartDate())<0){
                 SCleanRecords sCleanRecords = cleanRecordsService.lastCleanByRoomId(lastOrder.getRoomId());
                 if (ObjectUtils.isEmpty(sCleanRecords)) {