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 e56d1b1ce..3f1bba885 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -128,23 +128,20 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); } Long addpay = wxBillDeposit.getPay(); - wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setReceivePay(record.getReceivePay()); wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = record.getPayDate(); Date receiveDate = wxBillDeposit.getReceiveDate(); wxBillDeposit.setExpiredDay(0L); - if (payDate.after(receiveDate)) { - int expiredDay = DateUtils.daysBetween(receiveDate, payDate); + if (date.after(receiveDate)) { + int expiredDay = DateUtils.daysBetween(receiveDate, date); wxBillDeposit.setExpiredDay((long) expiredDay); } } - wxBillDeposit.setPayDate(record.getPayDate()); + wxBillDeposit.setPayDate(date); wxBillDeposit.setUpdatetime(date); - wxBillDeposit.setUpdatetime(new Date()); wxBillDeposit.setPayWay(record.getPayWay()); try { wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); 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 696543cd6..ed328ab46 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -128,21 +128,19 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); } Long addpay = wxBillDeposit.getPay(); - wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setReceivePay(record.getReceivePay()); wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - Date payDate = record.getPayDate(); Date receiveDate = wxBillDeposit.getReceiveDate(); wxBillDeposit.setExpiredDay(0L); - if (payDate.after(receiveDate)) { - int expiredDay = DateUtils.daysBetween(receiveDate, payDate); + if (date.after(receiveDate)) { + int expiredDay = DateUtils.daysBetween(receiveDate, date); wxBillDeposit.setExpiredDay((long) expiredDay); } } - wxBillDeposit.setPayDate(record.getPayDate()); + wxBillDeposit.setPayDate(date); wxBillDeposit.setUpdatetime(date); wxBillDeposit.setPayWay(record.getPayWay()); try {