From cc6623bb17ee9d9e25972d886ded34019ffbbcd0 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 4 Jun 2024 20:51:29 +0800 Subject: [PATCH] fix --- .../main/java/com/iformall/domain/po/WxPropertyContract.java | 4 +++- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) 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 6fb1b21e9..f174d5546 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -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(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index f1c9afffd..d1b2969b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -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);