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