| @@ -471,8 +471,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| wxBillRent.setId(-1L); | wxBillRent.setId(-1L); | ||||
| } | } | ||||
| } | } | ||||
| if (null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) { | |||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, null, wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0); | |||||
| if (null != wxBillRent.getFloorForRule() || null != wxBillRent.getFloor() || null != wxBillRent.getBuilding()) { | |||||
| List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRent, wxBillRent.getFloorForRule(), wxBillRent.getBuilding(), wxBillRent.getFloor(), 0, 0); | |||||
| if (null != merchantIds) { | if (null != merchantIds) { | ||||
| wxBillRent.setMerchantIdList(merchantIds); | wxBillRent.setMerchantIdList(merchantIds); | ||||
| }else { | }else { | ||||
| @@ -513,8 +513,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| } | } | ||||
| if (null != billRentList.getList()) { | if (null != billRentList.getList()) { | ||||
| billRentList.getList().stream().forEach(e->{ | |||||
| //手续费 = 合同应收+手续费+滞纳金 | |||||
| for (int i = 0 ; i < billRentList.getList().size() ; i ++) { | |||||
| WxBillRent e = billRentList.getList().get(i); | |||||
| //手续费 = 合同应收+手续费+滞纳金 | |||||
| computeTotalMoney(wxPayAccountBill, e); | computeTotalMoney(wxPayAccountBill, e); | ||||
| WxRentContract rent = rentContractMap.get(e.getRentContractId()); | WxRentContract rent = rentContractMap.get(e.getRentContractId()); | ||||
| if (null != rent) { | if (null != rent) { | ||||
| @@ -525,11 +526,11 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| }else { | }else { | ||||
| e.setPayRatio(0l); | e.setPayRatio(0l); | ||||
| } | } | ||||
| if (null != rent.getLatePayRatio()) { | |||||
| if (StringUtils.isNoneBlank(rent.getLatePayRatio())) { | |||||
| e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); | e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); | ||||
| } | } | ||||
| e.setLatePayDay(rent.getLatePayDay()); | e.setLatePayDay(rent.getLatePayDay()); | ||||
| if (null != rent.getLatePayRatio()) { | |||||
| if (StringUtils.isNoneBlank(rent.getLatePayRatio())) { | |||||
| e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); | e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); | ||||
| } | } | ||||
| } | } | ||||
| @@ -540,7 +541,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| e.setDepositStatus(bd.getStatus()); | e.setDepositStatus(bd.getStatus()); | ||||
| } | } | ||||
| }); | |||||
| } | |||||
| } | } | ||||
| return billRentList; | return billRentList; | ||||