1、试听课

2、收费网管课活动

mec-biz/src/main/resources/config/mybatis/PracticeGroupMapper.xml

@@ -535,7 +535,11 @@
                 SELECT student_id_ FROM practice_group WHERE type_='CHARGE' AND group_status_ IN ('NORMAL', 'FINISH')
             )
             AND NOT EXISTS (
-                SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=su.id_ AND cs.teach_mode_='ONLINE' AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
+                SELECT user_id_ FROM course_schedule_student_payment cssp
+                LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_
+                WHERE cssp.user_id_=su.id_ AND cs.teach_mode_='ONLINE'
+                AND NOT EXISTS(SELECT student_id_ FROM practice_group WHERE cssp.music_group_id_=id_ AND cssp.group_type_='PRACTICE' AND type_!='TRIAL')
+                AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
             )
         <include refid="global.limit"/>
     </select>
@@ -560,7 +564,11 @@
                 SELECT student_id_ FROM practice_group WHERE type_='CHARGE' AND group_status_ IN ('NORMAL', 'FINISH')
             )
             AND NOT EXISTS (
-                SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=su.id_ AND cs.teach_mode_='ONLINE' AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
+                SELECT user_id_ FROM course_schedule_student_payment cssp
+                LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_
+                WHERE cssp.user_id_=su.id_ AND cs.teach_mode_='ONLINE'
+                AND NOT EXISTS(SELECT student_id_ FROM practice_group WHERE cssp.music_group_id_=id_ AND cssp.group_type_='PRACTICE' AND type_!='TRIAL')
+                AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
             )
     </select>
     <select id="findEnableAssignTeachers" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
@@ -655,10 +663,11 @@
 
     <select id="countStudentAndTeacherTrialPractices" resultType="int">
         SELECT COUNT(id_)
-        FROM practice_group pg
+        FROM course_schedule cs
+            LEFT JOIN practice_group pg ON cs.music_group_id_=pg.id_
         WHERE
             pg.type_ = 'TRIAL'
-            AND pg.user_id_ = #{teacherId}
+            AND cs.actual_teacher_id_ = #{teacherId}
             AND pg.student_id_ = #{studentId}
     </select>
     <select id="checkStudentExitChargePractice" resultType="int">