From 9f115c546c4ce91990fc79175c02f75907646cc8 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 24 Apr 2025 17:06:20 +0800
Subject: [PATCH] fix(votesActivity): 修复活动状态显示逻辑
---
src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java b/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java
index 72ed54a..73f3936 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java
@@ -3,8 +3,10 @@
import cc.mrbird.febs.common.annotation.Limit;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionInPageDto;
import cc.mrbird.febs.mall.service.HappyActivityService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.activity.ApiVoteActivityHotVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -56,10 +58,20 @@
@ApiResponses({
@ApiResponse(code = 200, message = "success", response = ApiActivityOptionListVo.class)
})
- @GetMapping(value = "/voteOptionList/{id}")
- public FebsResponse voteOptionList(@PathVariable("id") Long id) {
+ @GetMapping(value = "/voteOptionInPage")
+ public FebsResponse voteOptionInPage(@RequestBody @Validated ApiVoteOptionInPageDto dto) {
- return happyActivityService.voteOptionList(id);
+ return happyActivityService.voteOptionInPage(dto);
+ }
+
+ @ApiOperation(value = "投票活动-活动热度", notes = "投票活动-活动热度")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiVoteActivityHotVo.class)
+ })
+ @GetMapping(value = "/voteActivityHot/{id}")
+ public FebsResponse voteActivityHot(@PathVariable("id") Long id) {
+
+ return happyActivityService.voteActivityHot(id);
}
@ApiOperation(value = "投票活动-选项详情", notes = "投票活动-选项详情")
@@ -90,4 +102,11 @@
return happyActivityService.voteRecordInPage(dto);
}
+ @ApiOperation(value = "投票活动-报名", notes = "投票活动-报名")
+ @PostMapping(value = "/operateRegister")
+ public FebsResponse operateRegister(@RequestBody @Validated ApiOperateRegisterActivityDto dto) {
+
+ return happyActivityService.operateRegister(dto);
+ }
+
}
--
Gitblit v1.9.1