商家认证查询优化

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/RankAwardConfigService.java

@@ -14,7 +14,7 @@ public interface RankAwardConfigService {
 
     void delete(Long id, Long userId);
 
-    Pagination<RankAwardConfigDTO> queryPageList(QueryRankAwardConfigParam param, Integer pageNum,
-                                                 Integer pageSize);
+    Pagination<RankAwardConfigDTO> queryPageList(QueryRankAwardConfigParam param, Long pageNum,
+                                                 Long pageSize);
 
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -799,8 +799,25 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         if (ObjectUtils.isEmpty(merchants)) {
             return null;
         }
+        List<Integer> statuses = new ArrayList<>();
+        if (0 == param.getStatus()){
+            statuses.add(0);
+            statuses.add(1);
+            statuses.add(2);
+            statuses.add(3);
+            statuses.add(4);
+        }else if(1 == param.getStatus()){
+            statuses.add(0);
+            statuses.add(1);
+            statuses.add(2);
+            statuses.add(3);
+        }else if (2 == param.getStatus()){
+            statuses.add(4);
+        }else{
+            statuses.add(5);
+        }
         Page<OmsOrder> page = this.lambdaQuery()
-                .in(StringUtils.notEmpty(param.getStatus()), OmsOrder::getStatus, param.getStatuses())
+                .in(StringUtils.notEmpty(param.getStatus()), OmsOrder::getStatus, statuses)
                 .in(OmsOrder::getMerchantId, merchants)
                 .orderByDesc(OmsOrder::getCreateTime)
                 .page(DatabaseContextHolder.page(param.getPaging()));

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/RankAwardConfigServiceImpl.java

@@ -114,7 +114,7 @@ public class RankAwardConfigServiceImpl extends ServiceImpl<RankAwardConfigMappe
     }
 
     @Override
-    public Pagination<RankAwardConfigDTO> queryPageList(QueryRankAwardConfigParam param, Integer pageNum, Integer pageSize) {
+    public Pagination<RankAwardConfigDTO> queryPageList(QueryRankAwardConfigParam param, Long pageNum, Long pageSize) {
         Page<RankAwardConfigDTO> page = new Page<>(pageNum, pageSize);
         QueryWrapper<RankAwardConfig> wrapper = Wrappers.query();
         wrapper.eq(param.getType() != null, "type", param.getType());