Merge branch 'feature/es_search4applet_1201' into 'master'

feat:[none] 小程序es搜索bookName条件查询方式调整

See merge request rays/pcloud-book!1082

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/impl/ESBookAndAdviserBizImpl.java

@@ -254,9 +254,13 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
                 .filter(QueryBuilders.termQuery("isBookAdviserDelete", 0))
                 .filter(ListUtils.isEmpty(templetIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("templetId", templetIds))
                 .filter(null == agentId   ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("adviserId", adviserIds));
+
         BoolQueryBuilder should = QueryBuilders.boolQuery()
-                .should(StringUtil.isEmpty(keyword) ? QueryBuilders.boolQuery() : QueryBuilders.wildcardQuery("bookName","*" + keyword+ "*"))
-                .should(StringUtil.isEmpty(keyword) ? QueryBuilders.boolQuery() : QueryBuilders.wildcardQuery("isbn", "*" + keyword + "*"));
+                .should(StringUtil.isEmpty(keyword) ? QueryBuilders.boolQuery()
+                        : QueryBuilders.wildcardQuery("bookName",  IKAnalyzerUtil.aroundWildcard(IKAnalyzerUtil.parseWildcardString(keyword))))
+                .should(StringUtil.isEmpty(keyword) ? QueryBuilders.boolQuery()
+                        : QueryBuilders.wildcardQuery("isbn", IKAnalyzerUtil.aroundWildcard(keyword)));
+
         BoolQueryBuilder should1 = QueryBuilders.boolQuery()
                 .should(null == isAdviserBook ? QueryBuilders.boolQuery() :  QueryBuilders.termQuery("isAdviserBook",isAdviserBook));
         //（年级&&科目）||二级分类