Merge remote-tracking branch 'origin/master'

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

@@ -503,6 +503,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
 
     /**
      * 获取乐团已缴费学员数量
+     *
      * @param musicGroupId
      * @return
      */
@@ -510,9 +511,18 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
 
     /**
      * 查找报名中的学员
+     *
      * @param musicGroupId
      * @param studentIds
      * @return
      */
     StudentRegistration findApplyStudent(@Param("musicGroupId") String musicGroupId, @Param("studentIds") List<Integer> studentIds);
+
+    /**
+     * 乐团全部学生退团
+     *
+     * @param musicGroupId
+     * @return
+     */
+    int quitAllStudent(@Param("musicGroupId") String musicGroupId, @Param("remark") String remark);
 }

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

@@ -380,4 +380,12 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
      */
     PageInfo<NoClassMusicStudentDto> queryNoClassMusicStudentInfo(NoClassMusicStudentQueryInfo queryInfo);
 
+    /**
+     * 退团所有的学生
+     * @param musicGroupId
+     * @param remark
+     * @return
+     */
+    Integer quitAllStudent(String musicGroupId, String remark);
+
 }

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

@@ -2058,7 +2058,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
     @Override
     public TeacherIncomeReviewDto getTeacherSalaryOverview(TeacherIncomeQueryInfo queryInfo) {
-        if(Objects.nonNull(queryInfo)&&TeachIncomeTypeEnum.SALE_REWARD.equals(queryInfo.getTeachIncomeType())){
+        if(Objects.nonNull(queryInfo)&&TeachIncomeTypeEnum.SALE_REWARD.getCode().equals(queryInfo.getTeachIncomeType())){
             TeacherIncomeReviewDto teacherSalaryOverview = new TeacherIncomeReviewDto();
             return teacherSalaryOverview;
         }
@@ -2174,7 +2174,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         MapUtil.populateMap(params, queryInfo);
 
 
-        if(Objects.nonNull(queryInfo)&&TeachIncomeTypeEnum.SALE_REWARD.equals(queryInfo.getTeachIncomeType())){
+        if(Objects.nonNull(queryInfo)&&TeachIncomeTypeEnum.SALE_REWARD.getCode().equals(queryInfo.getTeachIncomeType())){
             pageInfo.setTotal(0);
             pageInfo.setRows(Collections.EMPTY_LIST);
             return pageInfo;

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

@@ -2970,6 +2970,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //删除未上课表
         courseScheduleDao.logicDeleteCourseSchedulesByMusicGroupID(musicGroup.getId());
 
+        //将学生退团
+        if (studentRegistrationService.quitAllStudent(musicGroup.getId(), "退团（乐团关闭）") <= 0) {
+            throw new BizException("处理学生退团失败，请重试");
+        }
+
         //统计变更学员数
         groupEventSource.musicGroupStudentChangeEvent(closeMusicGroupDto.getMusicGroupId(), StudentMusicGroupStatusEnum.QUIT, null);
 

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

@@ -1789,4 +1789,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    public Integer quitAllStudent(String musicGroupId, String remark) {
+        return studentRegistrationDao.quitAllStudent(musicGroupId,remark);
+    }
 }

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

@@ -986,4 +986,9 @@
         </foreach>
         LIMIT 1
     </select>
+
+    <update id="quitAllStudent">
+        UPDATE student_registration SET music_group_status_ = 'QUIT',remark_=#{remark} WHERE music_group_id_ = #{musicGroupId}
+        AND music_group_status_ IN ('APPLY','NORMAL')
+    </update>
 </mapper>