From bfbb03c514b9e60485ea13d5679e6af2e8aeb354 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 23 Nov 2022 09:44:23 +0800
Subject: [PATCH] 20221117

---
 src/main/resources/mapper/dapp/DappMemberDao.xml |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 50e77e8..9cbf160 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -18,10 +18,12 @@
                c.username refererName,
                b.total_amount totalAmount,
                b.frozen_amount frozenAmount,
-               b.available_amount availableAmount
+               b.available_amount availableAmount,
+               d.address coinAddress
                from dapp_member a
         left join dapp_wallet_coin b on a.id = b.member_id
         left join dapp_member c on a.referer_id = c.invite_id
+        left join member_coin_address d on d.member_id = a.id and d.is_biyict = 1 and d.tag = 'TRC20'
         <where>
 <!--            <if test="record.currentUser != null">-->
 <!--                and referer_id = (select invite_id from dapp_user_member_relate where user_id=#{record.currentUser})-->
@@ -44,6 +46,9 @@
             </if>
             <if test="record.username != null and record.username != ''">
                 and a.username like CONCAT('%',#{record.username},'%')
+            </if>
+            <if test="record.coinAddress != null and record.coinAddress != ''">
+                and d.address like CONCAT('%',#{record.coinAddress},'%')
             </if>
         </where>
         order by create_time desc
@@ -285,6 +290,7 @@
         from dapp_message a
         left join dapp_member b on b.id = a.member_id
         <where>
+            a.back_message is null
             <if test="record.username !='' and record.username != null">
                 and b.username = #{record.username}
             </if>
@@ -330,4 +336,23 @@
         (a.id in (select id from dapp_member where FIND_IN_SET(#{record.inviteId}, referer_ids)))
         order  by a.create_time desc
     </select>
+
+    <select id="showMessageListInPage" resultType="cc.mrbird.febs.dapp.entity.DappMessageEntity">
+        select
+        a.*,b.username username
+        from dapp_message a
+        left join dapp_member b on b.id = a.member_id
+        where a.member_id = #{record.memberId}
+        order by create_time desc
+    </select>
+
+    <select id="getMessageListInPage" resultType="cc.mrbird.febs.dapp.vo.ApiMessageListVo">
+        select
+            a.message message,
+            a.back_message backMessage,
+            a.create_time createTime
+        from dapp_message a
+        where a.member_id = #{record.memberId}
+        order by a.create_time desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1