From 347c18038b9eceeec93051493060c043039a2f56 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 8 Aug 2024 14:21:21 +0800 Subject: [PATCH] fix --- .../service/helper/WxRentContractHelper.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java index 3a044fca4..4ba3ee63d 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java @@ -199,14 +199,18 @@ public class WxRentContractHelper { priceArrs[i] = new BigDecimal(_update).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); } }else if (adjustRatioWay.equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){ + String renenue = wxRentContract.getRevenue();//联营保底营业额 + if (StringUtils.isBlank(renenue)) { + renenue = "0"; + } for (int i = 1; i < size; i++) { - String _update = ""; + //如果是联营扣点,用保底营业额*比例 if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { - _update = String.valueOf(revenueYears.get(i)); + priceArrs[i] = new BigDecimal(renenue).multiply(new BigDecimal(revenueYears.get(i))).divide(new BigDecimal(100)).toPlainString(); }else { - _update = String.valueOf(integers.get(i)); + priceArrs[i] = priceD.multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(100)).toPlainString(); } - priceArrs[i] = priceD.multiply(new BigDecimal(_update)).divide(new BigDecimal(100)).toPlainString(); + } } @@ -258,10 +262,11 @@ public class WxRentContractHelper { revenuePriceArrs[i] = new BigDecimal(revenueYears.get(i)).toPlainString(); } }else if (wxRentContract.getRevenueRatioWay().equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){ + //比例方式直接用保底营业额*比例 for (int i = 1; i < size; i++) { BigDecimal _p = new BigDecimal(0) ; if (revenueYears.size() == size) { - _p = new BigDecimal(revenueYears.get(i)).multiply(revenuePriceD).divide(new BigDecimal(100)); + _p = new BigDecimal(revenueYears.get(i)).multiply(new BigDecimal(wxRentContract.getRevenue())).divide(new BigDecimal(100)); } revenuePriceArrs[i] = _p.toPlainString(); }