Merge branch 'online1'

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

@@ -1463,8 +1463,7 @@
     </select>
 
     <select id="getRegisterNum" resultType="int">
-        SELECT COUNT(*) FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND music_group_status_ !=
-        'QUIT'
+        SELECT COUNT(*) FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND music_group_status_ != 'QUIT'
     </select>
 
     <select id="getFirstPayNum" resultType="int">
@@ -1473,7 +1472,9 @@
         LEFT JOIN (
         SELECT spo.user_id_, MAX(spo.pay_time_) payTime
         FROM student_payment_order spo
-        WHERE spo.music_group_id_ = #{musicGroupId} AND type_ = 'APPLY'
+        WHERE spo.music_group_id_ = #{musicGroupId}
+        AND spo.status_ = 'SUCCESS'
+        AND spo.type_ = 'APPLY'
         GROUP BY spo.user_id_
         ) o ON o.user_id_ = sr.user_id_
         WHERE sr.music_group_id_ = #{musicGroupId} AND sr.payment_status_=2