Merge branch 'master' into dev

mall-search/src/main/java/com/uas/search/constant/SearchConstants.java

@@ -180,7 +180,7 @@ public class SearchConstants {
     public static final String PCB_GOODS_CRNAME_FIELD = "cr_name";
     public static final String PCB_GOODS_PCB_ID_FIELD = "pcb_id";
     public static final String PCB_GOODS_KI_ID_FIELD = "ki_id";
-    public static final String PCB_GOODS_KI_NAME_CN_FIELD = "ki_name_cn";
+    public static final String PCB_GOODS_KI_NAME_CN_FIELD = "ki_name";
     public static final String PCB_GOODS_KI_NAME_CN_UNTOKENIZED_FIELD = "ki_name_cn_untokenized";
     public static final String PCB_GOODS_KI_LEVEL_FIELD = "ki_level";
     public static final String PCB_GOODS_KI_ISLEAF_FIELD = "ki_isleaf";

mall-search/src/main/java/com/uas/search/controller/SearchController.java

@@ -266,9 +266,9 @@ public class SearchController {
 	@ResponseBody
 	public Map<String, Object> getGoodsIds(String keyword, String params, HttpServletRequest request) throws IOException {
         long start = System.currentTimeMillis();
-        PageParams pageParams = params==null?null:JSONObject.parseObject(params, PageParams.class);
+        PageParams pageParams = params == null ? null : JSONObject.parseObject(params, PageParams.class);
         Map<String, Object> goodsIds = searchService.getGoodsIds(keyword, pageParams);
-        logger.info(String.format("goodsIds\t%s\t%.3fs", keyword, (System.currentTimeMillis()-start)/1000.0));
+        logger.info(String.format("goodsIds\t%s\t%.3fs", keyword, (System.currentTimeMillis() - start) / 1000.0));
         return goodsIds;
     }
 

mall-search/src/main/java/com/uas/search/service/impl/SearchServiceImpl.java

@@ -1204,7 +1204,7 @@ public class SearchServiceImpl implements SearchService {
 
             Sort sort = sortPCBGoods(keyword, pageParams.getSort());
             TopDocs hits;
-            if (pageParams.getPage() > 1) {// 不是第一页
+            if (pageParams.getPage() > 1) { // 不是第一页
                 TopDocs previousHits = indexSearcher.search(booleanQuery,
                         (pageParams.getPage() - 1) * pageParams.getSize(), sort, true, false);
                 int totalHits = previousHits.totalHits;
@@ -1604,6 +1604,11 @@ public class SearchServiceImpl implements SearchService {
         booleanQuery.add(new PrefixQuery(new Term(SearchConstants.PCB_GOODS_PR_PCMPCODE_FIELD, keyword.toLowerCase())), BooleanClause.Occur.SHOULD);
         // PCB
         booleanQuery.add(createQuery(SearchConstants.PCB_GOODS_PR_PCMPCODE_FIELD, keyword, 100), Occur.SHOULD);
+		// 品牌
+		booleanQuery.add(createQuery(SearchConstants.PCB_GOODS_BR_NAME_CN_FIELD, keyword, 10), BooleanClause.Occur.SHOULD);
+		booleanQuery.add(createQuery(SearchConstants.PCB_GOODS_BR_NAME_EN_FIELD, keyword, 10), BooleanClause.Occur.SHOULD);
+		// 类目
+		booleanQuery.add(createQuery(SearchConstants.PCB_GOODS_KI_NAME_CN_FIELD, keyword, 1), BooleanClause.Occur.SHOULD);
         return booleanQuery;
     }