yoho-search / yoho-search-service · Commits

Go to a project

Authored by wangnan
Commit 855efb2a1b6db2efff39fd6d1a27252eb9ca4f44 1 parent 4d57bedb

shops支持搜索全球购店铺 fix

Inline Side-by-side
Showing 3 changed files with 25 additions and 24 deletions
package com.yoho.search.service.service.helper;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.query.MultiMatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yoho.search.base.utils.ConvertUtils;
import com.yoho.search.base.utils.DateUtil;
import com.yoho.search.base.utils.ISearchConstants;
... ... @@ -32,6 +11,17 @@ import com.yoho.search.service.service.SearchCommonService;
import com.yoho.search.service.service.SearchDynamicConfigService;
import com.yoho.search.service.service.SearchKeyWordService;
import com.yoho.search.service.utils.SearchRequestParams;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.elasticsearch.index.query.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.*;
@Service
public class SearchServiceHelper {
... ... @@ -679,6 +669,9 @@ public class SearchServiceHelper {
productMap.put("sales_num", map.get("salesNum"));
productMap.put("status", map.get("status"));
productMap.put("is_promotion", map.get("ispromotion"));
productMap.put("is_promotion", map.get("ispromotion"));
productMap.put("tbl_country_id", map.get("tblCountryId"));
productMap.put("tbl_country_name", map.get("tblCountryName"));
String yohoodIdFromMap = (String) map.get("yohoodId");
if (yohoodIdFromMap != null && yohoodIdFromMap.length() > 0) {
... ...
... ... @@ -52,6 +52,7 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
ApplicationEventPublisher publisher;
@Autowired
private SearchCommonService searchCommonService;
@Autowired
... ... @@ -225,12 +226,14 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
}
}
//tbl判断
SearchApiResult searchApiResult = searchTbl(paramMap,keyword);
SearchApiResult searchApiResult = new SearchApiResult();
JSONObject returnMap = new JSONObject();
returnMap.put("shop", null);
returnMap.put("brand", null);
returnMap.put("tblBrand", null);
//tbl判断
if (paramMap.containsKey("contain_global") && "Y".equals(paramMap.get("contain_global"))) {
searchApiResult = searchTbl(paramMap, keyword);
if (searchApiResult.getData() != null) {
Map<String, Object> shopInfoMap = (Map<String, Object>) searchApiResult.getData();
JSONObject shopDataMap = new JSONObject();
... ... @@ -241,7 +244,7 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
returnMap.put("tblBrand", shopDataMap);
return searchApiResult.setData(returnMap);
}
}
// 2、配置keyword的查询字段以及权重设置
MultiMatchQueryBuilder queryBuilder = QueryBuilders.multiMatchQuery(keyword);
... ... @@ -315,6 +318,7 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
/**
* shopsNew中搜索是否有匹配的全球购店铺，如果有直接返回。
*
* @param paramMap
* @param keyword
* @return
... ... @@ -468,6 +472,9 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
*/
private BoolQueryBuilder constructShopsFilterBuilder(Map<String, String> paramMap) throws Exception {
BoolQueryBuilder boolFilter = QueryBuilders.boolQuery();
if (!paramMap.containsKey("contain_global") && !"Y".equals(paramMap.get("contain_global"))) {
boolFilter = boolFilter.must(QueryBuilders.termQuery("contain_global", "N"));
}
boolFilter = BoolQueryTermQuery(paramMap, boolFilter, SearchRequestParams.SHOPS_PARAM_BLKSTATUS);
boolFilter = BoolQueryTermQuery(paramMap, boolFilter, SearchRequestParams.SHOPS_PARAM_CHECKSTATUS);
boolFilter = BoolQueryTermQuery(paramMap, boolFilter, SearchRequestParams.SHOPS_PARAM_EXAMINESTATUS);
... ...
... ... @@ -75,6 +75,7 @@ public class SearchRequestParams {
public static final String SHOPS_PARAM_OPERATIONSTATUS = "operationStatus";
public static final String SHOPS_PARAM_SHOPSTYPE = "shopsType";
public static final String SHOPS_PARAM_STATUS = "status";
public static final String SHOPS_PARAM_ISGLOBAL = "isGlobal";
... ...