修改续单问题

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

@@ -100,9 +100,10 @@ public class RoomStatusServiceImpl implements RoomStatusService {
         if (orderType.equals(OrderTypeEnum.RENEW.getCode())) {
             if (CollectionUtils.isNotEmpty(orderList)) {
                 //查询当前用户是否有使用中的订单
-                orderList = orderList.stream().filter(order -> order.getConsumerId().compareTo(user.getId()) == 0 && order.getStatus().equals(OrderStatusEnum.INUSE.getCode())).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(orderList)) {
-                    isAvailable = true;
+                List<SOrder> newOrderList = orderList.stream().filter(order -> order.getConsumerId().compareTo(user.getId()) == 0 && order.getStatus().equals(OrderStatusEnum.INUSE.getCode())).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(newOrderList)) {
+                    //判断orderList中是否有预约订单
+                    isAvailable = !newOrderList.stream().anyMatch(order -> order.getOrderType().equals(OrderTypeEnum.RESERVER.getCode()));
                 } else {
                     LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(SOrder::getRoomId, room.getId());