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/activity/ViewHappyActivityController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java b/src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java
index 7e467c5..e8270b6 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java
@@ -2,8 +2,6 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
-import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.entity.HappyActivity;
@@ -12,19 +10,14 @@
import cc.mrbird.febs.mall.mapper.HappyActivityCategoryMapper;
import cc.mrbird.febs.mall.mapper.HappyActivityOptionMapper;
import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
-import cc.mrbird.febs.mall.vo.activity.VoteActivityVo;
-import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.Map;
@Controller("votesActivityView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/votesActivity")
@@ -145,4 +138,35 @@
redisUtils.set("voteRecord", id, -1);
return FebsUtil.view("modules/votesActivity/voteRecord");
}
+
+ /**
+ * 活动-订单列表
+ */
+ @GetMapping("orderList")
+ @RequiresPermissions("orderList:view")
+ public String orderList() {
+ return FebsUtil.view("modules/votesActivity/orderList");
+ }
+
+
+
+ /**
+ * 活动-订单评论列表
+ */
+ @GetMapping("commentList")
+ @RequiresPermissions("commentList:view")
+ public String commentList() {
+ return FebsUtil.view("modules/votesActivity/commentList");
+ }
+
+
+
+ /**
+ * 核销记录-列表
+ */
+ @GetMapping("checkOrderList")
+ @RequiresPermissions("checkOrderList:view")
+ public String checkOrderList() {
+ return FebsUtil.view("modules/votesActivity/checkOrderList");
+ }
}
--
Gitblit v1.9.1