| @@ -199,14 +199,18 @@ public class WxRentContractHelper { | |||||
| priceArrs[i] = new BigDecimal(_update).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); | priceArrs[i] = new BigDecimal(_update).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); | ||||
| } | } | ||||
| }else if (adjustRatioWay.equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){ | }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++) { | for (int i = 1; i < size; i++) { | ||||
| String _update = ""; | |||||
| //如果是联营扣点,用保底营业额*比例 | |||||
| if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { | 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 { | }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(); | revenuePriceArrs[i] = new BigDecimal(revenueYears.get(i)).toPlainString(); | ||||
| } | } | ||||
| }else if (wxRentContract.getRevenueRatioWay().equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){ | }else if (wxRentContract.getRevenueRatioWay().equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){ | ||||
| //比例方式直接用保底营业额*比例 | |||||
| for (int i = 1; i < size; i++) { | for (int i = 1; i < size; i++) { | ||||
| BigDecimal _p = new BigDecimal(0) ; | BigDecimal _p = new BigDecimal(0) ; | ||||
| if (revenueYears.size() == size) { | 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(); | revenuePriceArrs[i] = _p.toPlainString(); | ||||
| } | } | ||||