Merge branch 'pre' into 'master'

ÅPre

See merge request !198

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

@@ -631,23 +631,23 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         Pageable pageable=null;
         //
         if(type.equals("1")){
-            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "count"));
+            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "count","createdAt"));
         }else if(type.equals("2")){
-             pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "shelvesAt"));
+             pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "shelvesAt","createdAt"));
         }else if(type.equals("3")){
             Document source = new Document();
             source.put("locale", "zh");
             source.put("numericOrdering", true);
             Collation collation = Collation.from(source);
             query.collation(collation);
-            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "priceGe"));
+            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "priceGe","createdAt"));
         }else if(type.equals("4")){
             Document source = new Document();
             source.put("locale", "zh");
             source.put("numericOrdering", true);
             Collation collation = Collation.from(source);
             query.collation(collation);
-            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.ASC, "priceGe"));
+            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.ASC, "priceGe","createdAt"));
         }
         // 排序 分页
        // Query query = Query.query(Criteria.where("status").ne(1).and("status").ne(0));

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/task/PlatformGoblinGoodsTaskController.java

@@ -40,7 +40,8 @@ public class PlatformGoblinGoodsTaskController {
         queryWrapper.eq(GoblinGoods::getSpuAppear, "0");
         queryWrapper.eq(GoblinGoods::getShelvesHandle, "3");
         queryWrapper.le(GoblinGoods::getShelvesTime, now);
-        queryWrapper.eq(GoblinGoods::getShelvesStatus, "0");
+//        queryWrapper.eq(GoblinGoods::getShelvesStatus, "0");
+        queryWrapper.in(GoblinGoods::getShelvesStatus, "0", "1");
         queryWrapper.orderByAsc(GoblinGoods::getShelvesTime);
         queryWrapper.select(GoblinGoods::getSpuId);