update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -408,7 +408,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         List<CourseScheduleDto> teacherCourseSchedulesWithDate = courseScheduleDao.getTeacherCourseSchedulesWithDate(classDate, userId.longValue(), type);
         List<Long> allCourseScheduleIds = teacherCourseSchedulesWithDate.stream().map(CourseScheduleDto::getId).collect(Collectors.toList());
         List<Long> courseScheduleIds = teacherCourseSchedulesWithDate.stream()
-                .filter(cs -> cs.getType().equals(CourseSchedule.CourseScheduleType.VIP) || cs.getType().equals(CourseSchedule.CourseScheduleType.DEMO))
+                .filter(cs -> cs.getType().equals(CourseSchedule.CourseScheduleType.VIP) ||
+                        cs.getType().equals(CourseSchedule.CourseScheduleType.DEMO) ||
+                        cs.getType().equals(CourseSchedule.CourseScheduleType.PRACTICE))
                 .map(CourseScheduleDto::getId).collect(Collectors.toList());
 
         Map<Integer, String> subjectNameCourseMap = new HashMap<>();

mec-im/src/main/java/com/ym/dao/RoomMemberDao.java

@@ -2,11 +2,13 @@ package com.ym.dao;
 
 import com.ym.pojo.RoomMember;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.persistence.LockModeType;
 import java.util.List;
 
 /**
@@ -16,6 +18,7 @@ import java.util.List;
 public interface RoomMemberDao extends JpaRepository<RoomMember, Long> {
     public List<RoomMember> findByRid(String rid);
 
+    @Lock(value = LockModeType.PESSIMISTIC_WRITE)
     public List<RoomMember> findByRidAndUid(String rid, String uid);
 
     public List<RoomMember> findByRidAndRole(String rid, int role);

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

@@ -255,7 +255,8 @@ public class RoomServiceImpl implements RoomService {
         List<Room> roomList = roomDao.findByRid(roomId);
         if (roomList.size() == 0) {
             log.error("room : {} not exist ", roomId);
-            throw new ApiException(ErrorEnum.ERR_ROOM_NOT_EXIST);
+            return false;
+//            throw new ApiException(ErrorEnum.ERR_ROOM_NOT_EXIST);
         }
 
         List<RoomMember> roomMemberList = roomMemberDao.findByRidAndUid(roomId, userId);