From 204d94d7350affc6dc9407708c235203d9941671 Mon Sep 17 00:00:00 2001
From: 188814092560 <coding@1484909845896140.onaliyun.com>
Date: Tue, 18 Mar 2025 22:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RevenueRewardUserQueryController.java     | 11 +++-
 .../revenuereward/RevenueRewardViewMapper.xml | 65 +++++++++++--------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java
index cc81f51..42374e2 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java
@@ -84,11 +84,18 @@ public class RevenueRewardUserQueryController {
     }
 
     @GetMapping("list/matchmaker-revenue-reward-statistics")
-    @ApiOperation("获取红娘收益数据记录")
+    @ApiOperation("获取红娘收益数据统计")
     public List<UserListMatchmakerRevenueRewardStatisticsVo> userListMatchmakerRevenueRewardStatistics(UserListMatchmakerRevenueRewardStatisticsQueryParams queryParams,
-                                                                                                       @RequestParam("userId") Long userId,
                                                                                                        @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) {
         queryParams.setQueryOrgId(orgId);
         return revenueRewardQueryService.listMatchmakerRevenueRewardStatistics(queryParams);
     }
+
+    @GetMapping("list/matchmaker-revenue-reward-record")
+    @ApiOperation("获取红娘收益数据记录")
+    public List<UserListMatchmakerRevenueRewardRecordVo> userListMatchmakerRevenueRewardRecord(UserListMatchmakerRevenueRewardStatisticsQueryParams queryParams,
+                                                                                               @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) {
+        queryParams.setQueryOrgId(orgId);
+        return revenueRewardQueryService.listMatchmakerRevenueRewardStatistics(queryParams);
+    }
 }
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 6c91300..e40171e 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
@@ -108,20 +108,21 @@
     <select id="listAssociateOrderRecord"
             resultType="com.qniao.dam.api.query.revenuereward.user.response.RevenueRewardAssociateOrderRecordVo">
         select
-            darraor.revenue_reward_record_id,
-            darraor.associate_order_id,
-            dao.order_code,
-            darraor.associate_order_amount,
-            dao.paid_time as orderTime,
-            dapco.ext_order_no as wechatOrderNo,
-            dao.order_belong_name as serviceUserName,
-            daa.tid as serviceUserPhone
+        darraor.revenue_reward_record_id,
+        darraor.associate_order_id,
+        dao.order_code,
+        darraor.associate_order_amount,
+        dao.paid_time as orderTime,
+        dapco.ext_order_no as wechatOrderNo,
+        dao.order_belong_name as serviceUserName,
+        daa.tid as serviceUserPhone
         from da_revenue_reward_associate_order_record as darraor
-                 LEFT JOIN da_order as dao on darraor.associate_order_id=dao.id
-                 LEFT JOIN da_marriage_information as dami on dami.id=dao.id
-                 LEFT JOIN da_payment_order as dapo on dapo.is_delete=0 and dapo.`status`=3 and dapo.order_id=dao.id
-                 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.is_delete=0 and daa.user_id=dao.user_id and daa.type=2
+        LEFT JOIN da_order as dao on darraor.associate_order_id=dao.id
+        LEFT JOIN da_marriage_information as dami on dami.id=dao.id
+        LEFT JOIN da_payment_order as dapo on dapo.is_delete=0 and dapo.`status`=3 and dapo.order_id=dao.id
+        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.is_delete=0 and daa.user_id=dao.user_id and daa.type=2
         where darraor.revenue_reward_record_id in
         <foreach collection="revenueRewardRecordIdList" item="revenueRewardRecordId" open="(" close=")" separator=",">
             #{revenueRewardRecordId}
@@ -131,14 +132,14 @@
     <select id="getRevenueRewardAbstractByOperator"
             resultType="com.qniao.dam.api.query.revenuereward.user.response.UserGetRevenueRewardAbstractByOperatorVo">
         select
-            SUM(IFNULL(darrr.revenue,0)) as totalRevenue,
-            SUM(IFNULL(darrr.earnings,0)) as totalEarnings
+        SUM(IFNULL(darrr.revenue,0)) as totalRevenue,
+        SUM(IFNULL(darrr.earnings,0)) as totalEarnings
         from da_revenue_reward as darr
-                 LEFT JOIN da_revenue_reward_record as darrr on darrr.revenue_reward_id=darr.id
-                 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 dam.store_id=das.id
-                LEFT JOIN da_organization dao1 on dao1.id= das.org_id
-                LEFT JOIN da_organization dao2 on dao2.id= das.operation_center_org_id
+        LEFT JOIN da_revenue_reward_record as darrr on darrr.revenue_reward_id=darr.id
+        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 dam.store_id=das.id
+        LEFT JOIN da_organization dao1 on dao1.id= das.org_id
+        LEFT JOIN da_organization dao2 on dao2.id= das.operation_center_org_id
         where darr.is_delete=0 and darr.identity_type=1
         <if test="queryParams.tradeScene != null">
             and darrr.trade_scene = #{queryParams.tradeScene}
@@ -163,16 +164,24 @@
     <select id="listMatchmakerRevenueRewardStatistics"
             resultType="com.qniao.dam.api.query.revenuereward.user.response.UserListMatchmakerRevenueRewardStatisticsVo">
         SELECT
-            dam.id as matchmakerId,
-            dam.`name`,
-            SUM(darrr.revenue) as revenue,
-            SUM(JSON_EXTRACT(ext_info,'$.matchmakerOrderType')='1') as inviteMatchmakerNum
+        dam.id as matchmakerId,
+        dam.`name`,
+        SUM(darrr.revenue) as revenue,
+        SUM(JSON_EXTRACT(ext_info,'$.matchmakerOrderType')='1') as inviteMatchmakerNum
         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
-                 INNER JOIN da_revenue_reward_associate_order_record as darrasor on darrasor.revenue_reward_record_id=darrr.id
-                 INNER JOIN da_order as dao on dao.is_delete=0 and dao.id=darrasor.associate_order_id
-                 INNER JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=darr.user_id
+        INNER JOIN da_revenue_reward as darr on darr.is_delete=0 and darr.id=darrr.revenue_reward_id
+        INNER JOIN da_revenue_reward_associate_order_record as darrasor on darrasor.revenue_reward_record_id=darrr.id
+        INNER JOIN da_order as dao on dao.is_delete=0 and dao.id=darrasor.associate_order_id
+        INNER JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=darr.user_id
         where 1=1
+        <if test="queryParams.revenueTimeFrom != null and queryParams.revenueTimeTo != null">
+            and darrr.create_time BETWEEN #{queryParams.revenueTimeFrom} and #{queryParams.revenueTimeTo}
+        </if>
+        <if test="storeIdList.size > 0">
+            <foreach collection="storeIdList" item="storeId" open="(" close=")" separator=",">
+                #{storeId}
+            </foreach>
+        </if>
         GROUP BY dam.id;
     </select>
 </mapper>