winter 1 год назад
Родитель
Сommit
dd064385b2
2 измененных файлов: 19 добавлений и 1 удалений
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +17
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 1
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<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant);
if (null != list && list.size() > 0 ) {
List<Long> merchnatIds = new ArrayList<Long>();


+ 17
- 0
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<Date> 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);


Загрузка…
Отмена
Сохранить