|
@@ -121,13 +121,17 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
|
|
|
if(calenderDetails.size() == 0){
|
|
|
return "操作失败,没有可以开启缴费的学员";
|
|
|
}
|
|
|
+ Long musicGroupPaymentCalenderId = calenderDetails.get(0).getMusicGroupPaymentCalenderId();
|
|
|
+ MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(musicGroupPaymentCalenderId);
|
|
|
+ Date startPaymentDate = calender.getStartPaymentDate();
|
|
|
+ Date deadlinePaymentDate = calender.getDeadlinePaymentDate();
|
|
|
int length = ids.split(",").length;
|
|
|
Date date = new Date();
|
|
|
Iterator<MusicGroupPaymentCalenderDetail> iterator = calenderDetails.iterator();
|
|
|
MusicGroupPaymentCalenderDetail next;
|
|
|
while(iterator.hasNext()){
|
|
|
next = iterator.next();
|
|
|
- int count1 = musicGroupPaymentCalenderDao.queryIntersectionByPaymentDate(next.getMusicGroupId(),date,date);
|
|
|
+ int count1 = musicGroupPaymentCalenderDao.queryIntersectionByPaymentDate(next.getMusicGroupId(),startPaymentDate,deadlinePaymentDate);
|
|
|
int count = musicGroupPaymentCalenderDetailDao.queryIntersectionByPaymentDate(next.getMusicGroupId(),next.getUserId());
|
|
|
if(count > 0 || count1 > 0){
|
|
|
iterator.remove();
|