From 572394eb27f6cb0af13f35ee7849597ab338442b Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Fri, 20 Dec 2024 18:33:27 +0800 Subject: [PATCH] fix --- .../contract/WxContractBaseController.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java index 781ae0034..dc703c108 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -167,11 +167,9 @@ public class WxContractBaseController extends BaseController{ ShopValidAreaVo vo = new ShopValidAreaVo(); vo.setShopNumber(shop.getShopNumber()); - ; + vo.setValidArea(shopArea);; - if (shopArea.compareTo(new BigDecimal(0)) <= 0 ) { - vo.setValidArea(new BigDecimal(0)); - }else { + if (shopArea.compareTo(new BigDecimal(0)) > 0 ) { BigDecimal contractShopArea = new BigDecimal(0); if (null != rentAreaMap) { contractShopArea = rentAreaMap.get(shopId); @@ -220,12 +218,8 @@ public class WxContractBaseController extends BaseController{ if (null != usedContractIds && usedContractIds.size() > 0 ) { BigDecimal usedArea = wxAgileContractService.sumShopContractAreas(tenantEntity, shopId,usedContractIds); BigDecimal totalUsedArea = usedArea.add(contractShopArea); - BigDecimal remianArea = wxShopService.calcuteUsedShopArea(tenantEntity, shopId, totalUsedArea); - if (remianArea.compareTo(new BigDecimal(0)) < 0 ) { - vo.setValidArea(new BigDecimal(0)); - }else { - vo.setValidArea(remianArea); - } + BigDecimal remianArea = shopArea.subtract(totalUsedArea); + vo.setValidArea(remianArea); } } } @@ -244,7 +238,7 @@ public class WxContractBaseController extends BaseController{ Long shopId = it.next(); ShopValidAreaVo vo = shopVliadAreaMap.get(shopId); if ( null != vo && null != vo.getValidArea()) { - if (vo.getValidArea().compareTo(new BigDecimal(0)) <= 0 ) { + if (vo.getValidArea().compareTo(new BigDecimal(0)) < 0 ) { throw new MallinkException(Result.ERROR, "房间["+vo.getShopNumber()+"]面积不足。"); } }