Merge branch 'online_music_library' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -166,12 +166,7 @@
 		</where>
 	</update>
 	<update id="adjustExamSong">
-		UPDATE course_schedule_student_payment
-		<set>
-			<if test="examSongJson != null">
-				exam_song_download_json_ = #{examSongJson}
-			</if>
-		</set>
+		UPDATE course_schedule_student_payment SET exam_song_download_json_ = #{examSongJson}
 		WHERE course_schedule_id_ = #{roomId}
 		<if test="userId != null">
 			AND user_id_ = #{userId}

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

@@ -341,19 +341,19 @@ public class RoomServiceImpl implements RoomService {
     public void signInSuccess(RoomMember roomMember) {
         String roomId = roomMember.getRid();
         String userId = roomMember.getUid();
+        Long currentRoomId = Long.parseLong(redisTemplate.opsForValue().get(roomId + userId));
+        log.info("signInSuccess: currentRoomId={}", currentRoomId);
         log.info("signInSuccess: roomId={}, userId={}", roomId, userId);
         Integer userIdInt = Integer.parseInt(userId);
         Long firstCourseId = Long.parseLong(roomId.substring(1));
 
-        Long currentRoomId = Long.parseLong(redisTemplate.opsForValue().get(roomId + userId));
-        log.info("signInSuccess: currentRoomId={}", currentRoomId);
-        redisTemplate.delete(roomId + userId);
         RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
         if(roleEnum == RoleTeacher){
             teacherAttendanceService.addTeacherAttendanceSignIn(firstCourseId,userIdInt,currentRoomId);
         }else {
             studentAttendanceService.addStudentAttendanceSignIn(firstCourseId,userIdInt,currentRoomId);
         }
+        redisTemplate.delete(roomId + userId);
     }
 
     public void saveRoom(String roomId, String roomName, Date createTime, String display) {
@@ -404,6 +404,7 @@ public class RoomServiceImpl implements RoomService {
 
         if(roleEnum == RoleTeacher){
             courseScheduleStudentPaymentDao.adjustPlayMidi(firstCourseId,null,null);
+            courseScheduleStudentPaymentDao.adjustExamSong(firstCourseId.longValue(),null,null);
             teacherAttendanceService.addTeacherAttendanceSignOut(firstCourseId.longValue(),Integer.parseInt(userId));
         }else {
             studentAttendanceService.addStudentAttendanceSignOut(firstCourseId.longValue(),Integer.parseInt(userId));