Merge branch 'reg_progress_20210318'

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

@@ -1616,8 +1616,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     public String checkRegOrPayStatus(String musicGroupId) {
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-        if (musicGroup.getStatus() == MusicGroupStatusEnum.PAY &&
-                musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE &&
+        if (musicGroup.getStatus() == MusicGroupStatusEnum.PAY ||
+                musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE ||
                 musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS) {
             Date now = new Date();
             MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(musicGroup.getId());
@@ -1630,7 +1630,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             }
         }
         //储备中、进行中，乐团没有报名缴费项、有多批次缴费项不能缴费、有已上的课程不能缴费
-        if (musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE &&
+        if (musicGroup.getStatus() == MusicGroupStatusEnum.PREPARE ||
                 musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS) {
             MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(musicGroup.getId());
             if (regCalender == null) {