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); } } }