Merge branch 'dev_coupon' into pre

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

@@ -853,14 +853,25 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 }
             }
         }else{
-            //查看是否有 配置的 spuid的顺序
+        /*    //查看是否有 配置的 spuid的顺序
             String selectGoodsSpuids= getRedisKey(GoblinRedisConst.SELECT_GOODS_PAGE1);
             if(StringUtil.isBlank(selectGoodsSpuids)){
                 List<GoblinFrontSelectGoods> list= (List<GoblinFrontSelectGoods>) redisUtil.get(GoblinRedisConst.SELECT_GOODS);
                 setPage1AndSpu(list,pageSize);
                 this.getSelectGoods(page,pageSize);
             }
-            String[] spuidss=selectGoodsSpuids.split(",");
+            String[] spuidss=selectGoodsSpuids.split(",");*/
+
+            //查看是否有 配置的 spuid的顺序
+            /*  String selectGoodsSpuids= getRedisKey(GoblinRedisConst.SELECT_GOODS_PAGE1);*/
+            if(!redisUtil.hasKey(GoblinRedisConst.SELECT_GOODS_SPUIDS)){
+                List<GoblinFrontSelectGoods> list= (List<GoblinFrontSelectGoods>) redisUtil.get(GoblinRedisConst.SELECT_GOODS);
+                setPage1AndSpu(list,pageSize);
+                this.getSelectGoods(page,pageSize);
+            }
+            String[] spuidss=redisUtil.get(GoblinRedisConst.SELECT_GOODS_SPUIDS).toString().split(",");
+            //String[] spuidss=selectGoodsSpuids.split(",");
+
             //找到对应的spuid
             int start =page*pageSize;
             int end=(page+1)*pageSize;