Merge branch 'jxl_goods_list' into container-test

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

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

@@ -64,6 +64,11 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     GoblinCouponService goblinCouponService;
     @Autowired
     private GoblinSqbPerformanceGoodsMapper goblinSqbPerformanceGoodsMapper;
+    private static final String SELECT_GOODS_EXCLUDE_NAME = "护照专属";
+
+    private boolean isPassportExclusive(GoblinGoodsInfoVo vo) {
+        return null != vo && StringUtil.isNotBlank(vo.getName()) && vo.getName().contains(SELECT_GOODS_EXCLUDE_NAME);
+    }
 
     @Override
     public ArrayList<GoblinFrontBannerVo> getListBanner() {
@@ -806,7 +811,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").and("marketId").is(null).and("cateFid").nin("22196120924543", "22196122839313"));
+        query.addCriteria(Criteria.where("delFlg").is("0").and("shelvesStatus").is("3").and("spuAppear").is("0").and("marketId").is(null).and("cateFid").nin("22196120924543", "22196122839313").and("name").not().regex(Pattern.compile(SELECT_GOODS_EXCLUDE_NAME)));
 
 
         //redis里面获取排序规则 1、上架时间2、销量3、价格高到低4、价格低到高
@@ -924,7 +929,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                     it.remove();
                 } else {
                     GoblinGoodsInfoVo goblinGoodsInfoVo = goblinRedisUtils.getGoodsInfoVo(goblinFrontSelectGoods.getSpuId());
-                    if (null == goblinGoodsInfoVo || StringUtil.isNotBlank(goblinGoodsInfoVo.getMarketId())) {
+                    if (null == goblinGoodsInfoVo || StringUtil.isNotBlank(goblinGoodsInfoVo.getMarketId()) || isPassportExclusive(goblinGoodsInfoVo)) {
                         it.remove();
                     }
                 }
@@ -966,6 +971,9 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                         if (isHidden(goblinGoodsInfoVo.getCateFid())) {
                             continue;
                         }
+                        if (isPassportExclusive(goblinGoodsInfoVo)) {
+                            continue;
+                        }
                         goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);
                     }
                 }
@@ -1018,9 +1026,15 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             for (int i = 0; i < end; i++) {
                 if (i >= start) {
                     GoblinGoodsInfoVo goblinGoodsInfoVo = goblinRedisUtils.getGoodsInfoVo(spuidss[i]);
+                    if (null == goblinGoodsInfoVo) {
+                        continue;
+                    }
                     if (isHidden(goblinGoodsInfoVo.getCateFid())) {
                         continue;
                     }
+                    if (isPassportExclusive(goblinGoodsInfoVo)) {
+                        continue;
+                    }
                     goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);
                 }
             }