From c4047b8d78bd2cff4fe19f92d6cfd51c8b448168 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 14:06:10 +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=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=9B=9E?= =?UTF-8?q?=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/enums/EnumMsgRecordStatus.java | 1 + .../service/impl/WxBillSettleServiceImpl.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java index 70898af84..677c00e08 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java @@ -1,5 +1,6 @@ package com.iformall.enums; + /** * Created by luozukai */ 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 2abf98bc6..48ad4eae4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -360,6 +360,24 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { } } wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); + + WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); + propertyDeposit.setId(bill.getBillId()); + if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); + if(status != null){ + 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.getPay()+dbBill.getReceivePay()); + propertyDeposit.setPayDate(new Date()); + propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + addBillAction(bill.getBillId(), dbBill.getOwe()); + } + } + wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); } } }