|
|
@@ -234,7 +234,6 @@ public class WxPropertyContract extends TenantEntity { |
|
|
public void calcutePrice(WxRentContract rentContract) { |
|
|
public void calcutePrice(WxRentContract rentContract) { |
|
|
//如果是固定的,则不计算 |
|
|
//如果是固定的,则不计算 |
|
|
if (null != fixedPrice && fixedPrice.equals(EnumYesOrNo.YES.getCode())) { |
|
|
if (null != fixedPrice && fixedPrice.equals(EnumYesOrNo.YES.getCode())) { |
|
|
this.fixedPrice = EnumYesOrNo.NO.getCode(); |
|
|
|
|
|
}else { |
|
|
}else { |
|
|
if (StringUtils.isNoneBlank(rentContract.getRentArea()) && StringUtils.isNotBlank(this.rentPrice)) { |
|
|
if (StringUtils.isNoneBlank(rentContract.getRentArea()) && StringUtils.isNotBlank(this.rentPrice)) { |
|
|
this.price = new BigDecimal(rentContract.getRentArea()).multiply(new BigDecimal(this.rentPrice)).setScale(this.decimalSize, RoundingMode.HALF_UP).toPlainString(); |
|
|
this.price = new BigDecimal(rentContract.getRentArea()).multiply(new BigDecimal(this.rentPrice)).setScale(this.decimalSize, RoundingMode.HALF_UP).toPlainString(); |
|
|
|