update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -121,12 +121,14 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             List<CourseScheduleStudentMusicSheetResult> lists = JSON.parseArray(toJSONString, CourseScheduleStudentMusicSheetResult.class);
             roomMember.setScheduleStudentMusicScores(lists);
         }
-        joinRoomResult.setUserInfo(JSONObject.parseObject(JSONObject.toJSONString(roomMember),ImNetworkRoomMemberResult.class));
+        ImNetworkRoomMemberResult memberResult = JSONObject.parseObject(JSONObject.toJSONString(roomMember), ImNetworkRoomMemberResult.class);
+        memberResult.setJoinTime(roomMember.getJoinTime().getTime());
+        joinRoomResult.setUserInfo(memberResult);
         //获取教室剩余时长
         joinRoomResult.setSurplusTime(DateUtil.secondsBetween(now, courseSchedule.getEndTime()));
         //获取房间所有成员
         List<ImNetworkRoomMember> roomMemberList = imNetworkRoomMemberService.lambdaQuery().eq(ImNetworkRoomMember::getRoomId,roomId).list();
-        joinRoomResult.setMembers(JSONObject.parseArray(JSONObject.toJSONString(roomMemberList),ImNetworkRoomMemberResult.class));
+        joinRoomResult.setMembers(JSONObject.parseArray(JSONObject.toJSONString(roomMemberList), ImNetworkRoomMemberResult.class));
         //如果是老师，
         if(userRole == RoleEnum.RoleTeacher){
             //重置节拍器数据
@@ -194,7 +196,9 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             List<CourseScheduleStudentMusicSheetResult> lists = JSON.parseArray(toJSONString, CourseScheduleStudentMusicSheetResult.class);
             roomMember.setScheduleStudentMusicScores(lists);
         }
-        joinRoomResult.setUserInfo(JSONObject.parseObject(JSONObject.toJSONString(roomMember),ImNetworkRoomMemberResult.class));
+        ImNetworkRoomMemberResult memberResult = JSONObject.parseObject(JSONObject.toJSONString(roomMember), ImNetworkRoomMemberResult.class);
+        memberResult.setJoinTime(roomMember.getJoinTime().getTime());
+        joinRoomResult.setUserInfo(memberResult);
         //获取教室剩余时长
         joinRoomResult.setSurplusTime(DateUtil.secondsBetween(new Date(), courseSchedule.getEndTime()));
         //获取房间所有成员