From c62072ddc600d9f077b9feb7aaa441c232f7be45 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 6 Aug 2024 17:03:36 +0800 Subject: [PATCH] fix --- .../impl/WxRentContractServiceImpl.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 1d363abcd..ed2d7fcc5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -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); + } } }