| 
					
				 | 
			
			
				@@ -2,6 +2,8 @@ package com.ym.mec.student.controller; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.entity.MusicGroup; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.dal.entity.StudentRegistration; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.ym.mec.biz.dal.enums.PaymentStatusEnum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.service.MusicGroupService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.service.MusicGroupSubjectPlanService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ym.mec.biz.service.StudentRegistrationService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -44,6 +46,10 @@ public class MusicGroupRegisterController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (musicGroup.getApplyExpireDate().compareTo(date) <= 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return failed("乐团已截止报名"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(musicGroup.getStatus().equals(MusicGroupStatusEnum.APPLY)||musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         studentRegistration.setOrganId(musicGroup.getOrganId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return succeed(studentRegistrationService.addStudent(studentRegistration)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |