From 3658c51762d1a4306292f3feb03d5702048ea3c2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 9 Sep 2019 15:38:35 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E3=80=90ID1002325?= =?UTF-8?q?=E3=80=91=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=EF=BC=9A=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E4=B8=8B-=E6=8A=BC=E9=87=91?= =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E4=B8=80=E6=AC=A1=E6=80=A7=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3500]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillDepositServiceImpl.java | 9 +++------ .../service/impl/WxBillPropertyDepositServiceImpl.java | 8 +++----- 2 files changed, 6 insertions(+), 11 deletions(-) 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 {