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 @@
AND a.create_time <= #{param.createTimeEnd}
+
+ AND a.sort_number = #{param.sortNumber}
+
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 pageRel(ShopDealerApplyParam param) {
PageParam page = new PageParam<>(param);
- page.setDefaultOrder("sort_number asc, create_time desc");
+ page.setDefaultOrder("create_time desc");
List list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -33,7 +33,7 @@ public class ShopDealerApplyServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param);
// 排序
PageParam 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 pageRel(ShopDealerCapitalParam param) {
PageParam page = new PageParam<>(param);
- page.setDefaultOrder("sort_number asc, create_time desc");
+ page.setDefaultOrder("create_time desc");
List list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -33,7 +33,7 @@ public class ShopDealerCapitalServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param);
// 排序
PageParam 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 pageRel(ShopDealerOrderParam param) {
PageParam page = new PageParam<>(param);
- page.setDefaultOrder("sort_number asc, create_time desc");
+ page.setDefaultOrder("create_time desc");
List list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -33,7 +33,7 @@ public class ShopDealerOrderServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param);
// 排序
PageParam 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 pageRel(ShopDealerRefereeParam param) {
PageParam page = new PageParam<>(param);
- page.setDefaultOrder("sort_number asc, create_time desc");
+ page.setDefaultOrder("create_time desc");
List list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -33,7 +33,7 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param);
// 排序
PageParam 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 pageRel(ShopDealerSettingParam param) {
PageParam page = new PageParam<>(param);
- page.setDefaultOrder("sort_number asc, create_time desc");
+ page.setDefaultOrder("create_time desc");
List list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -33,7 +33,7 @@ public class ShopDealerSettingServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param);
// 排序
PageParam 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 pageRel(ShopDealerWithdrawParam param) {
PageParam page = new PageParam<>(param);
- page.setDefaultOrder("sort_number asc, create_time desc");
+ page.setDefaultOrder("create_time desc");
List list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -33,7 +33,7 @@ public class ShopDealerWithdrawServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param);
// 排序
PageParam page = new PageParam<>();
- page.setDefaultOrder("sort_number asc, create_time desc");
+ page.setDefaultOrder("create_time desc");
return page.sortRecords(list);
}