update

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -233,13 +233,14 @@ public class RoomServiceImpl implements RoomService {
         return roomResult;
     }
 
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     @Override
     public void joinRoomSuccess(String roomId,String userId) throws Exception {
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         if(roomMember == null){
             return ;
         }
+        Room room = roomDao.findByLockRid(roomId);
         log.info("joinRoomSuccess : roomId={}, userId={}", roomId, userId);
         RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
         CourseSchedule schedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
@@ -256,7 +257,7 @@ public class RoomServiceImpl implements RoomService {
         }
 
         Date curTime = DateTimeUtils.currentUTC();
-        Room room = roomDao.findByLockRid(roomId);
+
         if (room == null) {
             //如果房间不存在，删除除了自己之外的其他用户
 //            roomMemberDao.deleteRoomMember(roomId,userId);