|
|
@@ -352,9 +352,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
Date date = new Date();
|
|
|
// 判断缴费开始时间、结束时间是否被其他缴费记录占用
|
|
|
int count = musicGroupPaymentCalenderDao.queryIntersectionByPaymentDate(calender.getMusicGroupId(), startTime,endTime);
|
|
|
- if (count > 0) {
|
|
|
+ if (count > 1) {
|
|
|
throw new BizException("缴费时间存在冲突，请修改缴费开始日期");
|
|
|
}
|
|
|
+ calender.setStartPaymentDate(startTime);
|
|
|
+ calender.setDeadlinePaymentDate(endTime);
|
|
|
+ calender.setUpdateTime(date);
|
|
|
if (date.after(endTime)) {
|
|
|
calender.setPaymentStatus(PaymentStatusEnum.YES);
|
|
|
} else if (date.after(startTime)) {
|
|
|
@@ -378,6 +381,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
} else {
|
|
|
calender.setPaymentStatus(PaymentStatusEnum.NO);
|
|
|
}
|
|
|
+ musicGroupPaymentCalenderDao.update(calender);
|
|
|
}
|
|
|
|
|
|
@Override
|
zouxuan