From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 src/main/java/cc/mrbird/febs/mall/controller/memberLevel/AdminHappyMemberLevelController.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 54 insertions(+), 0 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 ab54e7d..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
@@ -16,6 +16,7 @@
 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 +46,59 @@
     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);
+    }
+
+    /**
      * 会员等级-列表
      * @return
      */

--
Gitblit v1.9.1