From 13787073f2c6d55f2d455593e5b44bf57cdbb3b1 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Thu, 14 Nov 2024 20:25:49 +0800 Subject: [PATCH] fix --- .../controller/contract/WxRentContractController.java | 3 +++ .../iformall/service/impl/WxRentContractServiceImpl.java | 7 +++---- .../src/main/resources/mapper/WxShopUsersMapper.xml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) 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 5fe60d385..60e864f35 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -190,6 +190,9 @@ public class WxRentContractController extends WxContractBaseController { if (wxRentContract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode().intValue() && null == wxRentContract.getMonthAverageDays()) { return new ResultData(Result.ERROR,"请填写月平均天数"); } + + WxRentContract contract = wxRentContractService.selectById(wxRentContract.getId()); + wxRentContract.setRentArea(contract.getRentArea()); return wxRentContractService.update(wxRentContract, user,user.getName(),EnumFromType.OTHER.getCode(),oldDate,false,true); } 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 bf87e176d..bb074fbbc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -419,18 +419,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //查询rent_info 包括 shopId String shopIdStr = ""; + BigDecimal rentArea = new BigDecimal(0); for (int i = 0; i < size; i++) { JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); - WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.updateTenantInfo(record); Long shopId = rentInfoObject.getLong("id"); - //wxRentContract.setShopId(shopId); - String shopNumber = rentInfoObject.getString("shopNumber"); + rentArea = rentArea.add(new BigDecimal(rentInfoObject.getString("rentArea"))); if (!shopList.contains(shopId)) { shopList.add(shopId); shopIdStr = shopIdStr +","+ shopId; } } + record.setRentArea(rentArea.toPlainString()); setShops(record,shopList); //关联客户 setCustomers(record); diff --git a/mallinkService/src/main/resources/mapper/WxShopUsersMapper.xml b/mallinkService/src/main/resources/mapper/WxShopUsersMapper.xml index fa9ebc34a..ed2464b4f 100644 --- a/mallinkService/src/main/resources/mapper/WxShopUsersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopUsersMapper.xml @@ -52,7 +52,7 @@ and shop_id in - #{idItem} + #{sidItem}