Merge branch 'feature/0803-im'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ImNetworkRoomMemberResult.java

@@ -34,7 +34,7 @@ public class ImNetworkRoomMemberResult implements Serializable {
     private String userName;
 
     @ApiModelProperty(value = "用户头像")
-    private String avatar;
+    private String headUrl;
 
     @ApiModelProperty(value = "进入时间;")
     private Long joinTime;

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -163,6 +163,6 @@
         FROM course_schedule_student_payment cssp
         LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
         WHERE cssp.course_id_ = #{scheduleId}
-        AND NOT EXISTS (SELECT rm.user_id_ FROM im_network_room_member rm WHERE rm.room_id_ = #{scheduleId} AND rm.user_id_ = cssp.user_id_ AND rm.role_ = 0)
+        AND NOT EXISTS (SELECT rm.user_id_ FROM im_network_room_member rm WHERE rm.room_id_ = #{scheduleId} AND rm.user_id_ = cssp.user_id_ AND rm.role_ = 3)
     </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImNetworkRoomMemberMapper.xml

@@ -33,7 +33,7 @@
         a.room_id_ as roomId,
         a.user_id_ as userId,
         a.username_ as userName,
-        a.avatar_ as avatar,
+        a.avatar_ as headUrl,
         unix_timestamp(a.join_time_) * 1000 as joinTime,
         a.role_ as role,
         a.camera_flag_ as camera,