From a443367ebe45f8dd7106eec85ce977fcacd499eb Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Wed, 19 Mar 2025 10:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=94=B6=E7=9B=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistent/dao/view/RevenueRewardViewDao.java        | 9 +++++----
 .../impl/RevenueRewardQueryServiceImpl.java              | 4 ++--
 .../mapper/revenuereward/RevenueRewardViewMapper.xml     | 7 ++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/RevenueRewardViewDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/RevenueRewardViewDao.java
index eef3fe8..59701c2 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/RevenueRewardViewDao.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/RevenueRewardViewDao.java
@@ -2,10 +2,7 @@ package com.qniao.dam.infrastructure.persistent.dao.view;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qniao.dam.api.query.revenuereward.user.request.UseGetRevenueRewardAbstractQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UserListMatchmakerRevenueRewardStatisticsQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UserPageRevenueRewardRecordByOperatorQueryParams;
-import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordQueryParams;
+import com.qniao.dam.api.query.revenuereward.user.request.*;
 import com.qniao.dam.api.query.revenuereward.user.response.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -28,4 +25,8 @@ public interface RevenueRewardViewDao {
 
     List<UserListMatchmakerRevenueRewardStatisticsVo> listMatchmakerRevenueRewardStatistics(@Param("queryParams") UserListMatchmakerRevenueRewardStatisticsQueryParams queryParams,
                                                                                             @Param("storeIdList") List<Long> storeIdList);
+
+    IPage<UserPageMatchmakerRevenueRewardRecordVo> pageMatchmakerRevenueRewardRecord(Page<Object> pageWithoutOrders,
+                                                                                     @Param("queryParams") UserListMatchmakerRevenueRewardRecordQueryParams queryParams,
+                                                                                     @Param("storeIdList") List<Long> storeIdList);
 }
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java
index e2d97d8..902b219 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java
@@ -182,10 +182,10 @@ public class RevenueRewardQueryServiceImpl implements RevenueRewardQueryService
             }
             if (CollUtil.isNotEmpty(storeIdList)) {
                 //查询
-
+                page = revenueRewardViewDao.pageMatchmakerRevenueRewardRecord(pageUtil.toPageWithoutOrders(), queryParams, storeIdList);
             }
         }
-        return null;
+        return page;
     }
 
     private List<RevenueRewardRecordExportVo> transformExport(List<UserPageRevenueRewardRecordByOperatorVo> recordList) {
diff --git a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml
index 9b0d76c..b990993 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml
@@ -165,7 +165,7 @@
             resultType="com.qniao.dam.api.query.revenuereward.user.response.UserListMatchmakerRevenueRewardStatisticsVo">
         SELECT
         dam.id as matchmakerId,
-        dam.`name`,
+        dam.`name` as matchmakerName,
         SUM(darrr.revenue) as revenue,
         SUM(JSON_EXTRACT(ext_info,'$.matchmakerOrderType')='1') as inviteMatchmakerNum
         from da_revenue_reward_record as darrr
@@ -186,4 +186,9 @@
         GROUP BY dam.id
         order by inviteMatchmakerNum desc
     </select>
+
+    <select id="pageMatchmakerRevenueRewardRecord"
+            resultType="com.qniao.dam.api.query.revenuereward.user.response.UserPageMatchmakerRevenueRewardRecordVo">
+
+    </select>
 </mapper>