From efd6a864ab205ed831b229fbddee93b45058a04c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 21 Nov 2022 11:08:59 +0800
Subject: [PATCH] 20221117

---
 src/main/resources/templates/febs/views/dapp/member.html       |   31 ++++++++++++++++++-------------
 src/main/resources/mapper/dapp/DappMemberDao.xml               |    9 +++++++--
 src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java |    3 +++
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
index 054db68..8d044e2 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
@@ -119,4 +119,7 @@
 
     @TableField(exist = false)
     private String refererName;
+
+    @TableField(exist = false)
+    private String coinAddress;
 }
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 50e77e8..a0427e3 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -18,15 +18,17 @@
                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
         <where>
 <!--            <if test="record.currentUser != null">-->
 <!--                and referer_id = (select invite_id from dapp_user_member_relate where user_id=#{record.currentUser})-->
 <!--            </if>-->
-
+            and d.is_biyict = 1 and d.tag = 'TRC20'
             <if test="record.description!=null and record.description!=''">
                 and a.id in (select id from dapp_member where FIND_IN_SET(#{record.description}, referer_ids))
             </if>
@@ -45,6 +47,9 @@
             <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
     </select>
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 1ebe2bd..8d6cf8f 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -14,6 +14,12 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">钱包地址</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" name="coinAddress" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
                                         <label class="layui-form-label layui-form-label-sm">状态</label>
                                         <div class="layui-input-inline">
                                             <select name="accountStatus">
@@ -122,17 +128,13 @@
 <!--    <span><a lay-event="freshBalance">刷新</a></span>-->
 <!--    <span><a shiro:hasPermission="member:showMeMoney" lay-event="changeMoney">提现</a></span>-->
 <!--</script>-->
-<!--<script type="text/html" id="approve-list">-->
-<!--    {{# if(d.chainType == 'TRX') { }}-->
-<!--    <a href="https://tronscan.io/#/address/{{d.address}}" target="_blank">{{d.approveCnt}}</a>-->
-<!--    {{# } else if (d.chainType == 'ETH') { }}-->
-<!--    <a href="https://etherscan.io/address/{{d.address}}" target="_blank">{{d.approveCnt}}</a>-->
-<!--    {{# } else if (d.chainType == 'BSC') { }}-->
-<!--    <a href="https://bscscan.com/address/{{d.address}}" target="_blank">{{d.approveCnt}}</a>-->
-<!--    {{# } else { }}-->
-<!--    <span>-</span>-->
-<!--    {{# } }}-->
-<!--</script>-->
+<script type="text/html" id="approve-list">
+    {{# if(d.coinAddress != '') { }}
+    <a href="https://tronscan.io/#/address/{{d.coinAddress}}" target="_blank">{{d.coinAddress}}</a>
+    {{# } else { }}
+    <span>-</span>
+    {{# } }}
+</script>
 <!--<script type="text/html" id="member-option">-->
 <!--    {{#-->
 <!--        var accountStatus = {-->
@@ -348,12 +350,12 @@
                                 return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="identitySet" shiro:hasPermission="user:update"><span>'+d.identity+'</span></button>'
                             }
                         },minWidth: 130,align:'center'},
+
+                    {title: '授权列表', templet: '#approve-list', minWidth: 350},
                     {field: 'totalAmount', title: '总金额', minWidth: 100},
                     {field: 'availableAmount', title: '可用余额', minWidth: 100},
                     {field: 'frozenAmount', title: '冻结金额', minWidth: 100},
-                    {field: 'inviteId', title: '邀请码', minWidth: 100},
                     {field: 'refererName', title: '上级', minWidth: 130},
-                    {field: 'createTime', title: '创建时间', minWidth: 180},
                     ,{field: 'accountStatus', title: '账户状态',templet: '#isAccountStatus', minWidth: 180},
                     // {title: '账户状态', templet: '#user-status', minWidth: 120},
                     // {title: '是否可兑换', templet: '#change-able', minWidth: 130},
@@ -381,6 +383,8 @@
                         templet: function (d) {
                                 return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="payUsdt" shiro:hasPermission="user:update">拨付</button>'
                         },minWidth: 130,align:'center'},
+                    {field: 'inviteId', title: '邀请码', minWidth: 100},
+                    {field: 'createTime', title: '创建时间', minWidth: 180},
                 ]]
             });
         }
@@ -405,6 +409,7 @@
         function getQueryParams() {
             return {
                 username: $searchForm.find('input[name="username"]').val().trim(),
+                coinAddress: $searchForm.find('input[name="coinAddress"]').val().trim(),
                 changeAble: $searchForm.find("select[name='changeAble']").val(),
                 accountStatus: $searchForm.find("select[name='accountStatus']").val(),
                 withdrawAble: $searchForm.find("input[name='withdrawAble']").val(),

--
Gitblit v1.9.1