|
@@ -1859,6 +1859,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroupStudentFeeDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
// 退团
|
|
|
BigDecimal surplusCourseFee = studentRegistration.getSurplusCourseFee();
|
|
|
+ StudentMusicGroupStatusEnum currentStudentMusicGroupStatus = studentRegistration.getMusicGroupStatus();
|
|
|
studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.QUIT);
|
|
|
studentRegistration.setSurplusCourseFee(BigDecimal.ZERO);
|
|
|
studentRegistration.setUpdateTime(date);
|
|
@@ -1915,7 +1916,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroupSubjectPlanDao.update(musicGroupSubjectPlan);
|
|
|
}
|
|
|
|
|
|
- if(studentRegistration.getMusicGroupStatus() != StudentMusicGroupStatusEnum.NORMAL){
|
|
|
+ if(currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.NORMAL){
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -2032,6 +2033,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroupStudentFeeDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
|
|
|
|
|
|
BigDecimal surplusCourseFee = studentRegistration.getSurplusCourseFee();
|
|
|
+ StudentMusicGroupStatusEnum currentStudentMusicGroupStatus = studentRegistration.getMusicGroupStatus();
|
|
|
// 退团
|
|
|
studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.QUIT);
|
|
|
studentRegistration.setSurplusCourseFee(BigDecimal.ZERO);
|
|
@@ -2089,7 +2091,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
musicGroupSubjectPlanDao.update(musicGroupSubjectPlan);
|
|
|
}
|
|
|
|
|
|
- if(studentRegistration.getMusicGroupStatus() != StudentMusicGroupStatusEnum.NORMAL){
|
|
|
+ if(currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.NORMAL){
|
|
|
return true;
|
|
|
}
|
|
|
|