diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/enums/ArticleCategoryType.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/enums/ArticleCategoryType.java new file mode 100644 index 0000000..f8e3beb --- /dev/null +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/enums/ArticleCategoryType.java @@ -0,0 +1,13 @@ +package com.ruoyi.bst.articleCategory.domain.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ArticleCategoryType { + OTHERS("1", "其他"), + STOREHELP("2", "商户帮助中心"); + + private final String code; + private final String name; +} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml index 1d5b710..3b7af41 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml @@ -172,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bst_article_category + update bst_article_category bac @@ -183,17 +183,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bst_article_category set category_status = #{categoryStatus}, - sort = #{sort} + sort = #{sort}, + type = #{type} where id = #{id} - category_name = #{data.categoryName}, - parent_id = #{data.parentId}, - category_status = #{data.categoryStatus}, - sort = #{data.sort}, - create_time = #{data.createTime}, - type = #{data.type}, + bac.category_name = #{data.categoryName}, + bac.parent_id = #{data.parentId}, + bac.category_status = #{data.categoryStatus}, + bac.sort = #{data.sort}, + bac.create_time = #{data.createTime}, + bac.type = #{data.type}, diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java index e030951..aa71f2d 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java @@ -113,7 +113,7 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService public int updateArticleCategory(ArticleCategory articleCategory) { ArticleCategoryVO vo = articleCategoryMapper.selectArticleCategoryById(articleCategory.getId()); - //检查是否仅修改排序或状态字段 + //检查是否需要分类校验 if (vo != null && vo.getParentId().equals(articleCategory.getParentId())&&vo.getCategoryName().equals(articleCategory.getCategoryName())) { // 新增状态变更方向判断 boolean isEnabling = vo.getCategoryStatus().equals(ArticleCategoryStatus.DISABLED.getCode()) diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java index 0ae2340..5065ff9 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java @@ -6,6 +6,7 @@ import com.ruoyi.bst.article.service.ArticleService; import com.ruoyi.bst.articleCategory.domain.ArticleCategoryQuery; import com.ruoyi.bst.articleCategory.domain.ArticleCategoryVO; import com.ruoyi.bst.articleCategory.domain.enums.ArticleCategoryStatus; +import com.ruoyi.bst.articleCategory.domain.enums.ArticleCategoryType; import com.ruoyi.bst.articleCategory.service.ArticleCategoryService; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.controller.BaseController; @@ -14,6 +15,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -48,6 +50,17 @@ public class AppAtricleCategoryController extends BaseController { return getDataTable(articleCategoryService.selectArticleCategoryList(articleCategoryQuery)); } + @ApiOperation("查询分类为商户帮助中心的分类信息") + @GetMapping("/storeHelp/list") + @Anonymous + public TableDataInfo getStoreHelpArticle(ArticleCategoryQuery articleCategoryQuery) { + startPage(); + //查询分类的文章 + articleCategoryQuery.setCategoryStatus(ArticleCategoryStatus.ENABLED.getCode()); + articleCategoryQuery.setType(ArticleCategoryType.STOREHELP.getCode()); + return getDataTable(articleCategoryService.selectArticleCategoryList(articleCategoryQuery)); + } + @ApiOperation("查询分类下的文章") @GetMapping("/article") @Anonymous