diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
index 2256e39a6..2a7863572 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
@@ -6,6 +6,8 @@ import com.iformall.common.SortColumn;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumPriceUnit;
import com.iformall.enums.EnumRentContractAdjustPeriod;
+import com.iformall.enums.EnumYesOrNo;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -228,8 +230,11 @@ public class WxPropertyContract extends TenantEntity {
}
public void calcutePrice() {
- if (StringUtils.isNoneBlank(this.rentArea) && StringUtils.isNotBlank(this.rentPrice)) {
- this.price = new BigDecimal(this.rentArea).multiply(new BigDecimal(this.rentPrice)).setScale(this.decimalSize, RoundingMode.HALF_UP).toPlainString();
+ //如果是固定的,则不计算
+ if (!fixedPrice.equals(EnumYesOrNo.YES.getCode())) {
+ if (StringUtils.isNoneBlank(this.rentArea) && StringUtils.isNotBlank(this.rentPrice)) {
+ this.price = new BigDecimal(this.rentArea).multiply(new BigDecimal(this.rentPrice)).setScale(this.decimalSize, RoundingMode.HALF_UP).toPlainString();
+ }
}
}
diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
index 180a7631e..361d9122c 100644
--- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
@@ -128,9 +128,6 @@
and br.`apply_status` = #{applyStatus}
and br.`id` = #{id}
and br.`merchant_id` = #{merchantId}
- and r.merchant_name like
- concat('%',#{merchantName},'%')
-
and br.`is_del` = #{isDel}
and br.`rent_contract_id` = #{rentContractId}
and br.`pay_way` = #{payWay}