From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
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