修改搜索条件

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

@@ -309,9 +309,10 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     }
     public  GoblinStoreInfoVo getStore(String storId){
         Query query = new Query();
-        query.addCriteria(Criteria.where("storeId").is(storId));
+        query.addCriteria(Criteria.where("storeId").is(storId).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
         long count = mongoTemplate.count(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
         GoblinStoreInfoVo goblinStoreInfoVo=goblinRedisUtils.getStoreInfoVo(storId);
+        //GoblinStoreNoticeVo goblinStoreNoticeVo=goblinRedisUtils.getStoreNoticeVo(storId,LocalDateTime.now());
         goblinStoreInfoVo.setCount((int) count);
       return   goblinStoreInfoVo;
     }
@@ -357,7 +358,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     public List<GoblinGoodsInfoVo> searchGoodesName(String name){
         Pattern pattern = Pattern.compile("^.*"+name+".*$", Pattern.CASE_INSENSITIVE);
         Query query = new Query();
-        query.addCriteria(Criteria.where("name").regex(pattern));
+        query.addCriteria(Criteria.where("name").regex(pattern).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
         query.with(Sort.by(
                 Sort.Order.desc("count"),
                 Sort.Order.desc("createdAt")
@@ -389,7 +390,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     public GoblinFrontCategoryListVo getStoreGoodes(String storeId,String categoryId,String name){
         //
         Query query = new Query();
-        query.addCriteria(Criteria.where("storeId").is(storeId));
+        query.addCriteria(Criteria.where("storeId").is(storeId).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
         if(StringUtil.isNotBlank(categoryId)){
             query.addCriteria(new Criteria().orOperator(
                     Criteria.where("storeCateFid").is(categoryId),
@@ -431,7 +432,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         //
         Query query = new Query();
         query.addCriteria(new Criteria().orOperator(
-                Criteria.where("extagVoList.tagId").is(tagId)
+                Criteria.where("extagVoList.tagId").is(tagId).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3")
         ));
         Pageable pageable=null;
         //
@@ -484,6 +485,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 Criteria.where("cateSid").is(categoryId),
                 Criteria.where("cateTid").is(categoryId)
         ));
+        query.addCriteria(Criteria.where("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
         Pageable pageable=null;
         //
         if(type.equals("1")){
@@ -532,7 +534,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         if(StringUtil.isNotBlank(spuids)){
             query.addCriteria(Criteria.where("spuId").nin(spuids.split(",")));
         }
-        query.addCriteria(Criteria.where("delFlg").is("0").and("shelvesStatus").is("3"));
+        query.addCriteria(Criteria.where("delFlg").is("0").and("shelvesStatus").is("3").and("spuAppear").is("0"));
 
         //redis里面获取排序规则 1、上架时间2、销量3、价格高到低4、价格低到高
         int sortType=0;