Merge branch 'online1'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -1838,7 +1838,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         int registerNum = studentRegistrationDao.getRegisterNum(queryInfo.getMusicGroupId());
         pageInfo.setRegNum(registerNum);
         RegisterDto registerOrPreMinTime = studentRegistrationDao.getRegisterOrPreMinTime(queryInfo.getMusicGroupId());
-        if(registerOrPreMinTime.getPayTime() != null){
+        if(registerOrPreMinTime.getMinPayTime() != null){
             Date startTime = DateUtil.trunc(registerOrPreMinTime.getPayTime());
             Date endTime = DateUtil.getLastTimeWithDay(startTime);
             int firstPayNum = studentRegistrationDao.getFirstPayNum(queryInfo.getMusicGroupId(), startTime, endTime);

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

@@ -1463,17 +1463,17 @@
     </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">
-        SELECT COUNT(*) FROM student_registration sr
+        SELECT COUNT(*)
+        FROM student_registration sr
         LEFT JOIN (
         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 spo.type_ = 'APPLY'
+        WHERE spo.music_group_id_ = #{musicGroupId} AND 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