Merge remote-tracking branch 'origin/master'

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

@@ -483,7 +483,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		//给学员推送缴费通知
 		for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenderList) {
 			if (musicGroupPaymentCalender.getPayUserType() == STUDENT && musicGroupPaymentCalender.getStatus() == PaymentCalenderStatusEnum.OPEN) {
-				musicGroupPaymentCalenderService.pushWaitRenewMessage(musicGroupPaymentCalenderId,
+				musicGroupPaymentCalenderService.pushWaitRenewMessage(musicGroupPaymentCalender.getId(),
 						musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId()),userIdList);
 			}
 		}

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

@@ -1184,9 +1184,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateStartTime(MusicGroupPaymentCalender paymentCalender) {
-		// if (startTime == null || id == null || endTime == null) {
-		// throw new BizException("参数校验失败");
-		// }
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(paymentCalender.getId());
 		if (calender == null) {
 			throw new BizException("缴费信息不存在");
@@ -1195,15 +1192,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			throw new BizException("修改失败,缴费状态不匹配");
 		}
 		Date date = new Date();
-		// 判断缴费开始时间、结束时间是否被其他缴费记录占用
-//		int count = musicGroupPaymentCalenderDao.queryIntersectionByPaymentDate(calender.getMusicGroupId(), paymentCalender.getStartPaymentDate(),
-//				paymentCalender.getDeadlinePaymentDate(), paymentCalender.getId());
-		// String format = DateUtil.format(startTime, DateUtil.DEFAULT_PATTERN);
-		// String format1 = DateUtil.format(endTime, DateUtil.DEFAULT_PATTERN);
-		// int count = musicGroupPaymentCalenderDao.queryIntersectionByDate(calender.getMusicGroupId(), format,format1);
-		/*if (count > 0) {
-			throw new BizException("缴费时间存在冲突，请修改缴费开始日期");
-		}*/
 		if(paymentCalender.getPaymentType() != ADD_STUDENT){
 			int count = musicGroupPaymentCalenderDao.queryIntersectionByValidDate(paymentCalender.getMusicGroupId(), paymentCalender.getPayUserType(), paymentCalender.getPaymentValidStartDate(),
 					paymentCalender.getPaymentValidEndDate(), paymentCalender.getId());