From d0dd32f897c2b6786f4da8b860b7dcb58a71ac62 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 16:11:44 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/dapp/DappAchieveMemberTreeDao.xml |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappAchieveMemberTreeDao.xml b/src/main/resources/mapper/dapp/DappAchieveMemberTreeDao.xml
index be96535..2f3a29a 100644
--- a/src/main/resources/mapper/dapp/DappAchieveMemberTreeDao.xml
+++ b/src/main/resources/mapper/dapp/DappAchieveMemberTreeDao.xml
@@ -9,23 +9,31 @@
 
     <select id="selectMatrixTreeByTopNode" resultType="cc.mrbird.febs.dapp.entity.DappAchieveMemberTreeEntity">
         select * from dapp_achieve_member_tree
-        where top_node=#{memberId} and has_money=1
+        where top_node=#{memberId}
+        <if test="hasMoney != null">
+            and has_money=#{hasMoney}
+        </if>
     </select>
 
     <select id="selectNodeByDeep" resultType="cc.mrbird.febs.dapp.entity.DappAchieveMemberTreeEntity">
-        select * from dapp_achieve_member_tree
-        where tree_node=#{memberId} and deep=#{deep}
+        select a.*, b.invite_id, b.address from dapp_achieve_member_tree a, dapp_member b
+        where a.tree_node=#{memberId} and a.deep=#{deep} and a.tree_node=b.id
     </select>
 
-    <select id="resetMatrixTree" resultType="java.lang.Integer">
+    <select id="selectMatrixChildNode" resultType="cc.mrbird.febs.dapp.entity.DappAchieveMemberTreeEntity">
+        select a.*, b.invite_id, b.address from dapp_achieve_member_tree a, , dapp_member b
+        where a.top_node=#{topNode} and a.parent_node=#{parentNode} and a.tree_node=b.id
+    </select>
+
+    <update id="resetMatrixTree">
         update dapp_achieve_member_tree
         set has_money=2
         where top_node=#{memberId} and deep in (2,3)
-    </select>
+    </update>
 
-    <select id="reentryMoney" resultType="java.lang.Integer">
+    <update id="reentryMoney">
         update dapp_achieve_member_tree
         set has_money=1
         where tree_node=#{memberId}
-    </select>
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1