Browse Source

Merge branch '20221010' of http://git.dayaedu.com/yonge/mec into master_saas

zouxuan 3 years ago
parent
commit
f9989dd11d

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -351,7 +351,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalender.setStatus(status);
         musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
 
-        if (musicGroupPaymentCalender.getStatus() != AUDITING) {
+        if (musicGroupPaymentCalender.getStatus() != AUDITING && musicGroupPaymentBaseCalender.getPayUserType() != SCHOOL) {
             if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
             } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {