| @@ -1680,6 +1680,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| wxBillRent.setShopInfo(shopInfoStr); | wxBillRent.setShopInfo(shopInfoStr); | ||||
| wxBillRent.setLatePayRatio(0); | wxBillRent.setLatePayRatio(0); | ||||
| wxBillRent.calcuteTotalFee(wxRentContract.getDecimalSize()); | wxBillRent.calcuteTotalFee(wxRentContract.getDecimalSize()); | ||||
| wxBillRent.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId()); | |||||
| //计算手续费 | //计算手续费 | ||||
| BigDecimal servicePay = new BigDecimal(wxBillRent.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())) | BigDecimal servicePay = new BigDecimal(wxBillRent.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())) | ||||
| @@ -1716,6 +1717,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| private WxBillRentManage setManageRent(Integer decimalSize,WxBillRent wxBillRent,EnumRentContractManageFeeType feeType,String needPay,Integer serviceChargeRate,int dayType,int receivePeriod) { | private WxBillRentManage setManageRent(Integer decimalSize,WxBillRent wxBillRent,EnumRentContractManageFeeType feeType,String needPay,Integer serviceChargeRate,int dayType,int receivePeriod) { | ||||
| WxBillRentManage manage = new WxBillRentManage(); | WxBillRentManage manage = new WxBillRentManage(); | ||||
| manage.initByBillRent(wxBillRent); | manage.initByBillRent(wxBillRent); | ||||
| if (feeType.getCode().intValue() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode().intValue()){ | |||||
| manage.setEnergyFeesId(EnumBillAllType.RENT_BUSSINESS_MANAGE.getEnergyFeesId()); | |||||
| }else if (feeType.getCode().intValue() == EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode().intValue()) { | |||||
| manage.setEnergyFeesId(EnumBillAllType.RENT_OPERATION_MANAGE.getEnergyFeesId()); | |||||
| } | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| wxBillRent.setId(idWorker.nextId()); | wxBillRent.setId(idWorker.nextId()); | ||||
| manage.setManageFeeType(feeType.getCode()); | manage.setManageFeeType(feeType.getCode()); | ||||