Authored by wangnan

fix

@@ -18,6 +18,7 @@ import com.yoho.search.service.utils.SearchApiResultUtils; @@ -18,6 +18,7 @@ import com.yoho.search.service.utils.SearchApiResultUtils;
18 import com.yoho.search.service.utils.SearchRequestParams; 18 import com.yoho.search.service.utils.SearchRequestParams;
19 import com.yoho.search.service.vo.SearchApiResult; 19 import com.yoho.search.service.vo.SearchApiResult;
20 import org.apache.commons.collections.CollectionUtils; 20 import org.apache.commons.collections.CollectionUtils;
  21 +import org.apache.commons.collections.map.HashedMap;
21 import org.apache.commons.lang.StringUtils; 22 import org.apache.commons.lang.StringUtils;
22 import org.elasticsearch.index.query.*; 23 import org.elasticsearch.index.query.*;
23 import org.elasticsearch.search.SearchHit; 24 import org.elasticsearch.search.SearchHit;
@@ -392,7 +393,13 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl @@ -392,7 +393,13 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
392 dataMapMap.put(lt.getKeyAsString(), map); 393 dataMapMap.put(lt.getKeyAsString(), map);
393 //处理品牌信息 394 //处理品牌信息
394 Map<String, Object> shopsInfo = shopInfoMap.get(lt.getKeyAsString()); 395 Map<String, Object> shopsInfo = shopInfoMap.get(lt.getKeyAsString());
395 - map.put("info", shopsInfo); 396 + Map<String, Object> shopDataMap = new HashedMap();
  397 + shopDataMap.put("shop_id", shopsInfo.get("shopsId"));
  398 + shopDataMap.put("shop_name", shopsInfo.get("shopName") == null ? "" : shopsInfo.get("shopName"));
  399 + shopDataMap.put("shop_logo", shopsInfo.get("shopLogo") == null ? "" : shopsInfo.get("shopLogo"));
  400 + shopDataMap.put("shop_domain", shopsInfo.get("shopDomain") == null ? "" : shopsInfo.get("shopDomain"));
  401 + shopDataMap.put("shop_type", shopsInfo.get("shopsType") == null ? "" : shopsInfo.get("shopsType"));
  402 + map.put("info", shopDataMap);
396 dataMapMap.put(lt.getKeyAsString(), map); 403 dataMapMap.put(lt.getKeyAsString(), map);
397 } 404 }
398 try { 405 try {