From 1de2a86878a5adb98371758a770babb724ec5a67 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 04 Feb 2026 15:51:46 +0800
Subject: [PATCH] feat(mall): 添加会员角色ID字段

---
 src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java |  131 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 109 insertions(+), 22 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java b/src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java
index baab533..0efc9d6 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java
@@ -5,35 +5,15 @@
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
 import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
-import cc.mrbird.febs.common.utils.excl.ExcelUtil;
-import cc.mrbird.febs.common.utils.excl.ExcelVersion;
-import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil;
-import cc.mrbird.febs.mall.dto.AdminHappyActivityCategoryDto;
-import cc.mrbird.febs.mall.dto.activity.*;
-import cc.mrbird.febs.mall.dto.memberLevel.AdminMemberLevelAddDto;
-import cc.mrbird.febs.mall.dto.memberLevel.AdminMemberLevelDto;
-import cc.mrbird.febs.mall.dto.memberLevel.AdminMemberLevelUpdateDto;
-import cc.mrbird.febs.mall.entity.HappyActivity;
-import cc.mrbird.febs.mall.entity.HappyActivityOption;
+import cc.mrbird.febs.mall.dto.memberLevel.*;
 import cc.mrbird.febs.mall.service.AdminMemberLevelService;
-import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
+import cc.mrbird.febs.mall.vo.memberLevel.AdminMemberLabelSetDto;
 import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -45,6 +25,59 @@
 
     private final AdminMemberLevelService adminMemberLevelService;
     private final RedisUtils redisUtils;
+
+    /**
+     * 会员标识-列表
+     * @return
+     */
+    @GetMapping("labelList")
+    public FebsResponse labelList(AdminMemberLabelDto dto, QueryRequest request) {
+
+        Map<String, Object> data = getDataTable(adminMemberLevelService.getLabelListInPage(dto, request));
+        return new FebsResponse().success().data(data);
+    }
+    /**
+     * 会员标识-新增
+     */
+    @PostMapping("labelAdd")
+    @ControllerEndpoint(operation = " 会员标识-新增", exceptionMessage = "操作失败")
+    public FebsResponse labelAdd(@RequestBody @Valid AdminMemberLabelAddDto dto) {
+
+        return adminMemberLevelService.labelAdd(dto);
+    }
+
+
+    /**
+     * 会员标识-获取
+     * @return
+     */
+    @GetMapping(value = "/parentAll")
+    public FebsResponse parentAll() {
+
+        return adminMemberLevelService.parentAll();
+    }
+
+
+    /**
+     * 会员标识-更新
+     */
+    @PostMapping("labelUpdate")
+    @ControllerEndpoint(operation = "会员标识-更新", exceptionMessage = "操作失败")
+    public FebsResponse labelUpdate(@RequestBody @Valid AdminMemberLabelUpdateDto dto) {
+
+        return adminMemberLevelService.labelUpdate(dto);
+    }
+
+
+    /**
+     * 会员标识-设置
+     */
+    @PostMapping("labelMemberSet")
+    @ControllerEndpoint(operation = "会员标识-设置", exceptionMessage = "操作失败")
+    public FebsResponse labelMemberSet(@RequestBody @Valid AdminMemberLabelSetDto dto) {
+
+        return adminMemberLevelService.labelMemberSet(dto);
+    }
 
     /**
      * 会员等级-列表
@@ -87,4 +120,58 @@
         return adminMemberLevelService.levelAll();
     }
 
+    /**
+     * 会员等级-获取全部
+     * @return
+     */
+    @GetMapping(value = "/memberRoleAll")
+    public FebsResponse memberRoleAll() {
+
+        String companyId = getCurrentUserCompanyId();
+        return adminMemberLevelService.memberRoleAll(companyId);
+    }
+
+
+
+    /**
+     * 分销等级-列表
+     * @return
+     */
+    @GetMapping("saleList")
+    public FebsResponse saleList(AdminSaleLevelDto dto, QueryRequest request) {
+
+        Map<String, Object> data = getDataTable(adminMemberLevelService.getSaleLevelListInPage(dto, request));
+        return new FebsResponse().success().data(data);
+    }
+    /**
+     * 分销等级-新增
+     */
+    @PostMapping("saleAdd")
+    @ControllerEndpoint(operation = "分销等级-新增", exceptionMessage = "操作失败")
+    public FebsResponse saleAdd(@RequestBody @Valid AdminSaleLevelAddDto dto) {
+
+        return adminMemberLevelService.saleAdd(dto);
+    }
+
+
+    /**
+     * 分销等级-更新
+     */
+    @PostMapping("saleUpdate")
+    @ControllerEndpoint(operation = "分销等级-更新", exceptionMessage = "操作失败")
+    public FebsResponse saleUpdate(@RequestBody @Valid AdminSaleLevelUpdateDto dto) {
+
+        return adminMemberLevelService.saleUpdate(dto);
+    }
+
+    /**
+     * 分销等级-获取全部
+     * @return
+     */
+    @GetMapping(value = "/saleLevelAll")
+    public FebsResponse saleLevelAll() {
+
+        return adminMemberLevelService.saleLevelAll();
+    }
+
 }

--
Gitblit v1.9.1