From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java
index 9d6868f..d10ae20 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java
+++ b/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));
--
Gitblit v1.8.0