| @@ -514,9 +514,6 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| } | } | ||||
| if (null != billRentList.getList()) { | if (null != billRentList.getList()) { | ||||
| billRentList.getList().stream().forEach(e->{ | billRentList.getList().stream().forEach(e->{ | ||||
| if(e.getPayRatio() == null){ | |||||
| e.setPayRatio(0l); | |||||
| } | |||||
| //手续费 = 合同应收+手续费+滞纳金 | //手续费 = 合同应收+手续费+滞纳金 | ||||
| computeTotalMoney(wxPayAccountBill, e); | computeTotalMoney(wxPayAccountBill, e); | ||||
| WxRentContract rent = rentContractMap.get(e.getRentContractId()); | WxRentContract rent = rentContractMap.get(e.getRentContractId()); | ||||
| @@ -525,6 +522,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| e.setRentType(rent.getType()); | e.setRentType(rent.getType()); | ||||
| if (null != rent.getPayRatio()) { | if (null != rent.getPayRatio()) { | ||||
| e.setPayRatio(rent.getPayRatio().longValue()); | e.setPayRatio(rent.getPayRatio().longValue()); | ||||
| }else { | |||||
| e.setPayRatio(0l); | |||||
| } | } | ||||
| if (null != rent.getLatePayRatio()) { | if (null != rent.getLatePayRatio()) { | ||||
| e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); | e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); | ||||