From 4ee42556139749bf6f29d47b912da0be6c37da2a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 11:29:39 +0800
Subject: [PATCH] feat(mall): 添加商品 SKU静态属性价格字段

---
 src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java |   92 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 82 insertions(+), 10 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 9204752..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
@@ -10,11 +10,8 @@
 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;
@@ -27,7 +24,7 @@
 @RequiredArgsConstructor
 public class ViewHappyActivityController extends BaseController {
 
-    private final IAdminHappyActivityService iVoteActivityService;
+    private final IAdminHappyActivityService iAdminHappyActivityService;
     private final HappyActivityCategoryMapper happyActivityCategoryMapper;
     private final HappyActivityOptionMapper happyActivityOptionMapper;
     private final RedisUtils redisUtils;
@@ -61,12 +58,42 @@
     @RequiresPermissions("groupInfo:view")
     public String groupInfo(@PathVariable long id, Model model) {
         HappyActivityCategory voteActivityGroup = happyActivityCategoryMapper.selectById(id);
-        model.addAttribute("groupInfo", voteActivityGroup);
+        model.addAttribute("voteActivityGroup", voteActivityGroup);
         return FebsUtil.view("modules/votesActivity/groupInfo");
     }
 
     /**
-     * 活动选项列表
+     * 活动-列表
+     */
+    @GetMapping("list")
+    @RequiresPermissions("list:view")
+    public String activityList() {
+        return FebsUtil.view("modules/votesActivity/list");
+    }
+
+    /**
+     * 活动-新增
+     */
+    @GetMapping("add")
+    @RequiresPermissions("add:add")
+    public String activityAdd() {
+        return FebsUtil.view("modules/votesActivity/add");
+    }
+
+    /**
+     * 活动-修改
+     */
+    @GetMapping("votesActivityUpdate/{id}")
+    @RequiresPermissions("votesActivityUpdate:update")
+    public String votesActivityctivityUpdate(@PathVariable long id, Model model) {
+        HappyActivity happyActivity = iAdminHappyActivityService.getBaseMapper().selectById(id);
+        model.addAttribute("activity", happyActivity);
+
+        return FebsUtil.view("modules/votesActivity/discountUpdate");
+    }
+
+    /**
+     * 活动-选项列表
      */
     @GetMapping("optionList")
     @RequiresPermissions("optionList:view")
@@ -75,7 +102,7 @@
     }
 
     /**
-     * 活动选项新增
+     * 活动-选项新增
      * @return
      */
     @GetMapping(value = "/optionAdd")
@@ -85,7 +112,7 @@
     }
 
     /**
-     * 活动选项新增编辑
+     * 活动-选项编辑
      * @param id
      * @param model
      * @return
@@ -93,8 +120,53 @@
     @GetMapping("optionInfo/{id}")
     @RequiresPermissions("optionInfo:view")
     public String optionInfo(@PathVariable long id, Model model) {
-        HappyActivityOption voteOption = happyActivityOptionMapper.selectById(id);
-        model.addAttribute("voteOption", voteOption);
+        HappyActivityOption happyActivityOption = happyActivityOptionMapper.selectById(id);
+        model.addAttribute("voteOption", happyActivityOption);
         return FebsUtil.view("modules/votesActivity/optionInfo");
     }
+    /**
+     * 活动-得票记录
+     * @return
+     */
+    @GetMapping("voteRecord/{id}")
+    @RequiresPermissions("voteRecord:view")
+    public String moneyFlow(@PathVariable long id, Model model) {
+        String existToken = redisUtils.getString("voteRecord");
+        if (StrUtil.isNotBlank(existToken)) {
+            redisUtils.del(existToken);
+        }
+        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