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 9ea5efc68..1946b4714 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -979,8 +979,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); if (rent.getOwe() <= pay) { rent.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = rent.getPayDate(); - Date receiveDate = rent.getReceiveDate(); + Date payDate = bill.getPayDate(); + Date receiveDate = bill.getReceiveDate(); rent.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); @@ -1011,8 +1011,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); if (property.getOwe() <= pay) { property.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = property.getPayDate(); - Date receiveDate = property.getReceiveDate(); + Date payDate = bill.getPayDate(); + Date receiveDate = bill.getReceiveDate(); property.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); @@ -1048,8 +1048,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (!daily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { if (daily.getOwe() <= pay) { daily.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = daily.getPayDate(); - Date receiveDate = daily.getReceiveDate(); + Date payDate = bill.getPayDate(); + Date receiveDate = bill.getReceiveDate(); daily.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); @@ -1114,8 +1114,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (!other.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { if (other.getOwe() <= pay) { other.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = other.getPayDate(); - Date receiveDate = other.getReceiveDate(); + Date payDate = bill.getPayDate(); + Date receiveDate = bill.getReceiveDate(); other.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); @@ -1183,8 +1183,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (!otherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { if (otherDeposit.getOwe() <= pay) { otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = otherDeposit.getPayDate(); - Date receiveDate = otherDeposit.getReceiveDate(); + Date payDate = bill.getPayDate(); + Date receiveDate = bill.getReceiveDate(); otherDeposit.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate);