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/resources/mapper/modules/HappyActivityOptionMapper.xml |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
index 05101e2..277af56 100644
--- a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -110,6 +110,36 @@
         order by a.id desc
     </select>
 
+    <select id="selectOrderItemInPage" resultType="cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderItemVo">
+        select
+                a.*,
+               e.name as connectName,
+               e.phone as connectPhone,
+               e.address as connectAddress,
+               b.name as memberName,
+               c.name as activityName
+        from happy_activity_order_item d
+        left join happy_activity_connect e on e.id = d.connect_id
+        left join happy_activity_order a on a.id = d.order_id
+        left join mall_member b on a.member_id = b.id
+        left join happy_activity c on a.activity_id = c.id
+        <where>
+            and a.DELETE_FLAG = 0
+            <if test="record != null">
+                <if test="record.name != null and record.name != ''">
+                    and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+                </if>
+                <if test="record.state != null">
+                    and a.state=#{record.state}
+                </if>
+                <if test="record.activityId != null">
+                    and a.activity_id=#{record.activityId}
+                </if>
+            </if>
+        </where>
+        order by a.id desc
+    </select>
+
 
 
     <select id="getVoteOptionRecordInPage" resultType="cc.mrbird.febs.mall.vo.ApiActivityOptionListVo">

--
Gitblit v1.9.1