Merge remote-tracking branch 'origin/pre' into pre

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

@@ -463,8 +463,8 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
        // 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").and("marketId").is(null));
         query.with(Sort.by(
-                Sort.Order.desc("count"),
-                Sort.Order.desc("createdAt")
+                //Sort.Order.desc("count"),
+                Sort.Order.desc("shelvesAt")
         ));
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
         ArrayList<GoblinGoodsInfoListVo> list1=ObjectUtil.getGoblinGoodsInfoListVo();
@@ -689,7 +689,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         if(sortType==1){
             sortName = Sort.by(Sort.Direction.DESC, "shelvesAt");
         }else  if(sortType==2){
-            sortName = Sort.by(Sort.Direction.DESC, "count");
+            sortName = Sort.by(Sort.Direction.DESC, "count","createdAt");
         }else  if(sortType==3){
             Document source = new Document();
             source.put("locale", "zh");

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

 package com.liquidnet.service.platform.service.impl.goblin;
 
+import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.platform.utils.GoblinRedisUtils;
 import com.liquidnet.service.platform.utils.QueueUtils;
@@ -59,6 +60,9 @@ public class SpuGoodsInfoImpl {
                     obj);
         }
         log.info("执行完毕");
+        goblinRedisUtils.del(GoblinRedisConst.SELECT_GOODS_SPUIDS);
+        goblinRedisUtils.del(GoblinRedisConst.SELECT_GOODS_PAGE1);
+        goblinRedisUtils.del(GoblinRedisConst.SELECT_GOODS_SPUIDS_ISHAVE);
         return true;
     }
 }