From 1be54b20e48e6192f91c30e7192d73859f404169 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 25 Apr 2024 17:49:01 +0800 Subject: [PATCH] fix --- .../controller/contract/WxRentContractController.java | 1 + .../main/java/com/iformall/domain/po/WxRentContract.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 33c43312b..cd59c22db 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -207,6 +207,7 @@ public class WxRentContractController extends WxContractBaseController { MallUserInfo user = getUser(); wxRentContract.updateTenantInfo(user); wxRentContract.setAdjustPeriodHandle(); + wxRentContract.calcutePrice(); //wxRentContract.setRentPriceHandle(); Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index a5199ddb2..1ee3b6371 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -15,6 +15,7 @@ import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Date; import java.util.List; import java.util.Map; @@ -447,6 +448,12 @@ public class WxRentContract extends TenantEntity { // rentPrice = "0"; // } // } + + 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(); + } + } @io.swagger.annotations.ApiModelProperty(value = "合同类型", name = "contractType")