| 
					
				 | 
			
			
				@@ -299,10 +299,10 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <sql id="studentVipGroupQueryCondition"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <where> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            vg.status_!=3 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            AND vg.audit_status_='PASS' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            vg.audit_status_='PASS' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AND vg.status_=1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AND vg.courses_expire_date_ >= DATE_FORMAT(NOW(),'%Y%m%d') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            AND vg.courses_start_date > NOW() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AND (select count(1) as num from student_payment_order where vg.id_ = music_group_id_ AND user_id_=#{userId} AND status_='SUCCESS') = 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="subjectId!=null"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                AND FIND_IN_SET(#{subjectId},cg.subject_id_list_) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -740,7 +740,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           vip_group 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         WHERE 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          payment_expire_date_ < DATE_FORMAT(NOW( ),'%Y-%m-%d') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          (payment_expire_date_ < DATE_FORMAT(NOW( ),'%Y-%m-%d') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          OR courses_start_date < NOW()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           AND status_ =1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |