|  | @@ -1107,7 +1107,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 | 
	
		
			
				|  |  |          musicGroupStudentFeeDao.insert(musicGroupStudentFee);
 | 
	
		
			
				|  |  |          
 | 
	
		
			
				|  |  |          for(MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenderList){
 | 
	
		
			
				|  |  | -        	if(currentPaymentCalenderId == musicGroupPaymentCalender.getId()){
 | 
	
		
			
				|  |  | +        	if(currentPaymentCalenderId.longValue() == musicGroupPaymentCalender.getId()){
 | 
	
		
			
				|  |  |                  //更新实际缴费人数
 | 
	
		
			
				|  |  |          		musicGroupPaymentCalender.setActualNum(musicGroupPaymentCalender.getActualNum() + 1);
 | 
	
		
			
				|  |  |          	}
 | 
	
	
		
			
				|  | @@ -1127,10 +1127,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 | 
	
		
			
				|  |  |          
 | 
	
		
			
				|  |  |  		for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenderList) {
 | 
	
		
			
				|  |  |  			MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
 | 
	
		
			
				|  |  | -			musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupRegCalender.getId());
 | 
	
		
			
				|  |  | +			musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
 | 
	
		
			
				|  |  |  			musicGroupPaymentCalenderDetail.setUserId(studentPaymentOrder.getUserId());
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -			if (currentPaymentCalenderId == musicGroupPaymentCalender.getId()) {
 | 
	
		
			
				|  |  | +			if (currentPaymentCalenderId.longValue() == musicGroupPaymentCalender.getId()) {
 | 
	
		
			
				|  |  |  				musicGroupPaymentCalenderDetail.setExpectAmount(courseTotalPrice);
 | 
	
		
			
				|  |  |  				musicGroupPaymentCalenderDetail.setActualAmount(courseTotalPrice);
 | 
	
		
			
				|  |  |  				musicGroupPaymentCalenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
 | 
	
	
		
			
				|  | @@ -1143,8 +1143,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 | 
	
		
			
				|  |  |  				musicGroupPaymentCalenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.NON_PAYMENT);
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  			musicGroupPaymentCalenderDetail.setUserStatus(null);
 | 
	
		
			
				|  |  | -			musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupRegCalender.getDeadlinePaymentDate());
 | 
	
		
			
				|  |  | -			musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupRegCalender.getStartPaymentDate());
 | 
	
		
			
				|  |  | +			musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
 | 
	
		
			
				|  |  | +			musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
 | 
	
		
			
				|  |  |  			musicGroupPaymentCalenderDetail.setCreateTime(nowDate);
 | 
	
		
			
				|  |  |  			musicGroupPaymentCalenderDetail.setUpdateTime(nowDate);
 | 
	
		
			
				|  |  |  
 |