From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 17:50:05 +0800
Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑，使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义，确保数据展示正确 - 更新 buyVipList.html 中状态颜色，以更直观地显示不同状态
---
src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java
index f02d03d..e781201 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsCategoryMapper.java
@@ -1,6 +1,11 @@
package cc.mrbird.febs.mall.mapper;
import cc.mrbird.febs.mall.entity.MallGoodsCategory;
+import cc.mrbird.febs.mall.entity.MallStore;
+import cc.mrbird.febs.mall.entity.MallStoreItem;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryVo;
+import cc.mrbird.febs.mall.vo.MallGoodsCategoryVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,9 +15,29 @@
public interface MallGoodsCategoryMapper extends BaseMapper<MallGoodsCategory> {
- IPage<MallGoodsCategory> selectCategoryList(Page<MallGoodsCategory> page, @Param("record")MallGoodsCategory mallGoodsCategory);
+ IPage<MallGoodsCategory> selectCategoryListInPage(Page<MallGoodsCategory> page, @Param("record")MallGoodsCategory mallGoodsCategory);
List<MallGoodsCategory> selectCategoryByName(@Param("name")String name);
List<MallGoodsCategory> getCategorys();
+
+ List<MallGoodsCategoryVo> selectAllCategoryList();
+
+ List<MallGoodsCategory> selectCategoryListByParentId(@Param("id") Long id);
+
+ List<MallGoodsCategory> selectRecommendCategoryList();
+
+ AdminMallGoodsCategoryVo getMallGoodsCategoryInfoById(@Param("id")long id);
+
+ List<AdminMallGoodsCategoryTreeVo> getParentCategorys();
+
+ List<MallGoodsCategory> selectChildCategaryById(@Param("id")Long id);
+
+ List<AdminMallGoodsCategoryTreeVo> getAllCategorys();
+
+ IPage<MallStore> selectStoreListInPage(Page<MallStore> page, @Param("record")MallStore mallStore);
+
+ IPage<MallStoreItem> selectStoreItemListInPage(Page<MallStoreItem> page, @Param("record")MallStoreItem mallStoreItem);
+
+ List<MallStore> getStore();
}
--
Gitblit v1.9.1