1

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -274,10 +274,12 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             WxUser wxUser = wxUserService.getById(JwtUtil.getUserName(wxToken));
             userName = wxUser.getPhoneNumber();
         }else {
-            String redisKey = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(), sessionId);
-            log.info("rediskey:{}",redisKey);
-            if(redisUtil.hasKey(redisKey)){
-                roomVo.setTakeLookLock(0);
+            if(StringUtils.isNotBlank(sessionId)){
+                String redisKey = String.format(RedisKeyUtil.roomPassword, room.getRoomId(), room.getVisitPassword(), sessionId);
+                log.info("rediskey:{}",redisKey);
+                if(redisUtil.hasKey(redisKey)){
+                    roomVo.setTakeLookLock(0);
+                }
             }
         }
 
@@ -344,7 +346,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             }
         }
         if(type.equals("leader")){                          //检查房间场景可用性
-            RoomVo roomVo = this.getRoomInfo(roomId,null,null);
+            RoomVo roomVo = this.getRoomInfo(roomId,null,null,null);
             List<SceneVo> sceneData = roomVo.getSceneData();
             for (SceneVo sceneDatum : sceneData) {
                 if(sceneDatum.getStatus() != 2){
@@ -549,7 +551,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         if(room == null){
             throw new BusinessException(ResultCode.ROOM_MISS);
         }
-        if(!room.getPlatform().equals("fd")){
+        if(!room.getPlatform().equals("fd") && !room.getPlatform().equals("ucenter")){
             throw new BusinessException(ResultCode.ROOM_DISSOLVE_ERROR);
         }
         LambdaUpdateWrapper<Room> wrapper = new LambdaUpdateWrapper<>();