系统收费

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

@@ -826,15 +826,15 @@
         SELECT COUNT(c.user_id_) FROM
         (SELECT sr.user_id_ FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = sr.user_id_
+        LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = sr.user_id_ AND cto.status_ IN (1,2)
         LEFT JOIN sys_user su ON su.id_ = sr.user_id_
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
         <include refid="queryMusicMemberListSql"/>
-        GROUP BY cto.student_id_ HAVING MIN(cto.status_) != 1
+        GROUP BY cto.student_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
         <if test="hasMember != null">
             <if test="hasMember == 0">
-                AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0
+                AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0)
             </if>
             <if test="hasMember == 1">
                 AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0