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/controller/activity/AdminVotesActivityCategoryController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java b/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
index cc6d996..d0276ef 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
@@ -18,6 +18,7 @@
import cc.mrbird.febs.mall.entity.HappyActivityOrder;
import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo;
+import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderItemVo;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -242,6 +243,17 @@
}
/**
+ * 订单
+ * @return
+ */
+ @GetMapping("activityOrderListV2")
+ public FebsResponse activityOrderListV2(AdminHappyActivityOrderDto dto, QueryRequest request) {
+
+ Map<String, Object> data = getDataTable(adminHappyActivityService.activityOrderListV2(dto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
* 订单-手动核销
*/
@PostMapping("checkOrder")
@@ -334,18 +346,22 @@
String title = happyActivity.getName() + "的订单";
orderSheet.setTitle(title);
- String[] header = {"序号","用户", "编号", "单价", "数量","总价","使用状态", "支付方式"};
+ String[] header = {"序号","用户", "报名人", "报名电话", "报名地址", "编号", "单价", "数量","总价","使用状态", "支付方式"};
orderSheet.setHeaders(header);
- List<HappyActivityOrder> orderListForExport = adminHappyActivityService.getOrderListForExport(params);
+// List<HappyActivityOrder> orderListForExport = adminHappyActivityService.getOrderListForExport(params);
+ List<AdminHappyActivityOrderItemVo> orderListForExport = adminHappyActivityService.getOrderListForExportV2(params);
List<List<Object>> list = new ArrayList<>();
if (orderListForExport.size() > 0) {
int i = 0;
- for (HappyActivityOrder item : orderListForExport) {
+ for (AdminHappyActivityOrderItemVo item : orderListForExport) {
i++;
List<Object> temp = new ArrayList<>();
temp.add(i);
- temp.add(item.getName());
+ temp.add(item.getMemberName());
+ temp.add(item.getConnectName());
+ temp.add(item.getConnectPhone());
+ temp.add(item.getConnectAddress());
temp.add(item.getOrderNo());
temp.add(item.getPrice());
temp.add(item.getNumCnt());
--
Gitblit v1.9.1