系统收费

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -603,7 +603,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     int getFirstPayNum(@Param("musicGroupId") String musicGroupId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
-     * 获取不在班的学员列表
+     * 获取不在指定班级类型的学员列表
      * @param musicGroupId
      * @return
      */

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

@@ -79,7 +79,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		//校验当前乐团是否所有学员都在班
 		String notClassName = studentRegistrationDao.getNotClassName(musicGroupId);
 		if(StringUtils.isNotEmpty(notClassName)){
-			throw new BizException("操作失败：{} 学员未在任何班级",notClassName);
+			throw new BizException("操作失败：{} 学员未在以下任何班级",notClassName);
 		}
 		MusicGroupSchoolTermCourseDetail courseDetail = musicGroupSchoolTermCourseDetailDao.
 				findByCourseDateAndMusicGroupId(musicGroupId,null,0);

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

@@ -1502,7 +1502,9 @@
         SELECT GROUP_CONCAT(DISTINCT su.username_) FROM student_registration sr
         LEFT JOIN sys_user su ON su.id_ = sr.user_id_
         WHERE sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL'
-        AND sr.user_id_ NOT IN (SELECT DISTINCT user_id_ FROM class_group_student_mapper WHERE music_group_id_ = #{musicGroupId} AND group_type_ = 'MUSIC' AND status_ != 'QUIT')
+        AND sr.user_id_ NOT IN (SELECT DISTINCT cgsm.user_id_ FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
+        WHERE cgsm.music_group_id_ = #{musicGroupId} AND cgsm.group_type_ = 'MUSIC' AND cgsm.status_ != 'QUIT' AND cg.type_ IN ('SNAP','NORMAL','MIX'))
     </select>
     <select id="checkHasMemberGroup" resultType="java.lang.Boolean">
         SELECT COUNT(sr.id_) > 0 FROM student_registration sr