|
@@ -125,9 +125,9 @@ public class RoomServiceImpl implements RoomService {
|
|
|
String userId = sysUser.getId().toString();
|
|
|
Teacher teacher = teacherDao.get(Integer.parseInt(userId));
|
|
|
CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
|
|
|
- /*if(courseSchedule.getTeachMode() == TeachModeEnum.OFFLINE){
|
|
|
+ if(courseSchedule.getTeachMode() == TeachModeEnum.OFFLINE){
|
|
|
throw new ApiException(ErrorEnum.JOIN_ROOM_ERROR, "加入房间失败,请前往线下教室");
|
|
|
- }*/
|
|
|
+ }
|
|
|
if(teacher != null && userId.equals(courseSchedule.getActualTeacherId())){
|
|
|
courseScheduleStudentPaymentDao.adjustPlayMidi(Long.parseLong(roomId),null,null);
|
|
|
userName = sysUser.getRealName();
|
|
@@ -391,7 +391,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
roomMemberDao.save(roomMember);
|
|
|
}
|
|
|
|
|
|
- @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
|
|
|
+ @Transactional(rollbackFor = Exception.class, isolation = Isolation.SERIALIZABLE)
|
|
|
@Override
|
|
|
public Boolean leaveRoom(String roomId) throws Exception {
|
|
|
SysUser user = sysUserFeignService.queryUserInfo();
|