From b09141e8480a6908af99957373abc4d7d7b3589f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 14 Aug 2025 19:32:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E7=BB=8F=E9=94=80=E5=95=86?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E5=92=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8F=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ShopDealerUser 实体中添加 sortNumber 字段用于排序
- 更新 ShopDealerUserMapper.xml，添加 sortNumber 的查询条件
- 在 ShopDealerUserParam 参数类中添加 sortNumber 字段
- 修改多个服务实现类的默认排序方式，从 "sort_number asc, create_time desc" 改为 "create_time desc"
---
 src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java   | 3 +++
 .../com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml    | 3 +++
 .../java/com/gxwebsoft/shop/param/ShopDealerUserParam.java    | 4 ++++
 .../shop/service/impl/ShopDealerApplyServiceImpl.java         | 4 ++--
 .../shop/service/impl/ShopDealerCapitalServiceImpl.java       | 4 ++--
 .../shop/service/impl/ShopDealerOrderServiceImpl.java         | 4 ++--
 .../shop/service/impl/ShopDealerRefereeServiceImpl.java       | 4 ++--
 .../shop/service/impl/ShopDealerSettingServiceImpl.java       | 4 ++--
 .../shop/service/impl/ShopDealerWithdrawServiceImpl.java      | 4 ++--
 9 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java
index cbf735c..ce20596 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java
@@ -62,6 +62,9 @@ public class ShopDealerUser implements Serializable {
     @Schema(description = "专属二维码")
     private String qrcode;
 
+    @Schema(description = "排序号")
+    private Integer sortNumber;
+
     @Schema(description = "是否删除")
     private Integer isDelete;
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml
index c03fabb..75a53d8 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml
@@ -55,6 +55,9 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.sortNumber != null">
+              AND a.sort_number = #{param.sortNumber}
+            </if>
             <if test="param.keywords != null">
                 AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
                 )
diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java
index 07f4013..abd3d4b 100644
--- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerUserParam.java
@@ -70,6 +70,10 @@ public class ShopDealerUserParam extends BaseParam {
     @Schema(description = "专属二维码")
     private String qrcode;
 
+    @Schema(description = "排序号")
+    @QueryField(type = QueryType.EQ)
+    private Integer sortNumber;
+
     @Schema(description = "是否删除")
     @QueryField(type = QueryType.EQ)
     private Integer isDelete;
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java
index fa2254c..26cb8d1 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerApplyServiceImpl.java
@@ -23,7 +23,7 @@ public class ShopDealerApplyServiceImpl extends ServiceImpl<ShopDealerApplyMappe
     @Override
     public PageResult<ShopDealerApply> pageRel(ShopDealerApplyParam param) {
         PageParam<ShopDealerApply, ShopDealerApplyParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         List<ShopDealerApply> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class ShopDealerApplyServiceImpl extends ServiceImpl<ShopDealerApplyMappe
         List<ShopDealerApply> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ShopDealerApply, ShopDealerApplyParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java
index 242963c..897fbed 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCapitalServiceImpl.java
@@ -23,7 +23,7 @@ public class ShopDealerCapitalServiceImpl extends ServiceImpl<ShopDealerCapitalM
     @Override
     public PageResult<ShopDealerCapital> pageRel(ShopDealerCapitalParam param) {
         PageParam<ShopDealerCapital, ShopDealerCapitalParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         List<ShopDealerCapital> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class ShopDealerCapitalServiceImpl extends ServiceImpl<ShopDealerCapitalM
         List<ShopDealerCapital> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ShopDealerCapital, ShopDealerCapitalParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java
index 6d52474..0bab68f 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerOrderServiceImpl.java
@@ -23,7 +23,7 @@ public class ShopDealerOrderServiceImpl extends ServiceImpl<ShopDealerOrderMappe
     @Override
     public PageResult<ShopDealerOrder> pageRel(ShopDealerOrderParam param) {
         PageParam<ShopDealerOrder, ShopDealerOrderParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         List<ShopDealerOrder> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class ShopDealerOrderServiceImpl extends ServiceImpl<ShopDealerOrderMappe
         List<ShopDealerOrder> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ShopDealerOrder, ShopDealerOrderParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java
index a72fa6f..287d9a7 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java
@@ -23,7 +23,7 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl<ShopDealerRefereeM
     @Override
     public PageResult<ShopDealerReferee> pageRel(ShopDealerRefereeParam param) {
         PageParam<ShopDealerReferee, ShopDealerRefereeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         List<ShopDealerReferee> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl<ShopDealerRefereeM
         List<ShopDealerReferee> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ShopDealerReferee, ShopDealerRefereeParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java
index 4718052..336fd7a 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java
@@ -23,7 +23,7 @@ public class ShopDealerSettingServiceImpl extends ServiceImpl<ShopDealerSettingM
     @Override
     public PageResult<ShopDealerSetting> pageRel(ShopDealerSettingParam param) {
         PageParam<ShopDealerSetting, ShopDealerSettingParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         List<ShopDealerSetting> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class ShopDealerSettingServiceImpl extends ServiceImpl<ShopDealerSettingM
         List<ShopDealerSetting> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ShopDealerSetting, ShopDealerSettingParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerWithdrawServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerWithdrawServiceImpl.java
index f8387ab..9748034 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerWithdrawServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerWithdrawServiceImpl.java
@@ -23,7 +23,7 @@ public class ShopDealerWithdrawServiceImpl extends ServiceImpl<ShopDealerWithdra
     @Override
     public PageResult<ShopDealerWithdraw> pageRel(ShopDealerWithdrawParam param) {
         PageParam<ShopDealerWithdraw, ShopDealerWithdrawParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         List<ShopDealerWithdraw> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class ShopDealerWithdrawServiceImpl extends ServiceImpl<ShopDealerWithdra
         List<ShopDealerWithdraw> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ShopDealerWithdraw, ShopDealerWithdrawParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }