Merge remote-tracking branch 'origin/master'

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

@@ -293,7 +293,7 @@
         FROM student_payment_order spo
         LEFT JOIN music_group mg ON spo.music_group_id_=mg.id_
         <where>
-            spo.status_ = 'SUCCESS'
+            spo.status_ = 'SUCCESS' AND spo.group_type_ != 'SPORADIC'
             <if test="date != null and date != ''">
                 AND spo.create_time_ LIKE CONCAT(#{date},'%')
             </if>
@@ -317,7 +317,7 @@
         LEFT JOIN music_group mg ON spo.music_group_id_=mg.id_
         LEFT JOIN vip_group vg ON spo.music_group_id_ = vg.id_
         <where>
-            spo.status_ = 'SUCCESS'
+            spo.status_ = 'SUCCESS' AND spo.group_type_ != 'SPORADIC'
             <if test="date != null and date != ''">
                 AND spo.create_time_ LIKE CONCAT(#{date},'%')
             </if>