From e187e18fc4fd2f120b67a9fdba4d9d2864f293fb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 24 Apr 2025 18:05:30 +0800
Subject: [PATCH] feat(mall): 添加投票活动排行榜功能并优化相关接口
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
index 1070b62..e1dddd9 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -5,9 +5,7 @@
import cc.mrbird.febs.common.enumerates.StateUpDownEnum;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.AdminHappyActivityCategoryDto;
-import cc.mrbird.febs.mall.dto.activity.AdminActivityOptionAddDto;
-import cc.mrbird.febs.mall.dto.activity.AdminCategoryAddDto;
-import cc.mrbird.febs.mall.dto.activity.AdminCategoryUpdateDto;
+import cc.mrbird.febs.mall.dto.activity.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
@@ -38,6 +36,8 @@
private final HappyActivityCategoryMapper happyActivityCategoryMapper;
private final HappyActivityOptionMapper happyActivityOptionMapper;
+ private final HappyActivityOrderMapper happyActivityOrderMapper;
+ private final HappyActivityOrderItemMapper happyActivityOrderItemMapper;
private final HappyFollowMapper happyFollowMapper;
private final MallMemberMapper mallMemberMapper;
@@ -264,6 +264,17 @@
}
@Override
+ public List<HappyActivity> allOrderActivities() {
+ List<HappyActivity> happyActivities = this.baseMapper.selectList(
+ new LambdaQueryWrapper<HappyActivity>()
+ .select(HappyActivity::getId, HappyActivity::getName)
+ .eq(HappyActivity::getType, StateUpDownEnum.ACTIVITY_TYPE_CROWDFUNDING.getCode())
+ .eq(HappyActivity::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ );
+ return happyActivities;
+ }
+
+ @Override
public FebsResponse addOption(AdminActivityOptionAddDto dto) {
@@ -271,7 +282,7 @@
return new FebsResponse().fail().message("请选择投票活动");
}
- List<HappyActivityOption> happyActivityOptions = happyActivityOptionMapper.selectList(
+ Integer optionCnt = happyActivityOptionMapper.selectCount(
new LambdaQueryWrapper<HappyActivityOption>()
.eq(HappyActivityOption::getActivityId, dto.getActivityId())
.eq(HappyActivityOption::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
@@ -280,7 +291,7 @@
HappyActivityOption happyActivityOption = new HappyActivityOption();
BeanUtil.copyProperties(dto, happyActivityOption);
- happyActivityOption.setOrderCnt(CollUtil.isEmpty(happyActivityOptions) ? 1 : happyActivityOptions.size() + 1);
+ happyActivityOption.setOrderCnt(optionCnt + 1);
happyActivityOptionMapper.insert(happyActivityOption);
return new FebsResponse().success().message("操作成功");
}
@@ -343,4 +354,50 @@
}
return adminIPage;
}
+
+ @Override
+ public IPage<HappyActivityOrder> activityOrderList(AdminHappyActivityOrderDto dto, QueryRequest request) {
+ Page<HappyActivityOrder> page = new Page<>(request.getPageNum(), request.getPageSize());
+ Page<HappyActivityOrder> adminOptionVoIPage = this.baseMapper.selectOrderInPage(page, dto);
+ return adminOptionVoIPage;
+ }
+
+ @Override
+ public FebsResponse checkOrder(AdminHappyActivityCheckOrderDto dto) {
+
+ List<Long> ids = dto.getIds();
+ if (CollUtil.isEmpty(ids)){
+ return new FebsResponse().fail().message("请选择需要核销的订单");
+ }
+ for(Long id : ids){
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+
+ List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getOrderId, id)
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrderItems)){
+ happyActivityOrderItems.forEach(happyActivityOrderItem -> {
+ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+ happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+ });
+ }
+ }
+
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public FebsResponse activityOrderDel(Long id) {
+
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
+ if(ObjectUtil.isNotEmpty(happyActivityOrder)){
+ happyActivityOrder.setDeleteFlag(StateUpDownEnum.UP.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+ }
+
+ return new FebsResponse().success().message("操作成功");
+ }
}
--
Gitblit v1.9.1