From 6d3e9255722ac9a683f0fcce21f95a0871d8fb9e Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 4 Aug 2024 21:57:54 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/domain/po/WxMerchant.java | 2 ++ .../iformall/service/helper/WxRentContractHelper.java | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index ebb7b9c88..8e11896ad 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -477,5 +477,7 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) public Integer billType; + @TableField(exist = false) + public Long energyFeesId; } 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 4e2d5ea3e..9cc4f982c 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java @@ -151,7 +151,7 @@ public class WxRentContractHelper { } //BigDecimal priceD = new BigDecimal(wxRentContract.getPrice()); - //联营保底营业额。 + //联营扣点年调整。 String revenueYear = wxRentContract.getRevenueRatioSet(); List revenueYears = null; if (!StringUtils.isBlank(revenueYear)) { @@ -209,8 +209,13 @@ public class WxRentContractHelper { //联营面积取高时,联营扣点调整比率设置 String[] revenuePriceArrs = new String[size]; 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(); + } revenuePriceArrs[0] = _revenuePriceD; BigDecimal revenuePriceD = new BigDecimal(_revenuePriceD); //联营扣点调整比率