Browse Source

fix contract bill

release_toaliyun_real
winter 2 years ago
parent
commit
adc2d74c29
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java

+ 7
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -8,6 +8,8 @@ import com.iformall.common.SortColumn;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumPriceUnit; import com.iformall.enums.EnumPriceUnit;
import com.iformall.enums.EnumRentContractAdjustPeriod; import com.iformall.enums.EnumRentContractAdjustPeriod;
import com.iformall.enums.EnumRentContractType;

import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@@ -450,8 +452,11 @@ public class WxRentContract extends TenantEntity {
// } // }
public void calcutePrice() { 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();
//如果是按铺位数算,price不用计算,是填写的值
if (!this.type.equals(EnumRentContractType.RENT_BY_COUNT.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();
}
} }
} }




Loading…
Cancel
Save