Bläddra i källkod

fix

release_toaliyun_real
winter 1 år sedan
förälder
incheckning
6d3e925572
2 ändrade filer med 9 tillägg och 2 borttagningar
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +7
    -2
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Visa fil

@@ -477,5 +477,7 @@ public class WxMerchant extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
public Integer billType; public Integer billType;
@TableField(exist = false)
public Long energyFeesId;
} }

+ 7
- 2
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java Visa fil

@@ -151,7 +151,7 @@ public class WxRentContractHelper {
} }
//BigDecimal priceD = new BigDecimal(wxRentContract.getPrice()); //BigDecimal priceD = new BigDecimal(wxRentContract.getPrice());
//联营保底营业额
//联营扣点年调整
String revenueYear = wxRentContract.getRevenueRatioSet(); String revenueYear = wxRentContract.getRevenueRatioSet();
List<Long> revenueYears = null; List<Long> revenueYears = null;
if (!StringUtils.isBlank(revenueYear)) { if (!StringUtils.isBlank(revenueYear)) {
@@ -209,8 +209,13 @@ public class WxRentContractHelper {
//联营面积取高时,联营扣点调整比率设置 //联营面积取高时,联营扣点调整比率设置
String[] revenuePriceArrs = new String[size]; String[] revenuePriceArrs = new String[size];
if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) { if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) {
String _revenuePriceD = new BigDecimal(wxRentContract.getRevenue()).multiply(new BigDecimal(wxRentContract.getPayRatio()))
String _revenuePriceD = null;
if (null != wxRentContract.getRevenueFixedRentPrice() && wxRentContract.getRevenueFixedRentPrice().intValue() == EnumYesOrNo.YES.getCode().intValue()) {
_revenuePriceD = wxRentContract.getRevenueRentPrice();
}else {
_revenuePriceD = new BigDecimal(wxRentContract.getRevenue()).multiply(new BigDecimal(wxRentContract.getPayRatio()))
.divide(new BigDecimal(10000)).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); .divide(new BigDecimal(10000)).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
}
revenuePriceArrs[0] = _revenuePriceD; revenuePriceArrs[0] = _revenuePriceD;
BigDecimal revenuePriceD = new BigDecimal(_revenuePriceD); BigDecimal revenuePriceD = new BigDecimal(_revenuePriceD);
//联营扣点调整比率 //联营扣点调整比率


Laddar…
Avbryt
Spara