From 3579cef1b5f3688ca89c17ca9d23e43d3254c90f Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 31 May 2019 16:46:10 +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/WxPropertyContractServiceImpl.java | 2 +- .../iformall/service/impl/WxRentContractServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 3c5e23372..bca508941 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -532,7 +532,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //endDate = wxPropertyContract.getRentalEndDate(); endDate = null; }else { - endDate = yearList.get(index); + endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 logger.info("==========cross:"+sd.format(endDate)); } } 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 452ce435d..3b402dd31 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -874,7 +874,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { List resultList = new ArrayList<>(); final IdWorker idWorker = IdWorker.get(); - Date endDate = null; + Date endDate = null;//每年的截止日期 if(yearList.size() > 1){ endDate = yearList.get(1); } @@ -894,8 +894,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(index >= yearList.size()-1){ //endDate = wxRentContract.getRentalEndDate(); endDate = null; - }else { - endDate = yearList.get(index); + }else{ + endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 logger.info("==========cross:"+sd.format(endDate)); }