Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
cc6623bb17
2 changed files with 3 additions and 2 deletions
  1. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 3
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java View File

@@ -233,7 +233,9 @@ public class WxPropertyContract extends TenantEntity {
public void calcutePrice(WxRentContract rentContract) {
//如果是固定的,则不计算
if (!fixedPrice.equals(EnumYesOrNo.YES.getCode())) {
if (null != fixedPrice && fixedPrice.equals(EnumYesOrNo.YES.getCode())) {
this.fixedPrice = EnumYesOrNo.NO.getCode();
}else {
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();
}


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -1953,7 +1953,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}else {
rc.setStatus(wxRentContract.getStatus());
}
rc.setRemark(record.getRemark());
rc.setFileNames(record.getFileNames());
wxRentContractMapper.updateById(rc);
return new ResultData(wxRentContract);


Loading…
Cancel
Save