From f88ac61be1ffe4c75148ee732e9ca13d9886fa4a Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 11 Sep 2019 17:41:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E8=B7=B3=E7=82=B9=E7=8E=87?= =?UTF-8?q?=E8=AE=A1=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillAllServiceImpl.java | 40 ++++++++++++++----- .../service/impl/WxBillSettleServiceImpl.java | 4 +- 2 files changed, 31 insertions(+), 13 deletions(-) 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 1aa9ad298..b017769df 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -930,18 +930,36 @@ public class WxBillAllServiceImpl implements WxBillAllService { } } else if (billType.equals(EnumBillTypeParam.RENT_DEPOSIT.getCode())) { WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(id); - //租赁押金账单更新 - WxBillDeposit wxBillDeposit = new WxBillDeposit(); - wxBillDeposit.setId(id); - wxBillDeposit.setReceivePay(newPrice); - wxBillDeposit.setOwe(newPrice - dbBill.getPay()); - if (newPrice.equals(dbBill.getPay())) { - wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + if(dbBill!=null) { + //租赁押金账单更新 + WxBillDeposit wxBillDeposit = new WxBillDeposit(); + wxBillDeposit.setId(id); + wxBillDeposit.setReceivePay(newPrice); + wxBillDeposit.setOwe(newPrice - dbBill.getPay()); + if (newPrice.equals(dbBill.getPay())) { + wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillDeposit.setUpdatetime(updateDate); + wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + //账单日志 + addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); + } + + WxBillPropertyDeposit propertyDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(id); + if(propertyDeposit!=null){ + //物业押金账单更新 + WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); + wxBillPropertyDeposit.setId(id); + wxBillPropertyDeposit.setReceivePay(newPrice); + wxBillPropertyDeposit.setOwe(newPrice - propertyDeposit.getPay()); + if (newPrice.equals(propertyDeposit.getPay())) { + wxBillPropertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillPropertyDeposit.setUpdatetime(updateDate); + wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); + //账单日志 + addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } - wxBillDeposit.setUpdatetime(updateDate); - wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); - //账单日志 - addBillAction(EnumBillAction.UPDATE_BILL, id, oldPrice, newPrice, user); } else if (billType.equals(EnumBillTypeParam.PROPERTY.getCode())) { WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(id); //物业账单更新 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 282305a3d..0b0715156 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -213,7 +213,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); propertyDeposit.setId(bill.getBillId()); - if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); + if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); if(status != null){ propertyDeposit.setStatus(status); propertyDeposit.setPayDate(new Date()); @@ -248,7 +248,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); propertyDeposit.setId(bill.getBillId()); - if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); + if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); if(status != null){ propertyDeposit.setStatus(status); propertyDeposit.setPayDate(new Date());