1. 迁移交易订单的查询接口

2. 支付服务，重新初始化结构

common/common-framework/src/main/java/cn/iocoder/common/framework/util/CollectionUtils.java

@@ -34,6 +34,11 @@ public class CollectionUtils {
         return from.stream().collect(Collectors.toMap(keyFunc, valueFunc));
     }
 
+    public static <T, K> Map<K, List<T>> convertMultiMap(List<T> from, Function<T, K> keyFunc) {
+        return from.stream().collect(Collectors.groupingBy(keyFunc,
+                Collectors.mapping(t -> t, Collectors.toList())));
+    }
+
     public static <T, K, V> Map<K, List<V>> convertMultiMap(List<T> from, Function<T, K> keyFunc, Function<T, V> valueFunc) {
         return from.stream().collect(Collectors.groupingBy(keyFunc,
                 Collectors.mapping(valueFunc, Collectors.toList())));

common/common-framework/src/main/java/cn/iocoder/common/framework/vo/PageParam.java

@@ -39,8 +39,8 @@ public class PageParam implements Serializable {
         return this;
     }
 
-    public final int getOffset() {
-        return (pageNo - 1) * pageSize;
-    }
+//    public final int getOffset() {
+//        return (pageNo - 1) * pageSize;
+//    }
 
 }

common/common-framework/src/main/java/cn/iocoder/common/framework/vo/SortingField.java

@@ -9,6 +9,15 @@ import java.io.Serializable;
  */
 public class SortingField implements Serializable {
 
+    /**
+     * 顺序 - 升序
+     */
+    public static final String ORDER_ASC = "asc";
+    /**
+     * 顺序 - 降序
+     */
+    public static final String ORDER_DESC = "desc";
+
     /**
      * 字段
      */

common/mall-spring-boot-starter-mybatis/pom.xml

@@ -12,6 +12,12 @@
     <artifactId>mall-spring-boot-starter-mybatis</artifactId>
 
     <dependencies>
+        <!-- 通用相关 -->
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>common-framework</artifactId>
+        </dependency>
+
         <!-- DB 相关 -->
         <dependency>
             <groupId>org.mybatis</groupId>

common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/core/util/PageUtil.java

@@ -0,0 +1,35 @@
+package cn.iocoder.mall.mybatis.core.util;
+
+import cn.iocoder.common.framework.util.CollectionUtils;
+import cn.iocoder.common.framework.vo.PageParam;
+import cn.iocoder.common.framework.vo.SortingField;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * 分页工具里
+ *
+ * 目前主要用于 {@link Page} 的构建
+ */
+public class PageUtil {
+
+    public static <T> Page<T> build(PageParam pageParam) {
+        return build(pageParam, null);
+    }
+
+    public static <T> Page<T> build(PageParam pageParam, Collection<SortingField> sortingFields) {
+        // 页码 + 数量
+        Page<T> page = new Page<>(pageParam.getPageNo(), pageParam.getPageSize());
+        // 排序字段
+        if (!CollectionUtils.isEmpty(sortingFields)) {
+            page.addOrder(sortingFields.stream().map(sortingField -> SortingField.ORDER_ASC.equals(sortingField.getOrder()) ?
+                    OrderItem.asc(sortingField.getField()) : OrderItem.desc(sortingField.getField()))
+                    .collect(Collectors.toList()));
+        }
+        return page;
+    }
+
+}