update

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

@@ -2225,9 +2225,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         List<StudentPaymentOrder> studentPaymentOrderList = new ArrayList<StudentPaymentOrder>();
         
 		if (studentRegistration.getMusicGroupPaymentCalenderId() == null) {
-			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, musicGroupId, SUCCESS);
-			if (studentPaymentOrder != null) {
-				studentPaymentOrderList.add(studentPaymentOrder);
+			if(currentStudentMusicGroupStatus == StudentMusicGroupStatusEnum.NORMAL){
+				StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, musicGroupId, SUCCESS);
+				if (studentPaymentOrder != null) {
+					studentPaymentOrderList.add(studentPaymentOrder);
+				}
 			}
 		} else {
 			studentPaymentOrderList = studentPaymentOrderService.queryByBatchNo(sysUser.getId(), studentRegistration.getMusicGroupPaymentCalenderId() + "",

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

@@ -896,6 +896,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
         studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
         studentRegistration.setTemporaryCourseFee(studentAddDto.getTemporaryCourseFee());
+        studentRegistration.setMusicGroupPaymentCalenderId(null);
         
         //增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, studentRegistration.getSubjectId(), 1);