会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/account/controller/MemberController.java

@@ -47,6 +47,13 @@ public class MemberController extends BaseController
         return success(memberId);
     }
 
+    @PreAuthorize("@ss.hasPermi('agri:member:list')")
+    @GetMapping("/levels")
+    public AjaxResult levels()
+    {
+        return success(memberService.selectMemberLevelList());
+    }
+
     @PreAuthorize("@ss.hasPermi('agri:member:query')")
     @GetMapping("/{memberId}")
     public AjaxResult getInfo(@PathVariable("memberId") Long memberId)

baqing-shop/src/main/java/com/ruoyi/web/modules/account/domain/BizMember.java

@@ -24,7 +24,7 @@ public class BizMember extends BaseEntity
 
     private String password;
 
-    /** 会员等级（字典 biz_member_level，选填） */
+    /** 会员等级（biz_member_level.level_no，选填） */
     private Integer memberLevel;
 
     private String status;

baqing-shop/src/main/java/com/ruoyi/web/modules/account/domain/BizMemberLevel.java

@@ -0,0 +1,112 @@
+package com.ruoyi.web.modules.account.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 会员等级配置 biz_member_level
+ */
+public class BizMemberLevel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long levelId;
+
+    /** 等级序号，对应 biz_member.member_level */
+    private Integer levelNo;
+
+    /** 等级名称 */
+    private String levelName;
+
+    /** 等级图标 URL */
+    private String levelIcon;
+
+    /** 会员权益说明 */
+    private String benefits;
+
+    private Integer sortNo;
+
+    /** 0启用 1停用 */
+    private String status;
+
+    private String delFlag;
+
+    public Long getLevelId()
+    {
+        return levelId;
+    }
+
+    public void setLevelId(Long levelId)
+    {
+        this.levelId = levelId;
+    }
+
+    public Integer getLevelNo()
+    {
+        return levelNo;
+    }
+
+    public void setLevelNo(Integer levelNo)
+    {
+        this.levelNo = levelNo;
+    }
+
+    public String getLevelName()
+    {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName)
+    {
+        this.levelName = levelName;
+    }
+
+    public String getLevelIcon()
+    {
+        return levelIcon;
+    }
+
+    public void setLevelIcon(String levelIcon)
+    {
+        this.levelIcon = levelIcon;
+    }
+
+    public String getBenefits()
+    {
+        return benefits;
+    }
+
+    public void setBenefits(String benefits)
+    {
+        this.benefits = benefits;
+    }
+
+    public Integer getSortNo()
+    {
+        return sortNo;
+    }
+
+    public void setSortNo(Integer sortNo)
+    {
+        this.sortNo = sortNo;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/account/mapper/BizMemberLevelMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.modules.account.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.web.modules.account.domain.BizMemberLevel;
+
+/**
+ * 会员等级 Mapper
+ */
+public interface BizMemberLevelMapper
+{
+    List<BizMemberLevel> selectEnabledList();
+
+    BizMemberLevel selectByLevelNo(@Param("levelNo") Integer levelNo);
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/account/service/IMemberService.java

@@ -7,6 +7,7 @@ import com.ruoyi.web.modules.account.dto.MemberCreateDTO;
 import com.ruoyi.web.modules.account.dto.MemberOrderQueryDTO;
 import com.ruoyi.web.modules.account.dto.MemberStatusDTO;
 import com.ruoyi.web.modules.account.vo.MemberDetailVO;
+import com.ruoyi.web.modules.account.vo.MemberLevelVO;
 import com.ruoyi.web.modules.account.vo.MemberListVO;
 
 /**
@@ -25,4 +26,6 @@ public interface IMemberService
     TableDataInfo selectMemberOrders(Long memberId, MemberOrderQueryDTO query);
 
     Object selectMemberOrderDetail(Long memberId, Long orderId);
+
+    List<MemberLevelVO> selectMemberLevelList();
 }

baqing-shop/src/main/java/com/ruoyi/web/modules/account/service/impl/MemberServiceImpl.java

@@ -1,7 +1,9 @@
 package com.ruoyi.web.modules.account.service.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -11,17 +13,20 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.account.constant.MemberConstants;
 import com.ruoyi.web.modules.account.domain.BizMember;
 import com.ruoyi.web.modules.account.domain.BizMemberAddress;
+import com.ruoyi.web.modules.account.domain.BizMemberLevel;
 import com.ruoyi.web.modules.account.dto.MemberCreateDTO;
 import com.ruoyi.web.modules.account.dto.MemberOrderQueryDTO;
 import com.ruoyi.web.modules.account.dto.MemberStatusDTO;
 import com.ruoyi.web.modules.account.facade.IOrderFacade;
 import com.ruoyi.web.modules.account.mapper.BizMemberAddressMapper;
+import com.ruoyi.web.modules.account.mapper.BizMemberLevelMapper;
 import com.ruoyi.web.modules.account.mapper.BizMemberMapper;
 import com.ruoyi.web.modules.account.service.IMemberService;
 import com.ruoyi.web.modules.account.support.MemberRegistrationSupport;
 import com.ruoyi.web.modules.account.util.MemberMobileUtils;
 import com.ruoyi.web.modules.account.vo.MemberAddressVO;
 import com.ruoyi.web.modules.account.vo.MemberDetailVO;
+import com.ruoyi.web.modules.account.vo.MemberLevelVO;
 import com.ruoyi.web.modules.account.vo.MemberListVO;
 
 /**
@@ -33,6 +38,9 @@ public class MemberServiceImpl implements IMemberService
     @Autowired
     private BizMemberMapper memberMapper;
 
+    @Autowired
+    private BizMemberLevelMapper memberLevelMapper;
+
     @Autowired
     private BizMemberAddressMapper addressMapper;
 
@@ -51,10 +59,22 @@ public class MemberServiceImpl implements IMemberService
         }
         query.setMemberRoleKey(MemberConstants.MEMBER_ROLE_KEY);
         List<BizMember> list = memberMapper.selectList(query);
+        Map<Integer, BizMemberLevel> levelMap = buildLevelMap();
         List<MemberListVO> rows = new ArrayList<>();
         for (BizMember m : list)
         {
-            rows.add(toListVo(m, true));
+            rows.add(toListVo(m, true, levelMap));
+        }
+        return rows;
+    }
+
+    @Override
+    public List<MemberLevelVO> selectMemberLevelList()
+    {
+        List<MemberLevelVO> rows = new ArrayList<>();
+        for (BizMemberLevel level : memberLevelMapper.selectEnabledList())
+        {
+            rows.add(toLevelVo(level));
         }
         return rows;
     }
@@ -72,7 +92,7 @@ public class MemberServiceImpl implements IMemberService
         vo.setMemberCode(member.getMemberCode());
         vo.setNickName(member.getNickName());
         vo.setMobile(member.getMobile());
-        fillMemberLevel(vo, member);
+        fillMemberLevel(vo, member, buildLevelMap());
         vo.setStatus(member.getStatus());
         vo.setOrderCount(member.getOrderCount());
         vo.setTotalAmount(member.getTotalAmount());
@@ -148,14 +168,14 @@ public class MemberServiceImpl implements IMemberService
         }
     }
 
-    private MemberListVO toListVo(BizMember m, boolean maskMobile)
+    private MemberListVO toListVo(BizMember m, boolean maskMobile, Map<Integer, BizMemberLevel> levelMap)
     {
         MemberListVO vo = new MemberListVO();
         vo.setMemberId(m.getMemberId());
         vo.setMemberCode(m.getMemberCode());
         vo.setNickName(m.getNickName());
         vo.setMobile(maskMobile ? MemberMobileUtils.mask(m.getMobile()) : m.getMobile());
-        fillMemberLevel(vo, m);
+        fillMemberLevel(vo, m, levelMap);
         vo.setStatus(m.getStatus());
         String label = DictUtils.getDictLabel(MemberConstants.DICT_MEMBER_STATUS, m.getStatus());
         if (StringUtils.isEmpty(label))
@@ -169,26 +189,56 @@ public class MemberServiceImpl implements IMemberService
         return vo;
     }
 
-    private void fillMemberLevel(MemberListVO vo, BizMember m)
+    private Map<Integer, BizMemberLevel> buildLevelMap()
     {
-        vo.setMemberLevel(m.getMemberLevel());
-        if (m.getMemberLevel() != null)
+        Map<Integer, BizMemberLevel> map = new HashMap<>();
+        for (BizMemberLevel level : memberLevelMapper.selectEnabledList())
         {
-            String label = DictUtils.getDictLabel(MemberConstants.DICT_MEMBER_LEVEL,
-                    String.valueOf(m.getMemberLevel()));
-            vo.setMemberLevelLabel(StringUtils.isNotEmpty(label) ? label : String.valueOf(m.getMemberLevel()));
+            map.put(level.getLevelNo(), level);
         }
+        return map;
     }
 
-    private void fillMemberLevel(MemberDetailVO vo, BizMember m)
+    private MemberLevelVO toLevelVo(BizMemberLevel level)
+    {
+        MemberLevelVO vo = new MemberLevelVO();
+        vo.setLevelId(level.getLevelId());
+        vo.setLevelNo(level.getLevelNo());
+        vo.setLevelName(level.getLevelName());
+        vo.setLevelIcon(level.getLevelIcon());
+        vo.setBenefits(level.getBenefits());
+        vo.setSortNo(level.getSortNo());
+        return vo;
+    }
+
+    private void fillMemberLevel(MemberListVO vo, BizMember m, Map<Integer, BizMemberLevel> levelMap)
     {
         vo.setMemberLevel(m.getMemberLevel());
-        if (m.getMemberLevel() != null)
+        if (m.getMemberLevel() == null)
+        {
+            return;
+        }
+        BizMemberLevel level = levelMap.get(m.getMemberLevel());
+        if (level == null)
+        {
+            level = memberLevelMapper.selectByLevelNo(m.getMemberLevel());
+        }
+        if (level != null)
         {
-            String label = DictUtils.getDictLabel(MemberConstants.DICT_MEMBER_LEVEL,
-                    String.valueOf(m.getMemberLevel()));
-            vo.setMemberLevelLabel(StringUtils.isNotEmpty(label) ? label : String.valueOf(m.getMemberLevel()));
+            vo.setMemberLevelLabel(level.getLevelName());
         }
+        else
+        {
+            vo.setMemberLevelLabel(String.valueOf(m.getMemberLevel()));
+        }
+    }
+
+    private void fillMemberLevel(MemberDetailVO vo, BizMember m, Map<Integer, BizMemberLevel> levelMap)
+    {
+        MemberListVO temp = new MemberListVO();
+        fillMemberLevel(temp, m, levelMap);
+        vo.setMemberLevel(temp.getMemberLevel());
+        vo.setMemberLevelLabel(temp.getMemberLevelLabel());
     }
 
     private MemberAddressVO toAddressVo(BizMemberAddress addr)

baqing-shop/src/main/java/com/ruoyi/web/modules/account/vo/MemberLevelVO.java

@@ -0,0 +1,79 @@
+package com.ruoyi.web.modules.account.vo;
+
+/**
+ * 会员等级（列表/选项）
+ */
+public class MemberLevelVO
+{
+    private Long levelId;
+
+    private Integer levelNo;
+
+    private String levelName;
+
+    private String levelIcon;
+
+    private String benefits;
+
+    private Integer sortNo;
+
+    public Long getLevelId()
+    {
+        return levelId;
+    }
+
+    public void setLevelId(Long levelId)
+    {
+        this.levelId = levelId;
+    }
+
+    public Integer getLevelNo()
+    {
+        return levelNo;
+    }
+
+    public void setLevelNo(Integer levelNo)
+    {
+        this.levelNo = levelNo;
+    }
+
+    public String getLevelName()
+    {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName)
+    {
+        this.levelName = levelName;
+    }
+
+    public String getLevelIcon()
+    {
+        return levelIcon;
+    }
+
+    public void setLevelIcon(String levelIcon)
+    {
+        this.levelIcon = levelIcon;
+    }
+
+    public String getBenefits()
+    {
+        return benefits;
+    }
+
+    public void setBenefits(String benefits)
+    {
+        this.benefits = benefits;
+    }
+
+    public Integer getSortNo()
+    {
+        return sortNo;
+    }
+
+    public void setSortNo(Integer sortNo)
+    {
+        this.sortNo = sortNo;
+    }
+}

baqing-shop/src/main/resources/mapper/account/BizMemberLevelMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.web.modules.account.mapper.BizMemberLevelMapper">
+
+    <resultMap id="BizMemberLevelResult" type="com.ruoyi.web.modules.account.domain.BizMemberLevel">
+        <id property="levelId" column="level_id"/>
+        <result property="levelNo" column="level_no"/>
+        <result property="levelName" column="level_name"/>
+        <result property="levelIcon" column="level_icon"/>
+        <result property="benefits" column="benefits"/>
+        <result property="sortNo" column="sort_no"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectVo">
+        select level_id, level_no, level_name, level_icon, benefits, sort_no, status, del_flag,
+               create_by, create_time, update_by, update_time, remark
+        from biz_member_level
+    </sql>
+
+    <select id="selectEnabledList" resultMap="BizMemberLevelResult">
+        <include refid="selectVo"/>
+        where del_flag = '0' and status = '0'
+        order by sort_no asc, level_no asc
+    </select>
+
+    <select id="selectByLevelNo" resultMap="BizMemberLevelResult">
+        <include refid="selectVo"/>
+        where del_flag = '0' and level_no = #{levelNo}
+        limit 1
+    </select>
+
+</mapper>

baqing-shop/src/test/java/com/ruoyi/web/modules/account/controller/MemberControllerTest.java

@@ -19,10 +19,12 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collections;
 import com.ruoyi.web.modules.account.dto.MemberCreateDTO;
 import com.ruoyi.web.modules.account.dto.MemberStatusDTO;
 import com.ruoyi.web.modules.account.service.IMemberService;
 import com.ruoyi.web.modules.account.vo.MemberDetailVO;
+import com.ruoyi.web.modules.account.vo.MemberLevelVO;
 
 @ExtendWith(MockitoExtension.class)
 class MemberControllerTest
@@ -45,6 +47,20 @@ class MemberControllerTest
         org.mockito.Mockito.lenient().doReturn("admin").when(controller).getUsername();
     }
 
+    @Test
+    void levels_returns200() throws Exception
+    {
+        MemberLevelVO level = new MemberLevelVO();
+        level.setLevelNo(0);
+        level.setLevelName("普通会员");
+        when(memberService.selectMemberLevelList()).thenReturn(Collections.singletonList(level));
+
+        mockMvc.perform(get("/agri/member/levels"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.data[0].levelName").value("普通会员"));
+    }
+
     @Test
     void getInfo_returns200() throws Exception
     {

baqing-shop/src/test/java/com/ruoyi/web/modules/account/service/MemberServiceImplTest.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.modules.account.service;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -15,12 +16,16 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.web.modules.account.constant.MemberConstants;
 import com.ruoyi.web.modules.account.domain.BizMember;
+import com.ruoyi.web.modules.account.domain.BizMemberLevel;
 import com.ruoyi.web.modules.account.dto.MemberOrderQueryDTO;
 import com.ruoyi.web.modules.account.dto.MemberStatusDTO;
 import com.ruoyi.web.modules.account.facade.IOrderFacade;
 import com.ruoyi.web.modules.account.mapper.BizMemberAddressMapper;
+import com.ruoyi.web.modules.account.mapper.BizMemberLevelMapper;
 import com.ruoyi.web.modules.account.mapper.BizMemberMapper;
 import com.ruoyi.web.modules.account.service.impl.MemberServiceImpl;
+import com.ruoyi.web.modules.account.vo.MemberDetailVO;
+import com.ruoyi.web.modules.account.vo.MemberListVO;
 
 @ExtendWith(MockitoExtension.class)
 class MemberServiceImplTest
@@ -28,6 +33,9 @@ class MemberServiceImplTest
     @Mock
     private BizMemberMapper memberMapper;
 
+    @Mock
+    private BizMemberLevelMapper memberLevelMapper;
+
     @Mock
     private BizMemberAddressMapper addressMapper;
 
@@ -71,4 +79,37 @@ class MemberServiceImplTest
         when(memberMapper.selectById(99L)).thenReturn(null);
         assertThrows(ServiceException.class, () -> memberService.selectMemberDetail(99L));
     }
+
+    @Test
+    void selectMemberDetail_usesBizMemberLevelName()
+    {
+        BizMember member = new BizMember();
+        member.setMemberId(1L);
+        member.setMemberCode("user01");
+        member.setMemberLevel(0);
+        member.setStatus(MemberConstants.STATUS_ENABLED);
+        when(memberMapper.selectById(1L)).thenReturn(member);
+        when(addressMapper.selectByMemberId(1L)).thenReturn(Collections.emptyList());
+
+        BizMemberLevel level = new BizMemberLevel();
+        level.setLevelNo(0);
+        level.setLevelName("普通会员");
+        when(memberLevelMapper.selectEnabledList()).thenReturn(Collections.singletonList(level));
+
+        MemberDetailVO vo = memberService.selectMemberDetail(1L);
+        assertEquals("普通会员", vo.getMemberLevelLabel());
+    }
+
+    @Test
+    void selectMemberLevelList_returnsEnabledLevels()
+    {
+        BizMemberLevel level = new BizMemberLevel();
+        level.setLevelId(1L);
+        level.setLevelNo(1);
+        level.setLevelName("黄金会员");
+        when(memberLevelMapper.selectEnabledList()).thenReturn(Collections.singletonList(level));
+
+        assertEquals(1, memberService.selectMemberLevelList().size());
+        assertEquals("黄金会员", memberService.selectMemberLevelList().get(0).getLevelName());
+    }
 }

sql/biz_member.sql

@@ -6,7 +6,7 @@
 -- =============================================================================
 CREATE TABLE IF NOT EXISTS `biz_member` (
   `member_id` bigint(20) NOT NULL COMMENT '会员ID，与 sys_user.user_id 一致',
-  `member_level` tinyint(4) DEFAULT NULL COMMENT '会员等级（字典 biz_member_level，选填）',
+  `member_level` tinyint(4) DEFAULT NULL COMMENT '会员等级（biz_member_level.level_no，选填）',
   `order_count` int(11) NOT NULL DEFAULT '0' COMMENT '已完成订单笔数',
   `total_amount` decimal(12,2) NOT NULL DEFAULT '0.00' COMMENT '已完成实付合计（元）',
   `register_time` datetime NOT NULL COMMENT '注册时间',

sql/biz_member_level.sql

@@ -0,0 +1,41 @@
+-- =============================================================================
+-- 会员等级配置 biz_member_level
+-- 用途：平台维护会员等级体系（等级、图标、名称、权益说明）
+-- 关联：biz_member.member_level = 本表 level_no（未删除且启用的等级）
+-- 说明：替代/补充原字典 biz_member_level；C 端与平台端展示等级信息时 JOIN 本表
+-- =============================================================================
+CREATE TABLE IF NOT EXISTS `biz_member_level` (
+  `level_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '等级ID，主键',
+  `level_no` tinyint(4) NOT NULL COMMENT '等级（序号；数值越大等级越高；与 biz_member.member_level 对应）',
+  `level_name` varchar(64) NOT NULL COMMENT '会员名称（等级展示名，如 普通会员、黄金会员）',
+  `level_icon` varchar(512) DEFAULT NULL COMMENT '会员图标URL',
+  `benefits` text COMMENT '会员权益（说明文案；可多行或富文本）',
+  `sort_no` int(11) NOT NULL DEFAULT '0' COMMENT '展示排序（升序）',
+  `status` char(1) NOT NULL DEFAULT '0' COMMENT '状态：0启用 1停用',
+  `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标志：0存在 2逻辑删除',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`level_id`),
+  UNIQUE KEY `uk_level_no` (`level_no`, `del_flag`),
+  KEY `idx_status_sort` (`status`, `sort_no`, `del_flag`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='会员等级配置表';
+
+-- =============================================================================
+-- 初始等级（可选；若已存在同 level_no 则跳过）
+-- =============================================================================
+INSERT INTO `biz_member_level` (
+  `level_no`, `level_name`, `level_icon`, `benefits`, `sort_no`, `status`, `del_flag`, `create_by`, `create_time`, `remark`
+)
+SELECT 0, '普通会员', NULL, '享受平台基础购物服务', 0, '0', '0', 'admin', NOW(), '默认等级'
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `biz_member_level` WHERE `level_no` = 0 AND `del_flag` = '0');
+
+INSERT INTO `biz_member_level` (
+  `level_no`, `level_name`, `level_icon`, `benefits`, `sort_no`, `status`, `del_flag`, `create_by`, `create_time`, `remark`
+)
+SELECT 1, '黄金会员', NULL, '专属折扣、优先客服、会员活动', 1, '0', '0', 'admin', NOW(), NULL
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `biz_member_level` WHERE `level_no` = 1 AND `del_flag` = '0');