BrandIndexBaseService中去除全球购品牌查询

@@ -102,55 +102,4 @@ public class BrandIndexBaseService {
         return resultMap;
     }
 
-    /**
-     * 根据品牌id获取对应的全球购的品牌信息
-     *
-     * @param brandIds
-     * @param status
-     * @return
-     */
-    private List<Map<String, Object>> getGlobalBrandListByIds(Collection<?> brandIds, int status) {
-        if (brandIds == null || brandIds.isEmpty()) {
-            return new ArrayList<Map<String, Object>>();
-        }
-        SearchParam searchParam = new SearchParam();
-        BoolQueryBuilder boolFilter = QueryBuilders.boolQuery();
-        boolFilter.must(QueryBuilders.termQuery("isGlobal", "Y"));
-        if (status >= 0) {
-            boolFilter.must(QueryBuilders.termQuery("status", status));
-        }
-        BoolQueryBuilder brandIdFilter = QueryBuilders.boolQuery();
-        brandIdFilter.should(QueryBuilders.termsQuery("id", brandIds));
-        brandIdFilter.should(QueryBuilders.termsQuery("yohoBrandId", brandIds));
-        boolFilter.must(brandIdFilter);
-        searchParam.setFiter(boolFilter);
-        searchParam.setOffset(0);
-        searchParam.setSize(brandIds.size());
-        SearchResult searchResult = searchCommonService.doSearch(BRAND_INDEX_NAME, searchParam);
-        List<Map<String, Object>> esResults = searchResult.getResultList();
-        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-        for (Map<String, Object> esResult : esResults) {
-            list.add(this.getBrandMap(esResult));
-        }
-        return list;
-    }
-
-    public Map<String, Map<String, Object>> getGlobalBrandMapByIds(Collection<?> brandIds, int status) {
-        List<Map<String, Object>> resultList = this.getGlobalBrandListByIds(brandIds, status);
-        Map<String, Map<String, Object>> resultMap = new HashMap<String, Map<String, Object>>();
-        for (Map<String, Object> result : resultList) {
-            String realBrandId = result.get("id").toString();
-            // 将id转为真实的id
-            result.put("id", Integer.parseInt(realBrandId) * (-1));
-            // realBrandId加入map
-            resultMap.put(realBrandId, result);
-            // yohobrandId加入map
-            Object yohobrandId = result.get("yoho_brand_id");
-            if (yohobrandId != null) {
-                resultMap.put(yohobrandId.toString(), result);
-            }
-        }
-        return resultMap;
-    }
-
 }