From 2299d49c931ea120afe9b9b2a4a10bd060b46ee1 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Tue, 10 Mar 2026 11:16:23 +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

---
 .../dao/eso/EntrustServiceOrderDao.java       |  5 +++
 .../EntrustServiceOrderQueryServiceImpl.java  |  9 +++++-
 .../mapper/eso/EntrustServiceOrderDao.xml     | 31 +++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java
index 743deef..258a413 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByInitiatorQueryParams;
+import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByMatchmakerQueryParams;
 import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo;
+import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo;
 import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,4 +18,7 @@ import org.apache.ibatis.annotations.Param;
 public interface EntrustServiceOrderDao extends BaseMapper<EntrustServiceOrder> {
     IPage<UserPageEntrustServiceOrderByInitiatorVo> pageOrderByInitiator(Page<Object> pageWithoutOrders,
                                                                          @Param("queryParams") PageEntrustServiceOrderByInitiatorQueryParams queryParams);
+
+    IPage<UserPageEntrustServiceOrderByMatchmakerVo> pageOrderByMatchmaker(Page<Object> pageWithoutOrders,
+                                                                           @Param("queryParams") PageEntrustServiceOrderByMatchmakerQueryParams queryParams);
 }
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
index 3659c5c..d569dc3 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
@@ -58,6 +58,13 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ
     @Override
     public IPage<UserPageEntrustServiceOrderByMatchmakerVo> pageOrderByMatchmaker(PageUtil pageUtil,
                                                                                   PageEntrustServiceOrderByMatchmakerQueryParams queryParams) {
-        return null;
+        IPage<UserPageEntrustServiceOrderByMatchmakerVo> page = entrustServiceOrderDao.pageOrderByMatchmaker(pageUtil.toPageWithoutOrders(), queryParams);
+        if (page.getSize() > 0) {
+            page.getRecords().forEach(record -> {
+                record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId()));
+                record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId()));
+            });
+        }
+        return page;
     }
 }
\ No newline at end of file
diff --git a/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml b/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml
index 71b3c64..7fd1710 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml
@@ -31,4 +31,35 @@
         ORDER BY daeso.create_time desc
     </select>
 
+    <select id="pageOrderByMatchmaker"
+            resultType="com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo">
+        SELECT
+        daeso.id,
+        daeso.initiator_mi_id,
+        daeso.initiator_user_id,
+        daeso.target_user_id,
+        daeso.target_mi_id,
+        daeso.matchmaker_id,
+        daeso.reward_amount,
+        daeso.associate_order_id,
+        dao.order_code as associateOrderCode,
+        daeso.paid_amount,
+        daeso.`status`,
+        daeso.payment_status,
+        daeso.create_time
+        from da_entrust_service_order as daeso
+        LEFT JOIN da_order as dao on dao.id=daeso.associate_order_id
+        where daeso.is_delete=0
+        <if test="queryParams.queryMatchmakerId != null">
+            and daeso.matchmaker_id = #{queryParams.queryMatchmakerId}
+        </if>
+        <if test="queryParams.status != null">
+            and daeso.`status` = #{queryParams.status}
+        </if>
+        <if test="queryParams.paymentStatus != null">
+            and daeso.payment_status = #{queryParams.paymentStatus}
+        </if>
+        ORDER BY daeso.create_time desc
+    </select>
+
 </mapper>