From 8c7ebeb5b60fa9fe8bb275553afa4d236e371657 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 31 May 2019 12:50:20 +0800 Subject: [PATCH] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 05b952427..0d655bda9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1877,7 +1877,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { //自然月 if(adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(count == 0){ - timeVo.setEndDate(DateUtils.getLastDayForMonth(timeVo.getStartDate())); + if(receivePeriod == 1) { //周期1个月 头一个月到当月底 + timeVo.setEndDate(DateUtils.getLastDayForMonth(timeVo.getStartDate())); + }else{ + Date firstDay = DateUtils.getFirstDayForCurrMonth(start); + instance.clear(); + instance.setTime(firstDay); + //最后一个期有余,加上残月,不整除时,最后一个月有余,否则为0 + instance.add(dayType, receivePeriod); + instance.add(Calendar.DAY_OF_MONTH, -1); + timeVo.setEndDate(instance.getTime()); + } } }