|
|
|
@@ -322,7 +322,24 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
} |
|
|
|
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); |
|
|
|
}else{ |
|
|
|
WxBillDaily wxBillRent = new WxBillDaily(); |
|
|
|
WxBillDaily wxBillDaily = new WxBillDaily(); |
|
|
|
wxBillDaily.setId(bill.getBillId()); |
|
|
|
if(freezeStatus != null) wxBillDaily.setFreeze(freezeStatus); |
|
|
|
if(status != null){ |
|
|
|
wxBillDaily.setStatus(status); |
|
|
|
wxBillDaily.setPayDate(new Date()); |
|
|
|
} |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillDaily.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillDaily.setPay(dbBill.getReceivePay()); |
|
|
|
wxBillDaily.setPayDate(new Date()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getReceivePay()); |
|
|
|
} |
|
|
|
} |
|
|
|
wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); |
|
|
|
|
|
|
|
WxBillOther wxBillRent = new WxBillOther(); |
|
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
|
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); |
|
|
|
if(status != null){ |
|
|
|
@@ -330,14 +347,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
} |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillRent.setPay(dbBill.getReceivePay()); |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getReceivePay()); |
|
|
|
} |
|
|
|
} |
|
|
|
wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); |
|
|
|
wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -404,7 +421,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
vo.setReceiveMoney(new BigDecimal(s.getReceiveMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString()); |
|
|
|
vo.setPayMoney(new BigDecimal(s.getPayMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString()); |
|
|
|
vo.setBalance(new BigDecimal(s.getReceiveMoney()).subtract(new BigDecimal(s.getPayMoney())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString()); |
|
|
|
vo.setSettletime(DateUtils.formatDateTime(s.getSettletime())); |
|
|
|
vo.setSettletime(DateUtils.formatDateTime(s.getCreatetime())); |
|
|
|
vo.setStatus(EnumSettleStatus.getEnum(s.getStatus()).getMessage()); |
|
|
|
vo.setApplyStatus(EnumRentContractAppStatus.getEnum(s.getApplyStatus()).getMessage()); |
|
|
|
voList.add(vo); |
|
|
|
|