From 4ecb1295fdd75f08b3505c971c4118c6e3cfed15 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Thu, 19 Mar 2026 17:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=9C=8D=E5=8A=A1=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ora/PurchaseProductRecordQueryService.xml | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/dating-agency-mall-server/src/main/resources/mapper/ora/PurchaseProductRecordQueryService.xml b/dating-agency-mall-server/src/main/resources/mapper/ora/PurchaseProductRecordQueryService.xml
index 481dd83..1d3fb29 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/ora/PurchaseProductRecordQueryService.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/ora/PurchaseProductRecordQueryService.xml
@@ -4,6 +4,7 @@
 
     <select id="pageMarriageBountyOrder"
             resultType="com.qniao.dam.api.query.ora.user.response.UserPageMarriageBountyOrderRefundApplicationVo">
+        SELECT aa.* From (
         select
         dora.id,
         dora.order_id,
@@ -21,7 +22,7 @@
         LEFT JOIN da_marriage_bounty_order as dmbo on dmbo.id=dora.order_id
         LEFT JOIN da_marriage_information as dmi on dmi.id=dmbo.mi_id
         LEFT JOIN da_account as daa on daa.is_delete=0 and daa.type=2 and daa.user_id=dmbo.user_id
-        where dora.is_delete=0
+        where dora.is_delete=0 and dora.refund_order_type=1
         <if test="queryParams.operationStatus != null">
             and dora.`operation_status` = #{queryParams.operationStatus}
         </if>
@@ -37,6 +38,41 @@
         <if test="queryParams.applyTimeFrom != null and queryParams.applyTimeTo != null">
             and dora.create_time BETWEEN #{queryParams.applyTimeFrom} and #{queryParams.applyTimeTo}
         </if>
-        order by dora.create_time desc
+
+        UNION ALL
+        select
+        dora.id,
+        dora.order_id,
+        dmi.nick_name as miName,
+        daa.tid as phone,
+        dora.refund_order_type as refundOrderType,
+        dora.refund_amount,
+        dora.order_amount,
+        dora.`operation_status`,
+        dora.`status`,
+        dora.operation_remark,
+        dora.remark,
+        dora.create_time as applyTime
+        from da_order_refund_application as dora
+        LEFT JOIN da_entrust_service_order as dmbo on dmbo.id=dora.order_id
+        LEFT JOIN da_marriage_information as dmi on dmi.id=dmbo.initiator_mi_id
+        LEFT JOIN da_account as daa on daa.is_delete=0 and daa.type=2 and daa.user_id=dmbo.target_user_id
+        where dora.is_delete=0 and dora.refund_order_type=2
+        <if test="queryParams.operationStatus != null">
+            and dora.`operation_status` = #{queryParams.operationStatus}
+        </if>
+        <if test="queryParams.status != null">
+            and dora.`status` = #{queryParams.status}
+        </if>
+        <if test="queryParams.miName != null and queryParams.miName != '' ">
+            AND dmi.nick_name LIKE CONCAT('%', TRIM(#{queryParams.miName}), '%')
+        </if>
+        <if test="queryParams.phone != null and queryParams.phone != '' ">
+            AND daa.tid LIKE CONCAT('%', TRIM(#{queryParams.phone}), '%')
+        </if>
+        <if test="queryParams.applyTimeFrom != null and queryParams.applyTimeTo != null">
+            and dora.create_time BETWEEN #{queryParams.applyTimeFrom} and #{queryParams.applyTimeTo}
+        </if>) as aa
+        order by aa.applyTime desc
     </select>
 </mapper>
\ No newline at end of file