From b0afeced7229f20f262c90dc4e70621dcd4c901a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 23 Jul 2019 11:03:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=80=BE=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillDailyServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxBillDepositServiceImpl.java | 3 ++- .../iformall/service/impl/WxBillOtherDepositServiceImpl.java | 3 ++- .../java/com/iformall/service/impl/WxBillOtherServiceImpl.java | 3 ++- .../service/impl/WxBillPropertyDepositServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxBillPropertyServiceImpl.java | 3 ++- .../java/com/iformall/service/impl/WxBillRentServiceImpl.java | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 1adb8cbcc..2e66ed6ca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -167,8 +167,9 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDaily.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = wxBillDaily.getPayDate(); + Date payDate = record.getPayDate(); Date receiveDate = wxBillDaily.getReceiveDate(); + wxBillDaily.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); wxBillDaily.setExpiredDay((long) expiredDay); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 6f9733341..e56d1b1ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -134,8 +134,9 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = wxBillDeposit.getPayDate(); + Date payDate = record.getPayDate(); Date receiveDate = wxBillDeposit.getReceiveDate(); + wxBillDeposit.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); wxBillDeposit.setExpiredDay((long) expiredDay); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index ff1a7b1a5..146c4059c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -162,8 +162,9 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillOtherDeposit.setOwe(record.getReceivePay() - record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = wxBillOtherDeposit.getPayDate(); + Date payDate = record.getPayDate(); Date receiveDate = wxBillOtherDeposit.getReceiveDate(); + wxBillOtherDeposit.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); wxBillOtherDeposit.setExpiredDay((long) expiredDay); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index fa42e7629..b7bead103 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -162,8 +162,9 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { wxBillOther.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = wxBillOther.getPayDate(); + Date payDate = record.getPayDate(); Date receiveDate = wxBillOther.getReceiveDate(); + wxBillOther.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); wxBillOther.setExpiredDay((long) expiredDay); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index f07b9c342..696543cd6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -134,8 +134,9 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = wxBillDeposit.getPayDate(); + Date payDate = record.getPayDate(); Date receiveDate = wxBillDeposit.getReceiveDate(); + wxBillDeposit.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); wxBillDeposit.setExpiredDay((long) expiredDay); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index d63c570ee..15e176c0d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -143,8 +143,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { property.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = property.getPayDate(); + Date payDate = record.getPayDate(); Date receiveDate = property.getReceiveDate(); + property.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); property.setExpiredDay((long) expiredDay); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 4ffaa2de7..4375dafd1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -145,8 +145,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = wxBillRent.getPayDate(); + Date payDate = record.getPayDate(); Date receiveDate = wxBillRent.getReceiveDate(); + wxBillRent.setExpiredDay(0L); if (payDate.after(receiveDate)) { int expiredDay = DateUtils.daysBetween(receiveDate, payDate); wxBillRent.setExpiredDay((long) expiredDay);