From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```

---
 src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java |  101 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 98 insertions(+), 3 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..42dbd66 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
@@ -11,13 +11,12 @@
 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.dto.memberLevel.*;
 import cc.mrbird.febs.mall.entity.HappyActivity;
 import cc.mrbird.febs.mall.entity.HappyActivityOption;
 import cc.mrbird.febs.mall.service.AdminMemberLevelService;
 import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
+import cc.mrbird.febs.mall.vo.memberLevel.AdminMemberLabelSetDto;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
@@ -45,6 +44,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 +139,47 @@
         return adminMemberLevelService.levelAll();
     }
 
+
+
+    /**
+     * 分销等级-列表
+     * @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