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/service/impl/AdminMemberLevelServiceImpl.java |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMemberLevelServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMemberLevelServiceImpl.java
index c3f5e98..39d383b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMemberLevelServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMemberLevelServiceImpl.java
@@ -17,6 +17,7 @@
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -30,8 +31,7 @@
 @Service
 @RequiredArgsConstructor
 @Transactional
-public class
-AdminMemberLevelServiceImpl extends ServiceImpl<HappyMemberLevelMapper, HappyMemberLevel> implements AdminMemberLevelService {
+public class AdminMemberLevelServiceImpl extends ServiceImpl<HappyMemberLevelMapper, HappyMemberLevel> implements AdminMemberLevelService {
 
     private final HappyMemberLevelMapper happyMemberLevelMapper;
     private final HappySaleLevelMapper happySaleLevelMapper;
@@ -69,8 +69,25 @@
     public FebsResponse labelAdd(AdminMemberLabelAddDto dto) {
         HappyMemberLabel happyMemberLabel = new HappyMemberLabel();
         BeanUtil.copyProperties(dto, happyMemberLabel);
+        Integer code = 0;
+        if(ObjectUtil.isEmpty(dto.getParentId())){
+            code = dto.getCode();
+        }
+        happyMemberLabel.setCode(code);
         happyMemberLabelMapper.insert(happyMemberLabel);
         return new FebsResponse().success().message("操作成功");
+    }
+
+    @Override
+    public FebsResponse parentAll() {
+
+        List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
+                Wrappers.lambdaQuery(HappyMemberLabel.class)
+                        .select(HappyMemberLabel::getId, HappyMemberLabel::getName)
+                        .eq(HappyMemberLabel::getParentId, 0)
+                .eq(HappyMemberLabel::getCode,1)
+        );
+        return new FebsResponse().success().data(happyMemberLabels);
     }
 
     @Override
@@ -88,6 +105,16 @@
         HappyMemberLabel happyMemberLabel = happyMemberLabelMapper.selectById(dto.getId());
         if (ObjectUtil.isNotNull(happyMemberLabel)) {
             BeanUtil.copyProperties(dto, happyMemberLabel);
+
+            Integer code = 0;
+            Long parentId = 0L;
+            if(ObjectUtil.isEmpty(dto.getParentId())){
+                code = dto.getCode();
+            }else{
+                parentId = dto.getParentId();
+            }
+            happyMemberLabel.setCode(code);
+            happyMemberLabel.setParentId(parentId);
             happyMemberLabelMapper.updateById(happyMemberLabel);
         }
         return new FebsResponse().success().message("操作成功");
@@ -99,22 +126,16 @@
         List<Long> memberIdList = dto.getMemberIdList();
         HappyMemberLabel happyMemberLabel = happyMemberLabelMapper.selectById(labelId);
         if (ObjectUtil.isNotEmpty(happyMemberLabel)) {
+            LambdaQueryWrapper<HappyMemberLabelRecord> happyMemberLabelRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            happyMemberLabelRecordLambdaQueryWrapper.eq(HappyMemberLabelRecord::getLabelId,labelId);
+            happyMemberLabelRecordMapper.delete(happyMemberLabelRecordLambdaQueryWrapper);
             if(CollUtil.isNotEmpty(memberIdList)){
-                LambdaQueryWrapper<HappyMemberLabelRecord> happyMemberLabelRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                happyMemberLabelRecordLambdaQueryWrapper.eq(HappyMemberLabelRecord::getLabelId,labelId);
-                happyMemberLabelRecordLambdaQueryWrapper.in(HappyMemberLabelRecord::getMemberId,memberIdList);
-                happyMemberLabelRecordMapper.delete(happyMemberLabelRecordLambdaQueryWrapper);
-
                 for (Long memberId:memberIdList){
                     HappyMemberLabelRecord happyMemberLabelRecord = new HappyMemberLabelRecord();
                     happyMemberLabelRecord.setMemberId(memberId);
                     happyMemberLabelRecord.setLabelId(labelId);
                     happyMemberLabelRecordMapper.insert(happyMemberLabelRecord);
                 }
-            }else{
-                LambdaQueryWrapper<HappyMemberLabelRecord> happyMemberLabelRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                happyMemberLabelRecordLambdaQueryWrapper.eq(HappyMemberLabelRecord::getLabelId,labelId);
-                happyMemberLabelRecordMapper.delete(happyMemberLabelRecordLambdaQueryWrapper);
             }
         }
         return new FebsResponse().success().message("操作成功");

--
Gitblit v1.9.1