From 3a395a14a255746f5e44bd01f366d9426591fa57 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Wed, 4 Dec 2024 10:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=A8=98=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../revenuereward/RevenueRewardViewMapper.xml |  5 ++--
 .../walletaccount/WalletAccountViewMapper.xml | 26 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

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 6341bb8..bdfe0f9 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
@@ -60,6 +60,7 @@
         select
         darrr.id as revenueRewardRecordId,
         darrr.create_time,
+        dam.type as matchmakerType,
         dam.`name` as revenueOwnerName,
         dam.phone as revenueOwnerPhone,
         darrr.trade_type,
@@ -68,8 +69,8 @@
         darrr.revenue,
         darrr.service_pct,
         darrr.earnings
-        from da_revenue_reward as darr
-        LEFT JOIN da_revenue_reward_record as darrr on darrr.revenue_reward_id=darr.id
+        from da_revenue_reward_record as darrr
+        INNER JOIN da_revenue_reward as darr 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
         where darr.is_delete=0 and darr.identity_type=1
         <if test="queryParams.revenueOwnerName != null and queryParams.revenueOwnerName != '' ">
diff --git a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml
index a970cbe..4b46c52 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml
@@ -33,19 +33,19 @@
     <select id="pageWalletAccountRecordByOperator"
             resultType="com.qniao.dam.api.query.walletaccount.user.response.UsePageWalletAccountRecordByOperatorVo">
         select
-            dawar.associate_id,
-            dawar.trade_type,
-            dawar.is_income,
-            dawar.create_time,
-            dam.`name`,
-            dam.phone,
-            dam.type as matchmakerType,
-            dawar.trade_amount,
-            dawar.original_balance,
-            dawar.current_balance
-        from da_wallet_account as dawa
-                 LEFT JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=dawa.user_id
-                 LEFT JOIN da_wallet_account_record as dawar on dawar.wallet_account_id=dawa.id
+        dawar.associate_id,
+        dawar.trade_type,
+        dawar.is_income,
+        dawar.create_time,
+        dam.`name`,
+        dam.phone,
+        dam.type as matchmakerType,
+        dawar.trade_amount,
+        dawar.original_balance,
+        dawar.current_balance
+        from da_wallet_account_record as dawar
+        INNER JOIN da_wallet_account as dawa on dawar.wallet_account_id=dawa.id
+        LEFT JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=dawa.user_id
         where dawa.is_delete=0 and dawa.identity_type=1
         <if test="queryParams.name != null and queryParams.name != '' ">
             AND dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.name}), '%')