From a268b1d72d74b7501b96803778fb2d95a5d4e7ae Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Wed, 19 Mar 2025 11:41:42 +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

---
 ...erPageMatchmakerRevenueRewardRecordVo.java |  3 --
 .../revenuereward/RevenueRewardViewMapper.xml | 50 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageMatchmakerRevenueRewardRecordVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageMatchmakerRevenueRewardRecordVo.java
index 2b95616..4141a6f 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageMatchmakerRevenueRewardRecordVo.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageMatchmakerRevenueRewardRecordVo.java
@@ -58,9 +58,6 @@ public class UserPageMatchmakerRevenueRewardRecordVo {
     @ApiModelProperty("内容")
     private String content;
 
-    @ApiModelProperty("凭证Url")
-    private String proofUrl;
-
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
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 b990993..01a9649 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
@@ -189,6 +189,54 @@
 
     <select id="pageMatchmakerRevenueRewardRecord"
             resultType="com.qniao.dam.api.query.revenuereward.user.response.UserPageMatchmakerRevenueRewardRecordVo">
-
+        SELECT
+            dam.`name` as revenueOwnerName,
+            dam.user_id as matchmakerUserId,
+            daorg.full_name as storeName,
+            dam.type as matchmakerType,
+            darrr.trade_type,
+            darrr.revenue,
+            darrr.revenue_pct,
+            darrr.service_pct,
+            darrr.earnings,
+            darrr.total_associate_order_amount,
+            darrr.content,
+            darrr.create_time,
+            dami.nick_name as serviceUserName
+        from da_revenue_reward_record as darrr
+                 INNER JOIN da_revenue_reward as darr on darr.is_delete=0 and darr.id=darrr.revenue_reward_id
+                 LEFT JOIN da_revenue_reward_associate_order_record as darrasor on darrasor.revenue_reward_record_id=darrr.id
+                 LEFT JOIN da_order as dao on dao.is_delete=0 and dao.id=darrasor.associate_order_id
+                 LEFT JOIN da_marriage_information as dami on dami.id=dao.mi_id
+                 LEFT JOIN da_user_marriage_information as daumi on daumi.is_delete=0 and daumi.mi_id=dao.mi_id
+                 LEFT JOIN da_account daa on daa.is_delete=0 and daa.user_id=daumi.user_id and daa.type=2
+                 LEFT JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=darr.user_id
+                 LEFT JOIN da_store as das on das.id=dam.store_id
+                 LEFT JOIN da_organization as daorg on daorg.id=das.org_id
+        where darrr.trade_scene=1
+        <if test="queryParams.revenueTimeFrom != null and queryParams.revenueTimeTo != null">
+            and darrr.create_time BETWEEN #{queryParams.revenueTimeFrom} and #{queryParams.revenueTimeTo}
+        </if>
+        <if test="queryParams.storeId != null">
+            and dam.store_id = #{queryParams.storeId}
+        </if>
+        <if test="queryParams.tradeType != null">
+            and darrr.trade_type = #{queryParams.tradeType}
+        </if>
+        <if test="queryParams.matchmakerName != null and queryParams.matchmakerName != '' ">
+            AND dam.name LIKE CONCAT('%', TRIM(#{queryParams.matchmakerName}), '%')
+        </if>
+        <if test="queryParams.serviceUserInfo != null and queryParams.serviceUserInfo != '' ">
+            AND (dami.nick_name LIKE CONCAT('%', TRIM(#{queryParams.serviceUserInfo}), '%') or
+            daa.tid LIKE CONCAT('%', TRIM(#{queryParams.serviceUserInfo}), '%'))
+        </if>
+        <if test="storeIdList.size > 0">
+            and dam.store_id in
+            <foreach collection="storeIdList" item="storeId" open="(" close=")" separator=",">
+                #{storeId}
+            </foreach>
+        </if>
+        GROUP BY darrr.id
+        order by darrr.create_time desc
     </select>
 </mapper>