修改bug

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

@@ -401,6 +401,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             Pattern pattern = Pattern.compile("^.*"+name+".*$", Pattern.CASE_INSENSITIVE);
             query.addCriteria(Criteria.where("name").regex(pattern));
         }
+        query.with(Sort.by(Sort.Direction.DESC, "count"));
         // 查询总数
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
         if(list.size()>0){
@@ -436,7 +437,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         //
         boolean isRe=false;
         if(type.equals("1")){
-            isRe=true;
+            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "count"));
         }else if(type.equals("2")){
             pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "shelvesAt"));
         }else if(type.equals("3")){
@@ -449,11 +450,9 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
 
         // 查询总数
         long count = mongoTemplate.count(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
-        if(!isRe){
-            query.with(pageable);
-        }
+        query.with(pageable);
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
-        if(list.size()>0&&isRe){
+        /*if(list.size()>0&&isRe){
             //找到 销量
             for(GoblinGoodsInfoVo goblinGoodsInfoVo:list){
                 Integer counts=goblinRedisUtils.getSpuSaleCount(goblinGoodsInfoVo.getSpuId());
@@ -467,7 +466,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 public int compare(GoblinGoodsInfoVo arg0, GoblinGoodsInfoVo arg1) {
                     return -(arg0.getCount().compareTo(arg1.getCount()));
                 }});
-        }
+        }*/
         GoblinFrontCategoryListVo goblinFrontCategoryListVo=GoblinFrontCategoryListVo.getNew();
         goblinFrontCategoryListVo.setCount(count);
         goblinFrontCategoryListVo.setSpuList(list);
@@ -487,9 +486,8 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         ));
         Pageable pageable=null;
         //
-        boolean isRe=false;
         if(type.equals("1")){
-            isRe=true;
+            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "count"));
         }else if(type.equals("2")){
              pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "shelvesAt"));
         }else if(type.equals("3")){
@@ -502,11 +500,9 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
 
         // 查询总数
         long count = mongoTemplate.count(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
-        if(!isRe){
-            query.with(pageable);
-        }
+        query.with(pageable);
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
-        if(list.size()>0&&isRe){
+       /* if(list.size()>0&&isRe){
             //找到 销量
             for(GoblinGoodsInfoVo goblinGoodsInfoVo:list){
                 Integer counts=goblinRedisUtils.getSpuSaleCount(goblinGoodsInfoVo.getSpuId());
@@ -520,7 +516,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 public int compare(GoblinGoodsInfoVo arg0, GoblinGoodsInfoVo arg1) {
                     return -(arg0.getCount().compareTo(arg1.getCount()));
                 }});
-        }
+        }*/
         GoblinFrontCategoryListVo goblinFrontCategoryListVo=GoblinFrontCategoryListVo.getNew();
         goblinFrontCategoryListVo.setCount(count);
         goblinFrontCategoryListVo.setSpuList(list);