Merge branch 'online1'

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

@@ -1380,6 +1380,7 @@
         SELECT spo.user_id_, MAX(spo.pay_time_) payTime
         FROM student_payment_order spo
         WHERE spo.music_group_id_ = #{musicGroupId}
+        AND spo.status_ = 'SUCCESS'
         AND type_ = 'APPLY'
         GROUP BY spo.user_id_
         ) o ON o.user_id_ = u.user_id_
@@ -1455,7 +1456,8 @@
         SELECT spo.user_id_, MAX(spo.pay_time_) payTime
         FROM student_payment_order spo
         WHERE spo.music_group_id_ = #{musicGroupId}
-        AND type_ = 'APPLY'
+        AND spo.status_ = 'SUCCESS'
+        AND spo.type_ = 'APPLY'
         GROUP BY spo.user_id_
         ) o ON o.user_id_ = u.user_id_
     </select>
@@ -1470,7 +1472,8 @@
         SELECT spo.user_id_, MAX(spo.pay_time_) payTime
         FROM student_payment_order spo
         WHERE spo.music_group_id_ = #{musicGroupId}
-        AND type_ = 'APPLY'
+        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