feat(shop): 经销商相关实体和接口添加排序号字段并调整默认排序方式
- 在 ShopDealerUser 实体中添加 sortNumber 字段用于排序 - 更新 ShopDealerUserMapper.xml,添加 sortNumber 的查询条件 - 在 ShopDealerUserParam 参数类中添加 sortNumber 字段 - 修改多个服务实现类的默认排序方式,从 "sort_number asc, create_time desc" 改为 "create_time desc"
This commit is contained in:
@@ -62,6 +62,9 @@ public class ShopDealerUser implements Serializable {
|
|||||||
@Schema(description = "专属二维码")
|
@Schema(description = "专属二维码")
|
||||||
private String qrcode;
|
private String qrcode;
|
||||||
|
|
||||||
|
@Schema(description = "排序号")
|
||||||
|
private Integer sortNumber;
|
||||||
|
|
||||||
@Schema(description = "是否删除")
|
@Schema(description = "是否删除")
|
||||||
private Integer isDelete;
|
private Integer isDelete;
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,9 @@
|
|||||||
<if test="param.createTimeEnd != null">
|
<if test="param.createTimeEnd != null">
|
||||||
AND a.create_time <= #{param.createTimeEnd}
|
AND a.create_time <= #{param.createTimeEnd}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="param.sortNumber != null">
|
||||||
|
AND a.sort_number = #{param.sortNumber}
|
||||||
|
</if>
|
||||||
<if test="param.keywords != null">
|
<if test="param.keywords != null">
|
||||||
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
|
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -70,6 +70,10 @@ public class ShopDealerUserParam extends BaseParam {
|
|||||||
@Schema(description = "专属二维码")
|
@Schema(description = "专属二维码")
|
||||||
private String qrcode;
|
private String qrcode;
|
||||||
|
|
||||||
|
@Schema(description = "排序号")
|
||||||
|
@QueryField(type = QueryType.EQ)
|
||||||
|
private Integer sortNumber;
|
||||||
|
|
||||||
@Schema(description = "是否删除")
|
@Schema(description = "是否删除")
|
||||||
@QueryField(type = QueryType.EQ)
|
@QueryField(type = QueryType.EQ)
|
||||||
private Integer isDelete;
|
private Integer isDelete;
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class ShopDealerApplyServiceImpl extends ServiceImpl<ShopDealerApplyMappe
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<ShopDealerApply> pageRel(ShopDealerApplyParam param) {
|
public PageResult<ShopDealerApply> pageRel(ShopDealerApplyParam param) {
|
||||||
PageParam<ShopDealerApply, ShopDealerApplyParam> page = new PageParam<>(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);
|
List<ShopDealerApply> list = baseMapper.selectPageRel(page, param);
|
||||||
return new PageResult<>(list, page.getTotal());
|
return new PageResult<>(list, page.getTotal());
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ public class ShopDealerApplyServiceImpl extends ServiceImpl<ShopDealerApplyMappe
|
|||||||
List<ShopDealerApply> list = baseMapper.selectListRel(param);
|
List<ShopDealerApply> list = baseMapper.selectListRel(param);
|
||||||
// 排序
|
// 排序
|
||||||
PageParam<ShopDealerApply, ShopDealerApplyParam> page = new PageParam<>();
|
PageParam<ShopDealerApply, ShopDealerApplyParam> page = new PageParam<>();
|
||||||
page.setDefaultOrder("sort_number asc, create_time desc");
|
page.setDefaultOrder("create_time desc");
|
||||||
return page.sortRecords(list);
|
return page.sortRecords(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class ShopDealerCapitalServiceImpl extends ServiceImpl<ShopDealerCapitalM
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<ShopDealerCapital> pageRel(ShopDealerCapitalParam param) {
|
public PageResult<ShopDealerCapital> pageRel(ShopDealerCapitalParam param) {
|
||||||
PageParam<ShopDealerCapital, ShopDealerCapitalParam> page = new PageParam<>(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);
|
List<ShopDealerCapital> list = baseMapper.selectPageRel(page, param);
|
||||||
return new PageResult<>(list, page.getTotal());
|
return new PageResult<>(list, page.getTotal());
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ public class ShopDealerCapitalServiceImpl extends ServiceImpl<ShopDealerCapitalM
|
|||||||
List<ShopDealerCapital> list = baseMapper.selectListRel(param);
|
List<ShopDealerCapital> list = baseMapper.selectListRel(param);
|
||||||
// 排序
|
// 排序
|
||||||
PageParam<ShopDealerCapital, ShopDealerCapitalParam> page = new PageParam<>();
|
PageParam<ShopDealerCapital, ShopDealerCapitalParam> page = new PageParam<>();
|
||||||
page.setDefaultOrder("sort_number asc, create_time desc");
|
page.setDefaultOrder("create_time desc");
|
||||||
return page.sortRecords(list);
|
return page.sortRecords(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class ShopDealerOrderServiceImpl extends ServiceImpl<ShopDealerOrderMappe
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<ShopDealerOrder> pageRel(ShopDealerOrderParam param) {
|
public PageResult<ShopDealerOrder> pageRel(ShopDealerOrderParam param) {
|
||||||
PageParam<ShopDealerOrder, ShopDealerOrderParam> page = new PageParam<>(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);
|
List<ShopDealerOrder> list = baseMapper.selectPageRel(page, param);
|
||||||
return new PageResult<>(list, page.getTotal());
|
return new PageResult<>(list, page.getTotal());
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ public class ShopDealerOrderServiceImpl extends ServiceImpl<ShopDealerOrderMappe
|
|||||||
List<ShopDealerOrder> list = baseMapper.selectListRel(param);
|
List<ShopDealerOrder> list = baseMapper.selectListRel(param);
|
||||||
// 排序
|
// 排序
|
||||||
PageParam<ShopDealerOrder, ShopDealerOrderParam> page = new PageParam<>();
|
PageParam<ShopDealerOrder, ShopDealerOrderParam> page = new PageParam<>();
|
||||||
page.setDefaultOrder("sort_number asc, create_time desc");
|
page.setDefaultOrder("create_time desc");
|
||||||
return page.sortRecords(list);
|
return page.sortRecords(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl<ShopDealerRefereeM
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<ShopDealerReferee> pageRel(ShopDealerRefereeParam param) {
|
public PageResult<ShopDealerReferee> pageRel(ShopDealerRefereeParam param) {
|
||||||
PageParam<ShopDealerReferee, ShopDealerRefereeParam> page = new PageParam<>(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);
|
List<ShopDealerReferee> list = baseMapper.selectPageRel(page, param);
|
||||||
return new PageResult<>(list, page.getTotal());
|
return new PageResult<>(list, page.getTotal());
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl<ShopDealerRefereeM
|
|||||||
List<ShopDealerReferee> list = baseMapper.selectListRel(param);
|
List<ShopDealerReferee> list = baseMapper.selectListRel(param);
|
||||||
// 排序
|
// 排序
|
||||||
PageParam<ShopDealerReferee, ShopDealerRefereeParam> page = new PageParam<>();
|
PageParam<ShopDealerReferee, ShopDealerRefereeParam> page = new PageParam<>();
|
||||||
page.setDefaultOrder("sort_number asc, create_time desc");
|
page.setDefaultOrder("create_time desc");
|
||||||
return page.sortRecords(list);
|
return page.sortRecords(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class ShopDealerSettingServiceImpl extends ServiceImpl<ShopDealerSettingM
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<ShopDealerSetting> pageRel(ShopDealerSettingParam param) {
|
public PageResult<ShopDealerSetting> pageRel(ShopDealerSettingParam param) {
|
||||||
PageParam<ShopDealerSetting, ShopDealerSettingParam> page = new PageParam<>(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);
|
List<ShopDealerSetting> list = baseMapper.selectPageRel(page, param);
|
||||||
return new PageResult<>(list, page.getTotal());
|
return new PageResult<>(list, page.getTotal());
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ public class ShopDealerSettingServiceImpl extends ServiceImpl<ShopDealerSettingM
|
|||||||
List<ShopDealerSetting> list = baseMapper.selectListRel(param);
|
List<ShopDealerSetting> list = baseMapper.selectListRel(param);
|
||||||
// 排序
|
// 排序
|
||||||
PageParam<ShopDealerSetting, ShopDealerSettingParam> page = new PageParam<>();
|
PageParam<ShopDealerSetting, ShopDealerSettingParam> page = new PageParam<>();
|
||||||
page.setDefaultOrder("sort_number asc, create_time desc");
|
page.setDefaultOrder("create_time desc");
|
||||||
return page.sortRecords(list);
|
return page.sortRecords(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class ShopDealerWithdrawServiceImpl extends ServiceImpl<ShopDealerWithdra
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<ShopDealerWithdraw> pageRel(ShopDealerWithdrawParam param) {
|
public PageResult<ShopDealerWithdraw> pageRel(ShopDealerWithdrawParam param) {
|
||||||
PageParam<ShopDealerWithdraw, ShopDealerWithdrawParam> page = new PageParam<>(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);
|
List<ShopDealerWithdraw> list = baseMapper.selectPageRel(page, param);
|
||||||
return new PageResult<>(list, page.getTotal());
|
return new PageResult<>(list, page.getTotal());
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ public class ShopDealerWithdrawServiceImpl extends ServiceImpl<ShopDealerWithdra
|
|||||||
List<ShopDealerWithdraw> list = baseMapper.selectListRel(param);
|
List<ShopDealerWithdraw> list = baseMapper.selectListRel(param);
|
||||||
// 排序
|
// 排序
|
||||||
PageParam<ShopDealerWithdraw, ShopDealerWithdrawParam> page = new PageParam<>();
|
PageParam<ShopDealerWithdraw, ShopDealerWithdrawParam> page = new PageParam<>();
|
||||||
page.setDefaultOrder("sort_number asc, create_time desc");
|
page.setDefaultOrder("create_time desc");
|
||||||
return page.sortRecords(list);
|
return page.sortRecords(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user