Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec into 2021-double-eleven

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

@@ -2271,7 +2271,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 groupEventSource.musicGroupStudentChangeEvent(musicGroupId, StudentMusicGroupStatusEnum.QUIT, new ArrayList<>(Arrays.asList(userId)));
 
             }
-            if (returnFeeDto.getIsReturnMemberFee()){
+            /*if (returnFeeDto.getIsReturnMemberFee()){
                 if(musicGroup.getCourseViewType() != CourseViewTypeEnum.MEMBER_FEE){
                     throw new BizException("非会员乐团不允许退云教练");
                 }
@@ -2325,7 +2325,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             } else {
                 //删除乐团会员时长
                 studentRegistrationDao.cleanMusicMember(userId,musicGroupId);
-            }
+            }*/
 
             if (returnFeeDto.getIsReturnCourseFee()) {
                 // 退课程费用
@@ -2606,7 +2606,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //统计变更学员数
             groupEventSource.musicGroupStudentChangeEvent(musicGroupId, StudentMusicGroupStatusEnum.QUIT, new ArrayList<>(Arrays.asList(userId)));
         }
-
+/*
         if (isRefundMemberFee){
             if(musicGroup.getCourseViewType() != CourseViewTypeEnum.MEMBER_FEE){
                 throw new BizException("非会员乐团不允许退云教练");
@@ -2661,7 +2661,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }else {
             //删除乐团会员时长
             studentRegistrationDao.cleanMusicMember(userId,musicGroupId);
-        }
+        }*/
 
         if (isRefundCourseFee) {
             // 退课程费用