| @@ -643,9 +643,15 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| @Override | @Override | ||||
| public Map<Long,List<WxShopVo>> findMerchantShopVoListMap(TenantEntity tenantEntity, List<Long> merchantIds) { | public Map<Long,List<WxShopVo>> findMerchantShopVoListMap(TenantEntity tenantEntity, List<Long> merchantIds) { | ||||
| Map<Long,List<WxShopVo>> retMap = new HashMap<Long,List<WxShopVo>>(); | |||||
| Map<Long,String> floorMap = getFloorMap(tenantEntity); | Map<Long,String> floorMap = getFloorMap(tenantEntity); | ||||
| Map<Long,String> buildingMap = getBuildingMap(tenantEntity); | Map<Long,String> buildingMap = getBuildingMap(tenantEntity); | ||||
| List<Long> shopIds = wxMerchantShopMapper.findShopIds(merchantIds); | List<Long> shopIds = wxMerchantShopMapper.findShopIds(merchantIds); | ||||
| if(shopIds == null || shopIds.isEmpty()){ | |||||
| return retMap; | |||||
| } | |||||
| List<WxShopVo> shopVoList = wxShopMapper.newFindShopVoList(tenantEntity.getTenantId(),shopIds); | List<WxShopVo> shopVoList = wxShopMapper.newFindShopVoList(tenantEntity.getTenantId(),shopIds); | ||||
| Map<Long,WxShopVo> shopVoMap = new HashMap<Long,WxShopVo>(); | Map<Long,WxShopVo> shopVoMap = new HashMap<Long,WxShopVo>(); | ||||
| @@ -656,8 +662,7 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| shopVoMap.put(sv.getId(), sv); | shopVoMap.put(sv.getId(), sv); | ||||
| } | } | ||||
| } | } | ||||
| Map<Long,List<WxShopVo>> retMap = new HashMap<Long,List<WxShopVo>>(); | |||||
| WxMerchantShop merchantShopQ = new WxMerchantShop(); | WxMerchantShop merchantShopQ = new WxMerchantShop(); | ||||
| merchantShopQ.updateTenantInfo(tenantEntity); | merchantShopQ.updateTenantInfo(tenantEntity); | ||||
| merchantShopQ.setMerchantIds(merchantIds); | merchantShopQ.setMerchantIds(merchantIds); | ||||