修改搜索marketId

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

@@ -459,7 +459,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 Criteria.where("extagVoList.tagName").is(name)
         ));
        // 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"));
+        query.addCriteria(Criteria.where("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null));
         query.with(Sort.by(
                 Sort.Order.desc("count"),
                 Sort.Order.desc("createdAt")
@@ -555,7 +555,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         //
         Query query = new Query();
         query.addCriteria(new Criteria().orOperator(
-                Criteria.where("extagVoList.tagId").is(tagId).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3")
+                Criteria.where("extagVoList.tagId").is(tagId).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null)
         ));
         Pageable pageable=null;
         //
@@ -615,7 +615,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"));
+        query.addCriteria(Criteria.where("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3").and("marketId").is(null));
         Pageable pageable=null;
         //
         if(type.equals("1")){
@@ -655,7 +655,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").and("spuAppear").is("0"));
+        query.addCriteria(Criteria.where("delFlg").is("0").and("shelvesStatus").is("3").and("spuAppear").is("0").and("marketId").is(null));
 
 
         //redis里面获取排序规则 1、上架时间2、销量3、价格高到低4、价格低到高
@@ -770,7 +770,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                     it.remove();
                 }else{
                     GoblinGoodsInfoVo goblinGoodsInfoVo=  goblinRedisUtils.getGoodsInfoVo(goblinFrontSelectGoods.getSpuId());
-                    if (null==goblinGoodsInfoVo) {
+                    if (null==goblinGoodsInfoVo||StringUtil.isNotBlank(goblinGoodsInfoVo.getMarketId())) {
                         it.remove();
                     }
                 }