From 5c000f7ce1f0b01328342aca63ed21a33d6103e7 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Wed, 11 Dec 2024 14:29:13 +0800 Subject: [PATCH] fix --- .../po/WxRentContractAgileUnDepositItem.java | 3 +++ ...xRentContractAgileUnDepositItemMapper.java | 1 + .../impl/WxAgileContractServiceImpl.java | 25 ++++++++++++++++++- ...WxRentContractAgileUnDepositItemMapper.xml | 7 ++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDepositItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDepositItem.java index e90c01f3d..34290e6fa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDepositItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDepositItem.java @@ -74,5 +74,8 @@ public class WxRentContractAgileUnDepositItem extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="页面用的字段",name="isFree") private Integer isFather; + + @TableField(exist = false) + private String shopNumber; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositItemMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositItemMapper.java index 4274f4c3b..3757d3777 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositItemMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileUnDepositItemMapper.java @@ -15,6 +15,7 @@ public interface WxRentContractAgileUnDepositItemMapper extends CommonMapper findIdList(WxRentContractAgileUnDepositItem wxBillRent); + List findShopIdList(WxRentContractAgileUnDepositItem wxBillRent); void deleteByUnDeposit(WxRentContractAgileUnDepositItem wxBillRent); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index c4b6f87b4..22cc4310a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -489,7 +489,30 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { WxRentContractAgileUnDepositItem itemq = new WxRentContractAgileUnDepositItem(); itemq.updateTenantInfo(ud); itemq.setUnDepositId(ud.getId()); - ud.setItems(wxRentContractAgileUnDepositItemMapper.findList(itemq)); + List itemList = wxRentContractAgileUnDepositItemMapper.findList(itemq); + ud.setItems(itemList); + if (null != itemList && itemList.size() > 0 ) { + if (ud.getSettingMethod().intValue() == EnumRentContractAgilSettingMethod.BY_SHOP.getCode().intValue()) { + List shopIds = wxRentContractAgileUnDepositItemMapper.findShopIdList(itemq); + if (null != shopIds && shopIds.size() > 0 ) { + WxShop sq = new WxShop(); + sq.updateTenantInfo(ud); + sq.setIds(shopIds); + Map shopMap = wxShopService.findShopMap(sq); + if (null != shopMap) { + for (int i = 0 ; i < itemList.size() ; i ++ ){ + WxRentContractAgileUnDepositItem item = itemList.get(i); + if (null != item.getShopId()) { + WxShop shop = shopMap.get(item.getShopId()); + if (null != shop) { + item.setShopNumber(shop.getShopNumber()); + } + } + } + } + } + } + } return ud; } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml index 73ace0f37..e25d4d2a4 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml @@ -61,6 +61,13 @@ + +