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 9313b18f0..6f9345bef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1199,11 +1199,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.RATIO.getCode())) { for (int i = 1; i < size; i++) { - BigDecimal _p = priceD; - if (revenueYears.size() == size) { - _p = new BigDecimal(revenueYears.get(i)); - } - BigDecimal divide = _p.multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(10000)); + BigDecimal divide = priceD.multiply(new BigDecimal(integers.get(i))).divide(new BigDecimal(10000)); priceD = priceD.add(divide); priceArrs[i] = priceD.setScale(0, RoundingMode.HALF_EVEN).longValue(); } @@ -1229,7 +1225,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { }else if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){ for (int i = 1; i < size; i++) { BigDecimal _p = new BigDecimal(integers.get(i)); - if (revenueYears.size() == size) { + //联营扣点才乘保底营业额 + if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode()) && revenueYears.size() == size) { _p = new BigDecimal(revenueYears.get(i)).multiply(_p); } if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {