diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 170fd0a19..af0d0ab48 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -297,10 +297,22 @@ public class WxShopServiceImpl implements WxShopService { Map shopMerchantIdMap = new HashMap(); Map merchantMap = new HashMap(); initShopMerchantMap(record, shopMerchantIdMap, merchantMap); - PageInfo> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxShopMapper.findListMap(record)); List> shopList = pageInfo.getList() ; - if (null != shopList) { + if (null != shopList && shopList.size() > 0 ) { + List shopIdList = new ArrayList<>(); + for (int i = 0 ; i < shopList.size(); i ++) { + Map shop = shopList.get(i); + Long shopId = (Long)shop.get("id"); + shopIdList.add(shopId); + } + + WxShopUsers suq = new WxShopUsers(); + suq.updateTenantInfo(record); + suq.setShopIds(shopIdList); + suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); + Map shopUserMap = this.getShopUserMap(suq); + for (int i = 0 ; i < shopList.size(); i ++) { Map shop = shopList.get(i); if (null != shop) { @@ -314,6 +326,13 @@ public class WxShopServiceImpl implements WxShopService { } Long shopId = (Long)shop.get("id"); if (null != shopId) { + WxShopUsers su = shopUserMap.get(shopId); + if (null != su) { + shop.put("shopUserType", su.getType()); + shop.put("shopUserTypeName", su.getTypeName()); + shop.put("shopUserName", su.getName()); + } + Long merchantId = shopMerchantIdMap.get(shopId); if (null != merchantId && null != merchantMap) { WxMerchant m = merchantMap.get(merchantId);