|
|
|
@@ -274,9 +274,14 @@ public class WxShopServiceImpl implements WxShopService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<Long,List<WxShopVo>> findMerchantShopVoList(TenantEntity tenantEntity, List<Long> merchantIds) { |
|
|
|
Map<Long,List<WxShopVo>> retMap = new HashMap<Long,List<WxShopVo>>(); |
|
|
|
Map<Long,String> floorMap = wxMallFloorService.getFloorMap(tenantEntity); |
|
|
|
Map<Long,String> buildingMap = wxMallBuildingService.getBuildingMap(tenantEntity); |
|
|
|
List<Long> shopIds = wxMerchantShopMapper.findShopIds(merchantIds); |
|
|
|
|
|
|
|
if(shopIds == null || shopIds.isEmpty()){ |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
|
|
|
|
List<WxShopVo> shopVoList = wxShopMapper.newFindShopVoList(tenantEntity.getTenantId(),shopIds); |
|
|
|
Map<Long,WxShopVo> shopVoMap = new HashMap<Long,WxShopVo>(); |
|
|
|
@@ -288,13 +293,13 @@ public class WxShopServiceImpl implements WxShopService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Map<Long,List<WxShopVo>> retMap = new HashMap<Long,List<WxShopVo>>(); |
|
|
|
|
|
|
|
WxMerchantShop merchantShopQ = new WxMerchantShop(); |
|
|
|
merchantShopQ.updateTenantInfo(tenantEntity); |
|
|
|
merchantShopQ.setMerchantIds(merchantIds); |
|
|
|
List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShopQ); |
|
|
|
if (null == merchantShops) { |
|
|
|
return null; |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
for (int i = 0 ; i < merchantShops.size(); i ++) { |
|
|
|
WxMerchantShop ms = merchantShops.get(i); |
|
|
|
|