Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
a4e539d2bd
1 changed files with 10 additions and 4 deletions
  1. +10
    -4
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java

+ 10
- 4
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java View File

@@ -157,8 +157,14 @@ public class WxRentContractHelper {
//联营扣点取高单据计算联营扣点方式的,再跟租金的对比取高
String[] revenuePriceArrs = calcuteRevenuePriceByRentAreaJoint(wxRentContract,revenueYears,size);
//租金的年调整,联营扣点没有年租金调整,取revenueRatioWay
Integer adjustRatioWay = wxRentContract.getAdjustRatioWay();
if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
adjustRatioWay = wxRentContract.getAdjustRatioWay();
}
//计算所有租金的
if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.RATIO.getCode())) {
if (adjustRatioWay.equals(EnumRentContractAdjustRatioWay.RATIO.getCode())) {
for (int i = 1; i < size; i++) {
//如果纯联营扣点,没有租金的年增长,用联营扣点的年增长;联营扣点取高时priceD已是最高值
String _update = "";
@@ -171,7 +177,7 @@ public class WxRentContractHelper {
priceD = priceD.add(divide);
priceArrs[i] = priceD.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
}
} else if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.MONEY.getCode())) {
} else if (adjustRatioWay.equals(EnumRentContractAdjustRatioWay.MONEY.getCode())) {
for (int i = 1; i < size; i++) {
String _update = "";
if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
@@ -182,7 +188,7 @@ public class WxRentContractHelper {
priceD = priceD.add(new BigDecimal(_update));
priceArrs[i] = priceD.setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
}
} else if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.CUSTOM.getCode())){
} else if (adjustRatioWay.equals(EnumRentContractAdjustRatioWay.CUSTOM.getCode())){
for (int i = 1; i < size; i++) {
String _update = "";
if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
@@ -192,7 +198,7 @@ public class WxRentContractHelper {
}
priceArrs[i] = new BigDecimal(_update).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
}
}else if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){
}else if (adjustRatioWay.equals(EnumRentContractAdjustRatioWay.FIX_RATIO.getCode())){
for (int i = 1; i < size; i++) {
String _update = "";
if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {


Loading…
Cancel
Save