|
|
@@ -1884,7 +1884,7 @@ public class SearchServiceImpl implements SearchService {
|
|
|
|
|
|
return booleanQueryMap;
|
|
|
}
|
|
|
- private SPage<Object> querySellers(String indexName, Integer page, Integer size, Query query, Sort sort, String duplicateType) throws IOException {
|
|
|
+ private SPage<Object> querySellers(String indexName, Integer page, Integer size, BooleanQuery query, Sort sort, String duplicateType) throws IOException {
|
|
|
SPage<Object> sPage = new SPage<>();
|
|
|
if (page != null && page > 0) {
|
|
|
sPage.setPage(page);
|
|
|
@@ -1904,6 +1904,16 @@ public class SearchServiceImpl implements SearchService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (indexName.equals(SearchConstants.GOODS_TABLE_NAME)) {
|
|
|
+ Object status = Arrays.asList(TradeGoods.VALID_STATUS);
|
|
|
+ // 批次 id 不为空时,对状态过滤
|
|
|
+ filter(status, SearchConstants.GOODS_GO_STATUS_FIELD, query);
|
|
|
+ } else if (indexName.equals(SearchConstants.PRODUCTS_PRIVATE_TABLE_NAME)) {
|
|
|
+ Object status = Arrays.asList(V_Products.VALID_STATUS);
|
|
|
+ // 批次 id 不为空时,对状态过滤
|
|
|
+ filter(status, SearchConstants.PRODUCT_PRIVATE_B2CENABLED_FIELD, query);
|
|
|
+
|
|
|
+ }
|
|
|
IndexSearcher indexSearcher = SearchUtils.getIndexSearcher(indexName);
|
|
|
TopDocs topDocs;
|
|
|
try {
|