From 03bd93bf72ea24c2134c08bff69a3671202759ff Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 15 Sep 2025 13:48:44 +0800
Subject: [PATCH] feat(mall): 优化活动订单列表接口和导出功能

---
 src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
index af02647..ca16cd4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
@@ -3,19 +3,18 @@
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
 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.entity.HappyActivity;
-import cc.mrbird.febs.mall.entity.HappyActivityCategory;
-import cc.mrbird.febs.mall.entity.HappyActivityOption;
-import cc.mrbird.febs.mall.entity.HappyFollow;
+import cc.mrbird.febs.mall.dto.activity.*;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo;
+import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo;
+import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderItemVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.Map;
 
 public interface IAdminHappyActivityService extends IService<HappyActivity>{
 
@@ -46,6 +45,8 @@
 
     List<HappyActivity> allActivities();
 
+    List<HappyActivity> allOrderActivities();
+
     FebsResponse addOption(AdminActivityOptionAddDto dto);
 
     FebsResponse optionUpdate(HappyActivityOption dto);
@@ -53,4 +54,28 @@
     FebsResponse optionDelete(Long id);
 
     IPage<HappyFollow> getFollowVoteInPage(HappyActivityOption voteRecord, QueryRequest request);
+
+    IPage<HappyActivityOrder> activityOrderList(AdminHappyActivityOrderDto dto, QueryRequest request);
+
+    IPage<AdminHappyActivityOrderItemVo> activityOrderListV2(AdminHappyActivityOrderDto dto, QueryRequest request);
+
+    FebsResponse checkOrder(List<Long> dto);
+
+    FebsResponse activityOrderDel(Long id);
+
+    List<HappyActivityOption> getVoteOptionListForExport(Map<String, String> params);
+
+    IPage<AdminActivityCommentVo> getCommentListInPage(AdminActivityCommentDto dto, QueryRequest request);
+
+    FebsResponse showStateSwitchOn(Long id);
+
+    List<HappyActivityOrder> getOrderListForExport(Map<String, String> params);
+
+    List<AdminHappyActivityOrderItemVo> getOrderListForExportV2(Map<String, String> params);
+
+    IPage<AdminHappyActivityOrderCheckVo> activityOrderCheckList(AdminHappyActivityOrderCheckDto dto, QueryRequest request);
+
+    FebsResponse checkOrderItem(List<Long> dto);
+
+    List<AdminHappyActivityOrderCheckVo> getOrderCheckListForExport(Map<String, String> params);
 }

--
Gitblit v1.9.1