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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupMember.java

@@ -30,16 +30,6 @@ public class ImGroupMember {
 	/**  */
 	private java.util.Date updateTime;
 
-	private Integer hasMember;
-
-	public Integer getHasMember() {
-		return hasMember;
-	}
-
-	public void setHasMember(Integer hasMember) {
-		this.hasMember = hasMember;
-	}
-
 	public void setId(Long id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImUserFriend.java

@@ -23,22 +23,12 @@ public class ImUserFriend {
 	
 	private String tags;
 
-	private Integer hasMember;
-
 	/**  */
 	private java.util.Date createTime;
 
 	/**  */
 	private java.util.Date updateTime;
 
-	public Integer getHasMember() {
-		return hasMember;
-	}
-
-	public void setHasMember(Integer hasMember) {
-		this.hasMember = hasMember;
-	}
-
 	public void setId(Long id) {
 		this.id = id;
 	}

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

@@ -912,6 +912,8 @@ public class StudentServeServiceImpl implements StudentServeService {
         }
         List<Integer> studentIds=new ArrayList<>();
         if(StringUtils.isNotBlank(studentIdsStr)){
+            //获取有会员的学员数
+            result.put("memberNum", studentDao.getMemberNum(studentIdsStr));
             studentIds= Arrays.asList(studentIdsStr.split(",")).stream().map(id->Integer.valueOf(id)).collect(Collectors.toList());
         }
 
@@ -926,9 +928,6 @@ public class StudentServeServiceImpl implements StudentServeService {
             MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
             if(musicGroup != null){
                 result.put("courseViewType", CourseViewTypeEnum.MEMBER_FEE);
-            }else {
-                //获取有会员的学员数
-                result.put("memberNum", studentDao.getMemberNum(studentIdsStr));
             }
             localDate=LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
             List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseScheduleId);

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

@@ -3884,7 +3884,7 @@
             </foreach>
     </select>
     <select id="queryPreCourseListByClassGroupId" resultMap="CourseSchedule">
-        SELECT <include refid="resultSql"/> FROM course_schedule WHERE class_group_id_ = #{classGroupId}
+        SELECT <include refid="resultSql"/> FROM course_schedule cs WHERE class_group_id_ = #{classGroupId}
         AND is_lock_ = 1 AND pre_course_flag_ = 1
     </select>
 

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

@@ -30,7 +30,6 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="username_" property="user.username" />
 		<result column="avatar_" property="user.avatar" />
-		<result column="member_rank_setting_id_" property="hasMember" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -131,9 +130,7 @@
 	
 	<select id="queryMemberById" resultMap="ImGroupMemberDto">
 		SELECT igm.*,u.avatar_,case when find_in_set('STUDENT',u.user_type_) then u.username_ else u.real_name_ end username_
-					,CASE WHEN s.member_rank_setting_id_ IS NULL THEN 0 ELSE 1 END member_rank_setting_id_
 		FROM im_group_member igm left join sys_user u on igm.user_id_ = u.id_
-								 LEFT JOIN student s ON s.user_id_ = u.id_
 		where igm.im_group_id_ = #{imGroupId}
 	</select>
 	

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

@@ -13,7 +13,6 @@
 		<result column="friend_nickname_" property="friendNickname" />
 		<result column="memo_" property="memo" />
 		<result column="tags_" property="tags" />
-		<result column="member_rank_setting_id_" property="hasMember" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -91,10 +90,9 @@
 	</select>
 	
 	<select id="queryFriendListByUserId" resultMap="ImUserFriendDto" parameterType="map">
-		SELECT iuf.*,u.real_name_,u.avatar_,u.phone_,u.user_type_,CASE WHEN s.member_rank_setting_id_ IS NULL THEN 0 ELSE 1 END member_rank_setting_id_
+		SELECT iuf.*,u.real_name_,u.avatar_,u.phone_,u.user_type_
 		FROM im_user_friend iuf
 		LEFT JOIN sys_user u ON iuf.friend_id_ = u.id_
-		LEFT JOIN student s ON s.user_id_ = u.id_
 		WHERE iuf.user_id_ = #{userId}
 		<if test="search != null">
 			and (u.real_name_ like concat('%',#{search},'%') or iuf.friend_nickname_ like concat('%',#{search},'%'))