修改精选商品，修改bug

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -77,6 +77,7 @@ public class GoblinRedisConst {
     public  static final String FRONT_SECKILL = PREFIX.concat("front_seckill");  //前端 秒杀列表
     public  static final String SELECT_GOODS = PREFIX.concat("select_goods");  //配置的精选商品
     public  static final String SELECT_GOODS_PAGE1 = PREFIX.concat("select_goods_page1");  //精选商品 第一页
+    public  static final String SELECT_GOODS_SORT = PREFIX.concat("select_goods_sort");  //精选商品 第一页
     public  static final String SELECT_GOODS_SPUIDS = PREFIX.concat("select_goods_SPUIDS");  //精选商品 spuids
     public  static final String MOUDLE_INDEX = PREFIX.concat("moudle_index");  //moudle_index 组件排序
     public  static final String COMPLIATIONS = PREFIX.concat("goblinFrontCompilations");  // 合集

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontSelectGoodsServiceImpl.java

@@ -159,10 +159,13 @@ public class GoblinFrontSelectGoodsServiceImpl extends ServiceImpl<GoblinFrontSe
         //删除  mogndob
         Query query = Query.query(Criteria.where("delTag").is("0"));
         mongoTemplate.findAllAndRemove(query, GoblinFrontSelectGoods.class);
+        int sortType=0;
         if(list.size()>0){
             for(GoblinFrontSelectGoods goblinFrontSelectGoods:list){
+                sortType=goblinFrontSelectGoods.getOrderType();
                 mongoTemplate.save(goblinFrontSelectGoods,GoblinFrontSelectGoods.class.getSimpleName());
             }
+            redisGoblinUtil.set(GoblinRedisConst.SELECT_GOODS_SORT,sortType);
             redisGoblinUtil.set(GoblinRedisConst.SELECT_GOODS,list);
             redisGoblinUtil.del(GoblinRedisConst.SELECT_GOODS_SPUIDS);
             redisGoblinUtil.del(GoblinRedisConst.SELECT_GOODS_PAGE1);

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

@@ -57,7 +57,10 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             if(null!=goblinFrontBanner.getEndTime()){
                 if( nowTime.isAfter(goblinFrontBanner.getEndTime())){
                 }else{
-                    goblinFrontBannerArrayList.add(goblinFrontBanner);
+                    if(nowTime.isBefore(goblinFrontBanner.getStartTime())){
+                    }else{
+                        goblinFrontBannerArrayList.add(goblinFrontBanner);
+                    }
                 }
             }
         }
@@ -534,8 +537,12 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             query.addCriteria(Criteria.where("spuId").nin(spuids.split(",")));
         }
         query.addCriteria(Criteria.where("delFlg").is("0").and("shelvesStatus").is("3"));
+
         //redis里面获取排序规则 1、上架时间2、销量3、价格高到低4、价格低到高
         int sortType=0;
+        if(redisUtil.hasKey(GoblinRedisConst.SELECT_GOODS_SORT)){
+            sortType  = (int) redisUtil.get(GoblinRedisConst.SELECT_GOODS_SORT);
+        }
         Sort sortName=null;
         if(sortType==1){
             sortName = Sort.by(Sort.Direction.DESC, "shelvesAt");