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); 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]); } //预警