From 1e6775a63c0d3011955fc607c4291de06ff8e0c2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 25 Apr 2025 10:54:24 +0800
Subject: [PATCH] feat(mall): 添加活动报名列表导出功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index d84f1e8..13ca39c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -10,6 +10,7 @@
import cc.mrbird.febs.mall.dto.activity.ApiActivityOrderListDto;
import cc.mrbird.febs.mall.dto.activity.ApiCheckOrderDto;
import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionInPageDto;
+import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionRecordInPageDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.HappyActivityService;
@@ -149,6 +150,14 @@
// 创建分页对象，传入当前页和每页大小
Page<ApiActivityOptionListVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
Page<ApiActivityOptionListVo> voteRecordInPage = this.baseMapper.getVoteOptionInPage(page, dto);
+ return new FebsResponse().success().data(voteRecordInPage);
+ }
+
+ @Override
+ public FebsResponse voteOptionRecordInPage(ApiVoteOptionRecordInPageDto dto) {
+ // 创建分页对象，传入当前页和每页大小
+ Page<ApiActivityOptionListVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ Page<ApiActivityOptionListVo> voteRecordInPage = this.baseMapper.getVoteOptionRecordInPage(page, dto);
return new FebsResponse().success().data(voteRecordInPage);
}
@@ -416,6 +425,12 @@
HappyActivity happyActivity = this.baseMapper.selectById(activityId);
if (ObjectUtil.isEmpty(happyActivity)) {
throw new FebsException("活动不存在");
+ }
+ if (StateUpDownEnum.ACTIVITY_STATE_NOT_START.getCode() == happyActivity.getState()) {
+ throw new FebsException("活动尚未开始");
+ }
+ if (StateUpDownEnum.ACTIVITY_STATE_END.getCode() == happyActivity.getState()) {
+ throw new FebsException("活动已结束");
}
Integer joinCnt = happyActivity.getJoinCnt();
@@ -850,9 +865,6 @@
public FebsResponse voteActivityHot(Long id) {
ApiVoteActivityHotVo apiVoteActivityHotVo = new ApiVoteActivityHotVo();
- HappyActivity happyActivity = this.baseMapper.selectById(id);
- apiVoteActivityHotVo.setStartTime(happyActivity.getStartTime());
- apiVoteActivityHotVo.setEndTime(happyActivity.getEndTime());
Integer optionCnt = happyActivityOptionMapper.selectCount(
new LambdaQueryWrapper<HappyActivityOption>()
--
Gitblit v1.9.1