yonge há 3 anos atrás
pai
commit
8658f6d9fe

+ 15 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -97,6 +97,8 @@ import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
@@ -3251,6 +3253,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 throw new BizException("会员收费乐团不可更改收费模式");
             }
             if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
+            	
+            	//如果有进行中的缴费,不能修改会员
+            	List<PaymentCalenderStatusEnum> statusList = new ArrayList<>();
+        		statusList.add(PaymentCalenderStatusEnum.NO);
+        		statusList.add(PaymentCalenderStatusEnum.OPEN);
+        		statusList.add(PaymentCalenderStatusEnum.AUDITING);
+        		List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(statusList,PayUserType.STUDENT.getCode());
+
+        		if(musicGroupPaymentCalenderList != null && musicGroupPaymentCalenderList.size() > 0){
+        			throw new BizException("存在未完结[审核中/未开启缴费/开启缴费]的缴费项目,请检查");
+        		}
+            	
+            	//如果没有缴费
                 throw new BizException("当前乐团收费模式不可更改为会员收费");
             }
         }