|
|
@@ -1163,20 +1163,21 @@ public class SearchServiceImpl implements SearchService {
|
|
|
productsFields.add(SearchConstants.PRODUCT_PRIVATE_PCMPCODE_FIELD);
|
|
|
PageParams stockPageParams = new PageParams(pageParams);
|
|
|
PageParams futuresPageParams = new PageParams(pageParams);
|
|
|
+ String productkeyword = new String(keyword);
|
|
|
// 现货
|
|
|
Map<String, Object> stock = getGoodsIds(keyword, goodsFields, false, pageParams);
|
|
|
// 如搜索无结果则分词
|
|
|
if (CollectionUtils.isEmpty(stock) || stock.get("content") == null || JSONObject.parseArray(stock.get("content").toString()).isEmpty()) {
|
|
|
- keyword = recursivelyGetGoodsIds(keyword, null, true);
|
|
|
+ keyword = recursivelyGetGoodsIds(keyword, goodsFields, true);
|
|
|
stock = getGoodsIds(keyword, goodsFields, true, stockPageParams);
|
|
|
}
|
|
|
// 期货
|
|
|
PageParams recursivelyPageParams = new PageParams(pageParams);
|
|
|
- SPage<Long> futures = getProductIds(keyword, productsFields, false, futuresPageParams);
|
|
|
+ SPage<Long> futures = getProductIds(keyword, productsFields, true, futuresPageParams);
|
|
|
// 如搜索无结果则分词
|
|
|
if (futures == null || CollectionUtils.isEmpty(futures.getContent())) {
|
|
|
- keyword = recursivelyProductIds(keyword, productsFields, true);
|
|
|
- futures = getProductIds(keyword, productsFields, true, recursivelyPageParams);
|
|
|
+ productkeyword = recursivelyProductIds(productkeyword, productsFields, true);
|
|
|
+ futures = getProductIds(productkeyword, productsFields, false, recursivelyPageParams);
|
|
|
}
|
|
|
map.put("stock", stock);
|
|
|
map.put("futures", futures);
|