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/vip/controller/AdminMallVipConfigController.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/controller/AdminMallVipConfigController.java b/src/main/java/cc/mrbird/febs/vip/controller/AdminMallVipConfigController.java
index 8e22c69..3d4d482 100644
--- a/src/main/java/cc/mrbird/febs/vip/controller/AdminMallVipConfigController.java
+++ b/src/main/java/cc/mrbird/febs/vip/controller/AdminMallVipConfigController.java
@@ -3,12 +3,18 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
+import cc.mrbird.febs.mall.service.impl.CommonService;
import cc.mrbird.febs.vip.entity.MallVipConfig;
import cc.mrbird.febs.vip.service.IMallVipConfigService;
+import cc.mrbird.febs.vip.vo.VipSettingVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 会员配置接口类
@@ -21,6 +27,7 @@
public class AdminMallVipConfigController extends BaseController {
private final IMallVipConfigService mallVipConfigService;
+ private final CommonService commonService;
@GetMapping(value = "/list")
public FebsResponse list(QueryRequest request) {
@@ -28,9 +35,20 @@
}
- @PostMapping(value = "/add")
- public FebsResponse add(@RequestBody MallVipConfig config) {
- mallVipConfigService.addVipConfig(config);
+ @PostMapping(value = "/addOrEdit")
+ public FebsResponse addOrEdit(@RequestBody MallVipConfig config) {
+ if (config.getType() == 1) {
+ config.setTimes(null);
+ config.setAmount(null);
+ } else {
+ config.setTargetId(null);
+ }
+
+ if (config.getId() == null) {
+ mallVipConfigService.addVipConfig(config);
+ } else {
+ mallVipConfigService.editVipConfig(config);
+ }
return new FebsResponse().success().message("操作成功");
}
@@ -39,4 +57,19 @@
mallVipConfigService.delVipConfig(id);
return new FebsResponse().success().message("操作成功");
}
+
+ @PostMapping(value = "/vipSetting")
+ public FebsResponse vipSetting(@RequestBody VipSettingVo vipSettingVo) {
+ commonService.addDataDic(DataDictionaryEnum.VIP_DATE.getType(), DataDictionaryEnum.VIP_DATE.getCode(), vipSettingVo.getVipDate(), null, false);
+
+ commonService.addDataDic(DataDictionaryEnum.UNALIVE_COUPON.getType(), DataDictionaryEnum.UNALIVE_COUPON.getCode(), vipSettingVo.getItems(), "失活会员优惠券配置", true);
+
+ commonService.addDataDic(DataDictionaryEnum.VIP_SCORE_RULE.getType(), DataDictionaryEnum.VIP_SCORE_RULE.getCode(), vipSettingVo.getRule(), "会员规则", false);
+ return new FebsResponse().success();
+ }
+
+ @GetMapping(value = "/allList")
+ public FebsResponse allList() {
+ return new FebsResponse().success().data(mallVipConfigService.list());
+ }
}
--
Gitblit v1.9.1