From fd2e2482770479c41bb2cf61b019cc86eb65e077 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 24 Apr 2025 16:49:12 +0800
Subject: [PATCH] feat(mall): 添加活动订单管理功能

---
 src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java |   17 ++++++++++-------
 1 files changed, 10 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..94be14e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
@@ -3,13 +3,8 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -46,6 +41,8 @@
 
     List<HappyActivity> allActivities();
 
+    List<HappyActivity> allOrderActivities();
+
     FebsResponse addOption(AdminActivityOptionAddDto dto);
 
     FebsResponse optionUpdate(HappyActivityOption dto);
@@ -53,4 +50,10 @@
     FebsResponse optionDelete(Long id);
 
     IPage<HappyFollow> getFollowVoteInPage(HappyActivityOption voteRecord, QueryRequest request);
+
+    IPage<HappyActivityOrder> activityOrderList(AdminHappyActivityOrderDto dto, QueryRequest request);
+
+    FebsResponse checkOrder(AdminHappyActivityCheckOrderDto dto);
+
+    FebsResponse activityOrderDel(Long id);
 }

--
Gitblit v1.9.1