|
|
@@ -360,6 +360,24 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); |
|
|
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); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|