Kaynağa Gözat

feat(mall): 添加分类排序功能

- 在 EpCategoryMain 和 EpHeaderCategory 实体中新增 sortOrder 字段
- 在对应的 Bo 和 Vo 类中添加排序字段定义
- 修改查询逻辑,将排序方式从按 ID 排序改为按 sortOrder 排序
- 更新 VO 类中的导入语句顺序优化
- 完善相关注释文档说明排序规则
hurx 1 hafta önce
ebeveyn
işleme
245b6109ea

+ 5 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/EpCategoryMain.java

@@ -73,5 +73,10 @@ public class EpCategoryMain extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 排序,值越小越靠前
+     */
+    private Long sortOrder;
+
 
 }

+ 8 - 3
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/EpHeaderCategory.java

@@ -28,17 +28,17 @@ public class EpHeaderCategory extends TenantEntity {
     private Long id;
 
     /**
-     * 分类名称 
+     * 分类名称
      */
     private String title;
 
     /**
-     * 分类图标URL 
+     * 分类图标URL
      */
     private String icon;
 
     /**
-     * 跳转地址 
+     * 跳转地址
      */
     private String link;
 
@@ -63,5 +63,10 @@ public class EpHeaderCategory extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 排序,值越小越靠前
+     */
+    private Long sortOrder;
+
 
 }

+ 5 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/EpCategoryMainBo.java

@@ -68,6 +68,11 @@ public class EpCategoryMainBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 排序,值越小越靠前
+     */
+    private Long sortOrder;
+
     /**
      * 分类项列表
      */

+ 8 - 3
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/EpHeaderCategoryBo.java

@@ -26,18 +26,18 @@ public class EpHeaderCategoryBo extends BaseEntity {
     private Long id;
 
     /**
-     * 分类名称 
+     * 分类名称
      */
     private String title;
 
     /**
-     * 分类图标URL 
+     * 分类图标URL
      */
     //@NotBlank(message = "分类图标URL 不能为空", groups = { AddGroup.class, EditGroup.class })
     private String icon;
 
     /**
-     * 跳转地址 
+     * 跳转地址
      */
     //@NotBlank(message = "跳转地址 不能为空", groups = { AddGroup.class, EditGroup.class })
     private String link;
@@ -57,5 +57,10 @@ public class EpHeaderCategoryBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 排序,值越小越靠前
+     */
+    private Long sortOrder;
+
 
 }

+ 6 - 5
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/EpCategoryMainVo.java

@@ -1,17 +1,13 @@
 package org.dromara.mall.domain.vo;
 
-import org.dromara.mall.domain.EpCategoryMain;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.mall.domain.EpCategoryMain;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 
@@ -83,6 +79,11 @@ public class EpCategoryMainVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 排序,值越小越靠前
+     */
+    private Long sortOrder;
+
     /**
      * 左侧分类标签项
      */

+ 5 - 6
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/EpHeaderCategoryVo.java

@@ -1,17 +1,13 @@
 package org.dromara.mall.domain.vo;
 
-import org.dromara.mall.domain.EpHeaderCategory;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.mall.domain.EpHeaderCategory;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
@@ -73,5 +69,8 @@ public class EpHeaderCategoryVo implements Serializable {
     /*头部主题色*/
     private String headerThemeColor;
 
-
+    /**
+     * 排序,值越小越靠前
+     */
+    private Long sortOrder;
 }

+ 1 - 1
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/EpCategoryMainServiceImpl.java

@@ -156,7 +156,7 @@ public class EpCategoryMainServiceImpl extends ServiceImpl<EpCategoryMainMapper,
     private LambdaQueryWrapper<EpCategoryMain> buildQueryWrapper(EpCategoryMainBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<EpCategoryMain> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(EpCategoryMain::getId);
+        lqw.orderByAsc(EpCategoryMain::getSortOrder);
         lqw.like(StringUtils.isNotBlank(bo.getName()), EpCategoryMain::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getIcon()), EpCategoryMain::getIcon, bo.getIcon());
         lqw.eq(bo.getSyncCategoryId() != null, EpCategoryMain::getSyncCategoryId, bo.getSyncCategoryId());

+ 1 - 1
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/EpHeaderCategoryServiceImpl.java

@@ -85,7 +85,7 @@ public class EpHeaderCategoryServiceImpl extends ServiceImpl<EpHeaderCategoryMap
     private LambdaQueryWrapper<EpHeaderCategory> buildQueryWrapper(EpHeaderCategoryBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<EpHeaderCategory> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(EpHeaderCategory::getId);
+        lqw.orderByAsc(EpHeaderCategory::getSortOrder);
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), EpHeaderCategory::getTitle, bo.getTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getIcon()), EpHeaderCategory::getIcon, bo.getIcon());
         lqw.eq(StringUtils.isNotBlank(bo.getLink()), EpHeaderCategory::getLink, bo.getLink());