From 183a1c86dec2977692606e19bf4ded7bf2d8212d Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 13 Sep 2024 11:53:03 +0800 Subject: [PATCH] fix --- .../iformall/service/helper/WxRentContractHelper.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java index 75bc350c9..eb1da0049 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java @@ -912,6 +912,7 @@ public class WxRentContractHelper { //如果是第一期,则取当前的周期 if (null == currentReceiveDate) { startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, 0, EnumContractReceivePeriodUnit.QUARTER.getCode()); + startDate = DateUtils.getSecondsTimeAfter(1, startDate); }else { startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, -1*receivePeriod*payPeriodRate, EnumContractReceivePeriodUnit.QUARTER.getCode()); } @@ -934,7 +935,14 @@ public class WxRentContractHelper { vo.setEndDate(endDate); return vo; }else { - Date startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, -1*receivePeriod*payPeriodRate, dayType); + Date startDate = null; + //如果是第一期,则取当前的周期 + if (null == currentReceiveDate) { + startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, 0, dayType); + startDate = DateUtils.getSecondsTimeAfter(1, startDate); + }else { + startDate = EnumContractReceivePeriodUnit.getAfterCalendarNarDay(end, -1*receivePeriod*payPeriodRate, dayType); + } startDate = DateUtils.getFirstDayForCurrMonth(start); vo.setStartDate(startDate); vo.setEndDate(end);