Merge branch '20210413' of http://git.dayaedu.com/yonge/mec into online1

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

@@ -148,7 +148,14 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 		
 		if ((paymentType == PaymentType.ADD_STUDENT)) {
+			//获取缴费状态在审核中或者已拒绝的缴费项目的学员
 			Integer userId = Integer.parseInt(musicGroupPaymentCalenderDto.getStudentIds());
+			String studentIds = musicGroupPaymentCalenderDao.queryCalenderStudentIds(musicGroupId,null);
+			if(StringUtils.isNotEmpty(studentIds)){
+				if(studentIds.contains(userId.toString())){
+					throw new BizException("创建缴费失败：所选学员有待审核或已拒绝的缴费项目");
+				}
+			}
 			List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = musicGroupPaymentCalenderDetailDao.queryNotPaymentStudentByUserIdAndMusicGroupId(userId, musicGroupId);
 			if(musicGroupPaymentCalenderDetailList != null && musicGroupPaymentCalenderDetailList.size() > 0){
 				throw new BizException("创建缴费失败：已存在缴费项目");