系统收费优化

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

@@ -2004,9 +2004,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 groupEventSource.musicGroupStudentChangeEvent(musicGroupId, StudentMusicGroupStatusEnum.QUIT, new ArrayList<>(Arrays.asList(userId)));
 
             }
-            //删除乐团会员时长
-            studentDao.cleanMusicMember(userId);
-            if(isRefundMemberFee){
+            if (isRefundMemberFee){
+                if(musicGroup.getCourseViewType() != CourseViewTypeEnum.MEMBER_FEE){
+                    throw new BizException("非会员乐团不允许退云教练");
+                }
+                //删除乐团会员时长
+                studentDao.cleanMusicMember(userId);
                 //退云教练费用
                 if (cloudTeacherAmount != null) {
                     Date nowDate = new Date();
@@ -2030,6 +2033,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     //清除学员云教练
                     studentService.cleanMember(userId);
                 }
+            }else {
+                //删除乐团会员时长
+                Student student = studentDao.get(userId);
+                if(StringUtils.isNotEmpty(student.getMemberMusicGroupId())){
+                    if(student.getMemberMusicGroupId().equals(musicGroupId)){
+                        studentDao.cleanMusicMember(userId);
+                    }
+                }
             }
 
             if (isRefundCourseFee) {