Merge branch 'vip_price_827'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentDao.java

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

@@ -849,4 +849,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     int countCourseNum(@Param("classGroupId") Integer classGroupId, @Param("teachMode") String teachMode);
     
     List<Mapper> countTeacherByMusicGroupId(String musicGroupId);
+
+    /**
+     * 获取学员班级列表map
+     * @param musicGroupId
+     * @return
+     */
+    List<Map<Integer, String>> queryStudentClassGroupMap(String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -138,7 +138,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 */
 	boolean extensionPreApplyExpireDate(String musicGroupId, Date expireDate);
 
-	/**
+		/**
 	 * 申请退团
 	 * @param reqMusicGroupQuit 
 	 * @param operatorId
@@ -146,6 +146,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 */
 	boolean applyQuitMusicGroup(List<Integer> currentOperatorRoleIds, MusicGroupQuit reqMusicGroupQuit, Integer operatorId);
 
+
 	/**
 	 * 取消退团
 	 * @param userId

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

@@ -864,7 +864,12 @@ public class StudentManageServiceImpl implements StudentManageService {
 
     @Override
     public List<StudentSubTotalCourseTimesDto> queryStudentSubTotalCourseTimes(String musicGroupId) {
-        return musicGroupPaymentStudentCourseDetailDao.queryStudentSubTotalCourseTimes(musicGroupId);
+        List<StudentSubTotalCourseTimesDto> timesDtos = musicGroupPaymentStudentCourseDetailDao.queryStudentSubTotalCourseTimes(musicGroupId);
+        Map<Integer,String> classMap = MapUtil.convertMybatisMap(classGroupDao.queryStudentClassGroupMap(musicGroupId));
+        for (StudentSubTotalCourseTimesDto timesDto : timesDtos) {
+            timesDto.setClassGroupId(classMap.get(timesDto.getUserId()));
+        }
+        return timesDtos;
     }
 
     @Override

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

@@ -3482,6 +3482,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.isNull(vipGroup)){
 			throw new BizException("未找到指定的vip课程");
 		}
+		
+		VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId());
+		
+		if(vipGroupCategory == null){
+			throw new BizException("请修改VIP课课程形式");
+		}
+		
+		if(vipGroupCategory.getStudentNum() < studentCoursePriceMap.size()){
+			throw new BizException("学生人数超过{}人，请调整", vipGroupCategory.getStudentNum());
+		}
 
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId, null);
 
@@ -3491,7 +3501,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("已有学员购买了该课程组，无法添加，请走学员购买流程!");
 			}
 		}
-
+		
 		VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroup(vipGroup.getId());
 		if(Objects.isNull(vipGroupDefaultClassesUnitPrice)){
 			throw new BizException("课程单价设置错误");

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

@@ -1540,4 +1540,9 @@
 		LEFT JOIN sys_user u on u.id_ = cgtm.user_id_
 		where cg.del_flag_ = 0 and cg.group_type_ = 'MUSIC' and cg.music_group_id_ = #{musicGroupId}  group by cg.id_ order by cg.type_
     </select>
+    <select id="queryStudentClassGroupMap" resultType="java.util.Map">
+        SELECT user_id_ 'key',GROUP_CONCAT(class_group_id_) 'value' FROM class_group_student_mapper
+        WHERE music_group_id_ = #{musicGroupId} AND status_ = 'NORMAL'
+        GROUP BY user_id_
+    </select>
 </mapper>

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

@@ -257,10 +257,9 @@
     </resultMap>
     <select id="queryStudentSubTotalCourseTimes" resultMap="StudentSubTotalCourseTimesDto">
         SELECT mgpscd.user_id_,su.username_,su.phone_,mgpscd.course_type_ 'key',
-               SUM(CASE WHEN mgpscd.used_course_minutes_ = 0 THEN mgpscd.total_course_minutes_ ELSE 0 END) 'value',GROUP_CONCAT(DISTINCT cgsm.class_group_id_) class_group_id_
+               SUM(CASE WHEN mgpscd.used_course_minutes_ = 0 THEN mgpscd.total_course_minutes_ ELSE 0 END) 'value'
         FROM music_group_payment_student_course_detail mgpscd
         LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
-        LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = mgpc.music_group_id_ AND cgsm.status_ = 'NORMAL' AND mgpscd.user_id_ = cgsm.user_id_
         LEFT JOIN sys_user su ON su.id_ = mgpscd.user_id_
         WHERE mgpc.music_group_id_ = #{musicGroupId}
         GROUP BY mgpscd.user_id_,mgpscd.course_type_

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

@@ -507,7 +507,6 @@
         FROM student_payment_order
         WHERE status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           AND payment_channel_ = #{paymentChannel}
-        LIMIT 100
     </select>
 
     <!-- 查询支付中超时订单 -->

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

@@ -1106,7 +1106,7 @@
         SELECT *
         FROM student_registration
         WHERE music_group_id_ = #{musicGroupId}
-        AND payment_status_ IN (0, 1)
+        AND payment_status_ IN (0, 1) AND music_group_status_ != 'QUIT'
     </select>
 
     <!-- 获取乐团声部学生数量 -->

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -24,6 +24,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(queryInfo.getClientType() == null){
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
+        queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
 
@@ -34,6 +35,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(queryInfo.getClientType() == null){
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
+        queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicScoreController.java

@@ -32,6 +32,7 @@ public class EduMusicScoreController extends BaseController {
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreAccompanimentService.queryAll(queryInfo));
     }
 
@@ -45,6 +46,7 @@ public class EduMusicScoreController extends BaseController {
         if(queryInfo.getClientType() == null){
             queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         }
+        queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
     }