yujian
2020-01-03 c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7
fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java
@@ -31,7 +31,7 @@
    * @param uid 用户id
    * @return
    */
   public List<ESOrder> query(String key, String uid) {
   public List<ESOrder> query(String key, String uid, List<Integer> listPlatform) {
      List<ESOrder> list = new ArrayList<ESOrder>();
      // 商品名称匹配
      BoolQueryBuilder should1 = QueryBuilders.boolQuery().should(QueryBuilders.matchPhraseQuery("orderNo", key))
@@ -42,7 +42,16 @@
      // 查询创建
      SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
      sourceBuilder.query(QueryBuilders.boolQuery().must(should1).must(should2));
      if (listPlatform == null || listPlatform.size() == 0) {
         sourceBuilder.query(QueryBuilders.boolQuery().must(should1).must(should2));
      } else {
         BoolQueryBuilder should3 = QueryBuilders.boolQuery();
         for (Integer platform: listPlatform) {
            should3.should(QueryBuilders.termQuery("platform", platform));
         }
         sourceBuilder.query(QueryBuilders.boolQuery().must(should1).must(should2).must(should3));
      }
      
      SearchRequest searchRequest = new SearchRequest();
      searchRequest.indices(getDocument(ESOrder.class));