diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 34058ccb2..c035d521f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -635,7 +635,8 @@ public class WxAllBillController extends BillBaseController { } wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); wxMerchant.updateTenantInfo(getTenantInfo()); - wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); + //放开时间 + //wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); List list = billAllHelper.getMerchantBillList(wxMerchant); if (null != list && list.size() > 0 ) { List merchnatIds = new ArrayList(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 136d222ab..1e7286eb1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2592,6 +2592,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //计算每一年的基数 String[] priceArrs = WxRentContractHelper.calcuteRentPrice(rentcontract); + //计算商业管理费 + String[] bussinessManagerPriceArrs = WxRentContractHelper.calcuteBussinessManagementFee(rentcontract); + //计算运营管理费 + String[] operationManagerPriceArrs = WxRentContractHelper.calcuteOperatingManagementFee(rentcontract); List yearList = this.getYearList(priceArrs.length, 12, rentcontract.getRentalStartDate(),null); int yearIndex = 0; for( int i = 0 ; i < yearList.size() ; i ++) { @@ -2609,6 +2613,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { //根据租金和扣点来计算 String needpay = WxRentContractHelper.getNeedPayMoney(freePeriods,rentcontract, priceArrs[yearIndex],rentBill.getStarttime(), rentBill.getEndtime(),0,0,false,rentcontract.getReceivePeriodUnit(),rentcontract.getReceivePeriod()); + + String bussinessNeedPay = "0"; + if (null != bussinessManagerPriceArrs && new BigDecimal(bussinessManagerPriceArrs[yearIndex]).compareTo(new BigDecimal(0)) > 0 ) { + bussinessNeedPay = WxRentContractHelper.getNeedPayMoney(freePeriods,rentcontract, bussinessManagerPriceArrs[yearIndex],rentBill.getStarttime(), + rentBill.getEndtime(),0,0,false,rentcontract.getReceivePeriodUnit(),rentcontract.getReceivePeriod()); + } + String operationNeedPay = "0"; + if (null != operationManagerPriceArrs && new BigDecimal(operationManagerPriceArrs[yearIndex]).compareTo(new BigDecimal(0)) > 0 ) { + operationNeedPay = WxRentContractHelper.getNeedPayMoney(freePeriods,rentcontract, operationManagerPriceArrs[yearIndex],rentBill.getStarttime(), + rentBill.getEndtime(),0,0,false,rentcontract.getReceivePeriodUnit(),rentcontract.getReceivePeriod()); + } + + needpay = new BigDecimal(needpay).add(new BigDecimal(bussinessNeedPay)).add(new BigDecimal(operationNeedPay)).toPlainString(); //计算跳点。 BigDecimal[] jumppays = calcuteReveneuJump(salesDeciaml, rentcontract,rentBill.getStarttime(), rentBill.getEndtime(),freePeriods);