Merge branch 'pre' into 'master'

提交 app 搜索接口

See merge request !210

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -467,16 +467,15 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         List<String> listStore = mongoUtils.getStoreInfoVoRegexName(name);
         Pattern pattern = Pattern.compile("^.*" + name + ".*$", Pattern.CASE_INSENSITIVE);
         Query query = new Query();
-        query.addCriteria(new Criteria().orOperator(
-//                Criteria.where("spuType").is(0),
-                Criteria.where("name").regex(pattern),
-                Criteria.where("storeId").in(listStore),
-                Criteria.where("extagVoList.tagName").is(name)
+        query.addCriteria(Criteria.where("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null).andOperator(
+                new Criteria().orOperator(
+                        Criteria.where("name").regex(pattern),
+                        Criteria.where("storeId").in(listStore),
+                        Criteria.where("extagVoList.tagName").is(name)
+                ),
+                new Criteria().orOperator(Criteria.where("spuType").exists(false), (Criteria.where("spuType").is(0)))
         ));
-        // query.addCriteria(Criteria.where("name").regex(pattern).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
-        query.addCriteria(Criteria.where("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null));
-        query.addCriteria(Criteria.where("spuType").is(0));
-        query.with(Sort.by(
+        query.with(PageRequest.of(0, 20)).with(Sort.by(
                 //Sort.Order.desc("count"),
                 Sort.Order.desc("shelvesAt")
         ));