Merge remote-tracking branch 'origin/20221010' into 20221010

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

@@ -856,6 +856,15 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             }
             MusicGroupPaymentCalender calender = musicGroupPaymentCalenders.get(0);
             MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
+
+            if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS && musicGroup.getStatus() != MusicGroupStatusEnum.FEE_AUDIT) {
+                throw new BizException("当前乐团状态不支持此操作");
+            }
+            
+            if(calender.getStatus() != PaymentCalenderStatusEnum.AUDITING){
+            	throw new BizException("缴费项目不是在审核中状态");
+            }
+            
             for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenders) {
                 //如果是报名项目，将乐团改为审核中，缴费项目修改状态，审核状态改为审核通过
                 if (musicGroupPaymentCalender.getPayUserType() == SCHOOL) {
@@ -974,15 +983,24 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 throw new BizException("缴费项目不存在");
             }
             for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenders) {
+                
+                if(musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING){
+                	throw new BizException("缴费项目不是在审核中状态");
+                }
+                
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.REJECT);
                 musicGroupPaymentCalender.setUpdateTime(date);
                 musicGroupPaymentCalender.setAuditMemo(auditMemo);
             }
             MusicGroupPaymentCalender calender = musicGroupPaymentCalenders.get(0);
+
+			MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
+            if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS && musicGroup.getStatus() != MusicGroupStatusEnum.FEE_AUDIT) {
+                throw new BizException("当前乐团状态不支持此操作");
+            }
             //如果是报名，并且所有的报名都审核通过，需要修改乐团状态
             if (calender.getPaymentType() == MUSIC_APPLY) {
 				if (!musicGroupIdList.contains(calender.getMusicGroupId())) {
-					MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
 					musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT_FAILED);
 					musicGroup.setUpdateTime(date);
 					musicGroupDao.update(musicGroup);