From aae45308223e97bdc40d2a978c4ecf439a18a7f4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 7 Aug 2019 14:56:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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 d23313a3c..6ef22b059 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1138,12 +1138,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd"); SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); + SimpleDateFormat sdD = new SimpleDateFormat("d"); + SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); + System.out.println(sd.format(startDate)); + System.out.println(sd.format(endDate)); + if(i == billTimeVoListSize - 1){//最后 - if(sdMR.format(startDate).equals(sdMR.format(wxRentContract.getRentalStartDate())) && sdMR.format(endDate).equals(sdMR.format(wxRentContract.getRentalEndDate())) ){ - int months = getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01"); - months++; + //判断是否满足整月 + int startInt = Integer.parseInt(sdD.format(startDate)); + int endInt = Integer.parseInt(sdD.format(DateUtils.getDaySet(endDate,Calendar.DATE,1))); + if(startInt == endInt){ + int months = getMonths(sdM.format(startDate)+"-01",sdM.format(DateUtils.getDaySet(endDate,Calendar.DATE,1))+"-01"); needpay = new Double(months * priceD).longValue(); - }else { + }else{ needpay = new Double(getMonthNeedPay(priceD, startDate, endDate)).longValue(); } }else if(i == 0){//第一期