From a91c1a27a22c79ea8876694ad3a00410d7ecb2a6 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 29 Apr 2024 14:54:43 +0800 Subject: [PATCH] fix contract bill --- .../contract/WxPropertyContractController.java | 11 ++++++++--- .../com/iformall/domain/po/WxPropertyContract.java | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 2484af6c4..a72e4d3b2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -55,6 +55,8 @@ public class WxPropertyContractController extends WxContractBaseController { WxMallFloorService floorService; @Autowired private WxShopService wxShopService; + @Autowired + private WxRentContractService rentContractService; @GetMapping("/list") @ApiImplicitParams({ @@ -165,7 +167,8 @@ public class WxPropertyContractController extends WxContractBaseController { MallUserInfo user = getUser(); wxPropertyContract.updateTenantInfo(user); wxPropertyContract.setAdjustPeriodHandle(); - wxPropertyContract.calcutePrice(); + WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); + wxPropertyContract.calcutePrice(rentContract); Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); wxPropertyContract.setContractType(contractType); if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ @@ -182,7 +185,8 @@ public class WxPropertyContractController extends WxContractBaseController { MallUserInfo user = getUser(); propertyContract.updateTenantInfo(user); propertyContract.setAdjustPeriodHandle(); - wxPropertyContract.calcutePrice(); + WxRentContract rentContract = rentContractService.getSimpleDeatil(propertyContract.getRentContractId()); + wxPropertyContract.calcutePrice(rentContract); propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(),false); } @@ -204,7 +208,8 @@ public class WxPropertyContractController extends WxContractBaseController { */ @PostMapping("calcutePrice") public ResultData calcutePrice(@RequestBody WxPropertyContract wxPropertyContract) { - wxPropertyContract.calcutePrice(); + WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); + wxPropertyContract.calcutePrice(rentContract); return new ResultData(wxPropertyContract.getPrice()); } 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 2a7863572..c20148ee8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -229,11 +229,11 @@ public class WxPropertyContract extends TenantEntity { } } - public void calcutePrice() { + public void calcutePrice(WxRentContract rentContract) { //如果是固定的,则不计算 if (!fixedPrice.equals(EnumYesOrNo.YES.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(); + 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(); } } }