|
|
|
@@ -297,10 +297,22 @@ public class WxShopServiceImpl implements WxShopService { |
|
|
|
Map<Long,Long> shopMerchantIdMap = new HashMap<Long,Long>(); |
|
|
|
Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>(); |
|
|
|
initShopMerchantMap(record, shopMerchantIdMap, merchantMap); |
|
|
|
|
|
|
|
PageInfo<Map<String,Object>> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxShopMapper.findListMap(record)); |
|
|
|
List<Map<String,Object>> shopList = pageInfo.getList() ; |
|
|
|
if (null != shopList) { |
|
|
|
if (null != shopList && shopList.size() > 0 ) { |
|
|
|
List<Long> shopIdList = new ArrayList<>(); |
|
|
|
for (int i = 0 ; i < shopList.size(); i ++) { |
|
|
|
Map<String,Object> 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<Long, WxShopUsers> shopUserMap = this.getShopUserMap(suq); |
|
|
|
|
|
|
|
for (int i = 0 ; i < shopList.size(); i ++) { |
|
|
|
Map<String,Object> 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); |
|
|
|
|