|
@@ -69,8 +69,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
musicGroupPaymentCalender.setDeadlinePaymentDate(DateUtil.addDays(musicGroupPaymentCalender.getStartPaymentDate(), 3));
|
|
|
}
|
|
|
// 判断缴费开始时间、结束时间是否被其他缴费记录占用
|
|
|
- int count = musicGroupPaymentCalenderDao.queryIntersectionByPaymentDate(musicGroupId, musicGroupPaymentCalender.getStartPaymentDate(),
|
|
|
- musicGroupPaymentCalender.getDeadlinePaymentDate());
|
|
|
+// int count = musicGroupPaymentCalenderDao.queryIntersectionByPaymentDate(musicGroupId, musicGroupPaymentCalender.getStartPaymentDate(),
|
|
|
+// musicGroupPaymentCalender.getDeadlinePaymentDate());
|
|
|
+
|
|
|
+ String format = DateUtil.format(musicGroupPaymentCalender.getStartPaymentDate(), DateUtil.DEFAULT_PATTERN);
|
|
|
+ String format1 = DateUtil.format(musicGroupPaymentCalender.getDeadlinePaymentDate(), DateUtil.DEFAULT_PATTERN);
|
|
|
+ int count = musicGroupPaymentCalenderDao.queryIntersectionByDate(musicGroupId, format,format1);
|
|
|
if (count > 0) {
|
|
|
throw new BizException("缴费时间存在冲突,请修改缴费开始日期");
|
|
|
}
|