From fd625785fdc5029b2c335ebe18a63e69fa1b7eb0 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Wed, 21 May 2025 15:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=95=86=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../response/UserPageOrderByOperatorVo.java   |  3 ++
 .../WalletAccountAssociateOrderRecordDao.xml  | 28 +++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/response/UserPageOrderByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/response/UserPageOrderByOperatorVo.java
index f60c524..361eea1 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/response/UserPageOrderByOperatorVo.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/response/UserPageOrderByOperatorVo.java
@@ -20,6 +20,9 @@ public class UserPageOrderByOperatorVo {
     @ApiModelProperty("订单号")
     private String orderCode;
 
+    @ApiModelProperty("支付流水号")
+    private String extOrderNo;
+
     @ApiModelProperty("名称")
     private String name;
 
diff --git a/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml
index 9a7b506..0f4e45e 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml
@@ -6,19 +6,23 @@
     <select id="pageProductByOperator"
             resultType="com.qniao.dam.api.query.order.user.response.UserPageOrderByOperatorVo">
         select
-            dao.id as orderId,
-            dao.order_code,
-            dao.create_time as orderTime,
-            dao.user_id,
-            daa.tid as userPhone,
-            dao.mi_id,
-            IFNULL(dami.`name`,dami.nick_name) as miName,
-            dao.name,
-            dao.settlement_amount
+        dao.id as orderId,
+        dao.order_code,
+        dao.create_time as orderTime,
+        dao.user_id,
+        daa.tid as userPhone,
+        dao.mi_id,
+        IFNULL(dami.`name`,dami.nick_name) as miName,
+        dao.name,
+        dao.settlement_amount,
+        dapco.ext_order_no
         from da_order as dao
-                 LEFT JOIN da_order_item as doi on doi.order_id=dao.id and doi.is_delete=0
-                 LEFT JOIN da_account as daa on daa.user_id=dao.user_id and daa.type=2 and daa.is_delete=0
-                 LEFT JOIN da_marriage_information as dami on dami.id=dao.mi_id
+        LEFT JOIN da_order_item as doi on doi.order_id=dao.id and doi.is_delete=0
+        LEFT JOIN da_payment_order as dapo on dapo.is_delete=0 and dapo.order_id=dao.id and dapo.`status`=3
+        LEFT JOIN da_payment_channel_order as dapco on dapco.is_delete=0 and dapco.txn_order_id=dapo.id and
+        dapco.`status`=2
+        LEFT JOIN da_account as daa on daa.user_id=dao.user_id and daa.type=2 and daa.is_delete=0
+        LEFT JOIN da_marriage_information as dami on dami.id=dao.mi_id
         where dao.is_delete=0
         <if test="queryParam.orderCode != null and queryParam.orderCode != '' ">
             AND dao.order_code LIKE CONCAT('%', TRIM(#{queryParam.orderCode}), '%')