|
@@ -450,7 +450,7 @@ public class KfOrderServiceImpl implements IKfOrderService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 校验并批量删除散客入住信息
|
|
|
|
|
|
|
+ * 解锁房间
|
|
|
*
|
|
*
|
|
|
* @param ids 待删除的主键集合
|
|
* @param ids 待删除的主键集合
|
|
|
* @param isValid 是否进行有效性校验
|
|
* @param isValid 是否进行有效性校验
|
|
@@ -482,7 +482,8 @@ public class KfOrderServiceImpl implements IKfOrderService {
|
|
|
// 4. 重设锁房缓存
|
|
// 4. 重设锁房缓存
|
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
|
Long teamId = delOrders.get(0).getTeamId();
|
|
Long teamId = delOrders.get(0).getTeamId();
|
|
|
- RedisUtils.deleteObject(CacheNames.CLASS_ROOM + "_" + teamId);
|
|
|
|
|
|
|
+ String key = CacheNames.CLASS_ROOM + "_" + teamId;
|
|
|
|
|
+ RedisUtils.deleteObject(key);
|
|
|
// 获取当前团队的所有房间代码
|
|
// 获取当前团队的所有房间代码
|
|
|
Set<String> allRoomCodes = new HashSet<>();
|
|
Set<String> allRoomCodes = new HashSet<>();
|
|
|
allRoomCodes.addAll(
|
|
allRoomCodes.addAll(
|
|
@@ -490,13 +491,15 @@ public class KfOrderServiceImpl implements IKfOrderService {
|
|
|
Wrappers.lambdaQuery(KfOrder.class)
|
|
Wrappers.lambdaQuery(KfOrder.class)
|
|
|
.select(KfOrder::getRoomCode)
|
|
.select(KfOrder::getRoomCode)
|
|
|
.eq(KfOrder::getTeamId, teamId)
|
|
.eq(KfOrder::getTeamId, teamId)
|
|
|
- .eq(KfOrder::getOrderStatus, HotelBusinessConstants.ORDER_STATUS_SF))
|
|
|
|
|
|
|
+ .eq(KfOrder::getOrderStatus, HotelBusinessConstants.ORDER_STATUS_SF)
|
|
|
|
|
+ .orderByAsc(KfOrder::getOrderIndex))
|
|
|
.stream()
|
|
.stream()
|
|
|
.map(KfOrderVo::getRoomCode)
|
|
.map(KfOrderVo::getRoomCode)
|
|
|
.collect(Collectors.toSet())
|
|
.collect(Collectors.toSet())
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
- RedisUtils.setCacheObject(CacheNames.CLASS_ROOM + "_" + teamId, allRoomCodes);
|
|
|
|
|
|
|
+ LinkedBlockingQueue<String> concurrentLinkedQueue = new LinkedBlockingQueue<>(allRoomCodes);
|
|
|
|
|
+ RedisUtils.setCacheObject(key, concurrentLinkedQueue);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return count > 0;
|
|
return count > 0;
|