From a347030d78291db9cf0e42dba049cf613f0e4861 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 7 Aug 2019 18:27:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B9=8B=E5=90=8E=E7=9A=84=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillAllServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index a90b3b4e1..554146065 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1047,6 +1047,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); daily.setExpiredDay((long) expiredDay); + daily.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); + } else { + daily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } } daily.setReceivePay(receivePay); @@ -1125,6 +1128,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); other.setExpiredDay((long) expiredDay); + other.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); + } else { + other.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } } other.setReceivePay(receivePay); @@ -1206,6 +1212,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); otherDeposit.setExpiredDay((long) expiredDay); + otherDeposit.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); + } else { + otherDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } } otherDeposit.setReceivePay(receivePay); @@ -1300,6 +1309,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); rent.setExpiredDay((long) expiredDay); + rent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); + } else { + rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } } rent.setPay(rent.getPay() + pay); @@ -1333,6 +1345,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); property.setExpiredDay((long) expiredDay); + property.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); + } else { + property.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } } property.setPay(property.getPay() + pay); From d60c3345206749d7fb07d8f96f8ce60a200b5e55 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 7 Aug 2019 19:27:37 +0800 Subject: [PATCH 2/2] =?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 --- .../iformall/service/impl/WxRentContractServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 e35652aca..d73aeecf7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2066,7 +2066,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //最后一个月 diff = DateUtils.getDiff(DateUtils.getFirstDayForCurrMonth(end),end); dayCount = DateUtils.getMonthDayCount(end); - total += (diff[1]+1) * (price/dayCount); + total += (diff[1]) * (price/dayCount); return total; } @@ -2126,12 +2126,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { //最后一个月 if(sdM.format(monthStartDate).equals(sdM.format(end))){ diff = DateUtils.getDiff(monthStartDate,end); - total += price * (diff[1] +1); + total += price * (diff[1]); break; }else{ currEnd = DateUtils.getLastDayForMonth(monthStartDate); diff = DateUtils.getDiff(monthStartDate,currEnd); - total += price * (diff[1] +1); + total += price * (diff[1]); } //预警