|  | @@ -987,7 +987,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 | 
	
		
			
				|  |  |          	}*/
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    	MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(studentRegistration.getMusicGroupId());
 | 
	
		
			
				|  |  | +    	MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(studentRegistration.getMusicGroupId());
 | 
	
		
			
				|  |  |          if(musicGroupRegCalender == null){
 | 
	
		
			
				|  |  |          	throw new BizException("缴费信息不存在");
 | 
	
		
			
				|  |  |          }
 | 
	
	
		
			
				|  | @@ -1061,7 +1061,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          //新课程形态
 | 
	
		
			
				|  |  |          List<MusicGroupPaymentCalenderCourseSettings> newCourses = new ArrayList<>();
 | 
	
		
			
				|  |  | -        if (registerPayDto.getNewCourse() != null && registerPayDto.getNewCourse().size() > 0) {
 | 
	
		
			
				|  |  | +        if (musicGroupRegCalender.getPayUserType() == PayUserType.STUDENT && registerPayDto.getNewCourse() != null && registerPayDto.getNewCourse().size() > 0) {
 | 
	
		
			
				|  |  |              newCourses = musicGroupPaymentCalenderCourseSettingsDao.getCalenderCourseSettings(registerPayDto.getNewCourse());
 | 
	
		
			
				|  |  |              for (MusicGroupPaymentCalenderCourseSettings calenderCourseSetting : newCourses) {
 | 
	
		
			
				|  |  |                  if (remitCourseRFeeFlag && !calenderCourseSetting.getIsStudentOptional()) {
 |