From 3100c5d54c11506ed811bb22442b13e3e3bf0296 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 25 Apr 2019 21:45:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxRentContractServiceImpl.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 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 310218e9a..616fec76c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -968,13 +968,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { Date receiveDate = DateUtils.getFirstDayOfNextMonth(startdate,receivePeriod * i); wxBillRent.setReceiveDate(receiveDate); wxBillRent.setStarttime(receiveDate); - wxBillRent.setEndtime(DateUtils.getLastDayForMonth(receiveDate,receivePeriod * i)); + wxBillRent.setEndtime(DateUtils.getLastDayForMonth(wxBillRent.getStarttime(),receivePeriod * i)); - instance.clear(); - instance.setTime(receiveDate); - instance.add(dayType, receivePeriod); - instance.add(Calendar.DAY_OF_MONTH, -1); - wxBillRent.setEndtime(instance.getTime()); +// instance.clear(); +// instance.setTime(receiveDate); +// instance.add(dayType, receivePeriod); +// instance.add(Calendar.DAY_OF_MONTH, -1); +// wxBillRent.setEndtime(instance.getTime()); }else if(i == paycount - 1) {//最后周期 Date receiveDate = DateUtils.getFirstDayOfNextMonth(startdate,receivePeriod * i); wxBillRent.setReceiveDate(receiveDate); @@ -984,6 +984,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { instance.clear(); instance.setTime(firstDay); + if(new SimpleDateFormat("yyyy-MM-dd").format(wxBillRent.getEndtime()).equals("2020-02-29")){ + System.out.println( "-----------"+receivePeriod * i); + System.out.println("-----------"+new SimpleDateFormat("yyyy-MM-dd").format(wxBillRent.getReceiveDate())); + System.out.println("-----------"+new SimpleDateFormat("yyyy-MM-dd").format(wxBillRent.getEndtime())); + System.out.println(); + } + //最后一期有余,加上残月,(不整除时,最后一个月有余,否则为0) if(isFirstDay(wxRentContract.getRentalStartDate())){ if(receivePeriod > 1) {