From e3d14755b3c0448ac18f3ebbf352bc7093523838 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 11 Sep 2019 16:34:30 +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/WxBillSettleServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 0c99f26b8..282305a3d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -205,7 +205,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); if(dbBill!=null) { wxBillOtherDeposit.setPay(dbBill.getReceivePay()); - wxBillRent.setPayDate(new Date()); + wxBillOtherDeposit.setPayDate(new Date()); addBillAction(bill.getBillId(), dbBill.getReceivePay()); } } @@ -215,14 +215,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { propertyDeposit.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ - wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); + propertyDeposit.setStatus(status); + propertyDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); if(dbBill!=null) { propertyDeposit.setPay(dbBill.getReceivePay()); - wxBillRent.setPayDate(new Date()); + propertyDeposit.setPayDate(new Date()); addBillAction(bill.getBillId(), dbBill.getReceivePay()); } } @@ -250,14 +250,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { propertyDeposit.setId(bill.getBillId()); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ - wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); + propertyDeposit.setStatus(status); + propertyDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); if(dbBill!=null) { propertyDeposit.setPay(dbBill.getReceivePay()); - wxBillRent.setPayDate(new Date()); + propertyDeposit.setPayDate(new Date()); addBillAction(bill.getBillId(), dbBill.getReceivePay()); } }