From 57c688c566eab72772eae37cb6adb81643324ea9 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 5 Aug 2019 11:16:27 +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=B4=A6=E5=8D=95=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxRentContractServiceImpl.java | 9 +++++---- 1 file changed, 5 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 b78bb5fa6..a6928d573 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2018,6 +2018,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { Double total = new Double(0); int[] diff; + System.out.println(sd.format(start)); + System.out.println(sd.format(end)); + //同一天 if(sd.format(start).equals(sd.format(end))){ int dayCount = DateUtils.getMonthDayCount(start); @@ -2026,8 +2029,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { //同月 if(sdM.format(start).equals(sdM.format(end))){ - System.out.println(sd.format(start)); - System.out.println(sd.format(end)); diff = DateUtils.getDiff(start,end); int dayCount = DateUtils.getMonthDayCount(start); @@ -2040,8 +2041,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { int endInt = Integer.parseInt(sdD.format(DateUtils.getDaySet(end,Calendar.DATE,1))); if(startInt == endInt){ - int months = getMonths(sdM.format(start)+"-01",sdM.format(end)+"-01"); - return (months+1) * price; + int months = getMonths(sdM.format(start)+"-01",sdM.format(DateUtils.getDaySet(end,Calendar.DATE,1))+"-01"); + return (months) * price; } //第一个月