From 1d11dbb8b359c4f185e6fa38ebe66f282850fb30 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Thu, 14 Nov 2024 20:55:32 +0800 Subject: [PATCH] fix --- .../contract/WxAgileContractController.java | 2 +- .../contract/WxPropertyContractController.java | 2 +- .../service/impl/WxPropertyContractServiceImpl.java | 11 ++++++++--- .../service/impl/WxRentContractServiceImpl.java | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index c2ff11a14..2f48dc09a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -160,7 +160,7 @@ public class WxAgileContractController extends WxContractBaseController { shopList.add(shopId); shopIdStr = shopIdStr +","+ shopId; } - String rentArea = rentInfoObject.getString("rentArea"); + String rentArea = rentInfoObject.getString("operationArea"); if (StringUtils.isNotBlank(rentArea)) { rentAreaDecimal = rentAreaDecimal.add(new BigDecimal(rentArea)); } 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 0dad4cdfe..2525c69a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -170,7 +170,7 @@ public class WxPropertyContractController extends WxContractBaseController { return new ResultData("createType参数不能为空"); } if (wxPropertyContract.getCreateType().intValue() == EnumPropertyCreateType.BY_SHOP.getCode().intValue()) { - if (StringUtils.isBlank(wxPropertyContract.getRentArea()) || StringUtils.isBlank(wxPropertyContract.getShopIds())) { + if (StringUtils.isBlank(wxPropertyContract.getShopIds())) { return new ResultData(Result.ERROR,"请选择店铺"); } if (new BigDecimal(wxPropertyContract.getRentArea()).compareTo(new BigDecimal(0)) <= 0 ) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index ab34242de..17cddd9a0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -350,10 +350,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService WxShop shopq = new WxShop(); shopq.updateTenantInfo(record); shopq.setIds(shopIds); - List sh = wxShopService.selectList(shopq); - if (null != sh) { - record.setRentInfo(JSON.toJSONString(sh)); + List shlist = wxShopService.selectList(shopq); + BigDecimal rentArea = new BigDecimal(0); + for (int i = 0 ; i< shlist.size(); i ++) { + rentArea = rentArea.add(new BigDecimal(shlist.get(i).getOperationArea())); } + if (null != shlist) { + record.setRentInfo(JSON.toJSONString(shlist)); + } + record.setRentArea(rentArea.toPlainString()); } return new ResultData(Result.SUCCESS, "保存物业合同信息成功", record); } 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 bb074fbbc..b95c03cf8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -423,7 +423,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { for (int i = 0; i < size; i++) { JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); Long shopId = rentInfoObject.getLong("id"); - rentArea = rentArea.add(new BigDecimal(rentInfoObject.getString("rentArea"))); + rentArea = rentArea.add(new BigDecimal(rentInfoObject.getString("operationArea"))); if (!shopList.contains(shopId)) { shopList.add(shopId); shopIdStr = shopIdStr +","+ shopId;