Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
c62072ddc6
1 changed files with 16 additions and 7 deletions
  1. +16
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 16
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -1910,16 +1910,25 @@ public class WxRentContractServiceImpl implements WxRentContractService {
timeVo.setEndDate(EnumContractReceivePeriodUnit.getAfterCalendarNarDay(timeVo.getStartDate(), receivePeriod, dayType));
}
}
if (count >= 12) {
String a = "";
}
//如果是到了每年的截止时间,第一年忽略(是开始时间)
if (null != yearsEndList && yearsEndList.size() > 0 ) {
Date yearEndDate = yearsEndList.get(0);
yearEndDate = DateUtils.getDayEnd(yearEndDate);
if (timeVo.getEndDate().after(yearEndDate)) {
timeVo.setEndDate(yearEndDate);
yearsEndList.remove(yearEndDate);
}else if(timeVo.getEndDate().equals(yearEndDate)) {
yearsEndList.remove(yearEndDate);
Date yearEndDateStart = yearsEndList.get(0);
if (timeVo.getStartDate().equals(yearEndDateStart)) {
yearsEndList.remove(yearEndDateStart);
}else if (timeVo.getStartDate().after(yearEndDateStart)) {
//do nothing
}else if (timeVo.getStartDate().before(yearEndDateStart)) {
Date yearEndDateEnd = DateUtils.getDayEnd(yearEndDateStart);
if (timeVo.getEndDate().after(yearEndDateEnd)) {
timeVo.setEndDate(yearEndDateEnd);
yearsEndList.remove(yearEndDateStart);
}else if(timeVo.getEndDate().equals(yearEndDateEnd)) {
yearsEndList.remove(yearEndDateStart);
}
}
}


Loading…
Cancel
Save