From c906b557bd400065c06605fd9d889bbb1bf1bc91 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Nov 2022 15:49:20 +0800
Subject: [PATCH] 20221021
---
src/main/resources/templates/febs/views/dapp/member.html | 25 ++++++++++++-------------
src/main/resources/mapper/dapp/DappMemberDao.xml | 7 ++++++-
src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java | 9 +++++++++
3 files changed, 27 insertions(+), 14 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 009a7da..ad041ac 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
@@ -107,4 +107,13 @@
@TableField(exist = false)
private BigDecimal coinNumber;
+
+ @TableField(exist = false)
+ private BigDecimal totalAmount;
+
+ @TableField(exist = false)
+ private BigDecimal frozenAmount;
+
+ @TableField(exist = false)
+ private BigDecimal availableAmount;
}
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 356652b..3121916 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -14,7 +14,12 @@
</select>
<select id="selectInPage" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
- select * from dapp_member a
+ select a.*,
+ b.total_amount totalAmount,
+ b.frozen_amount frozenAmount,
+ b.available_amount availableAmount
+ from dapp_member a
+ left join dapp_wallet_coin b on a.id = b.member_id
<where>
<!-- <if test="record.currentUser != null">-->
<!-- and referer_id = (select invite_id from dapp_user_member_relate where user_id=#{record.currentUser})-->
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 1c4da81..fd363e5 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -295,9 +295,9 @@
id: 'memberTable',
url: ctx + 'member/list',
cols: [[
- {type: 'checkbox'},
- {type: 'numbers'},
- {field: 'username', title: '用户名', minWidth: 130},
+ // {type: 'checkbox'},
+ // {type: 'numbers'},
+ {field: 'username', title: '用户名', minWidth: 120},
{field: 'identity', title: '会员',
templet: function (d) {
if (d.identity === 'LEVEL_TM') {
@@ -307,7 +307,7 @@
}else{
return ''
}
- }, minWidth: 100, align: 'center'},
+ }, minWidth: 80, align: 'center'},
{field: 'identity', title: '等级',
templet: function (d) {
if (d.identity === 'LEVEL_TM') {
@@ -317,12 +317,11 @@
}else{
return ''
}
- }, minWidth: 150, align: 'center'},
- // {field: 'address', title: '地址', minWidth: 130},
- // {title: '余额(USDT)', templet: '#balance', minWidth: 120},
- // {title: '授权列表', templet: '#approve-list', minWidth: 110},
- // {field: 'chainType', title: '所属链', minWidth: 130},
- {field: 'inviteId', title: '邀请码', minWidth: 130},
+ }, minWidth: 130, align: 'center'},
+ {field: 'totalAmount', title: '总金额', minWidth: 100},
+ {field: 'availableAmount', title: '可用余额', minWidth: 100},
+ {field: 'frozenAmount', title: '冻结金额', minWidth: 100},
+ {field: 'inviteId', title: '邀请码', minWidth: 100},
{field: 'refererId', title: '上级邀请码', minWidth: 130},
{field: 'createTime', title: '创建时间', minWidth: 180},
,{field: 'accountStatus', title: '账户状态',templet: '#isAccountStatus', minWidth: 180},
@@ -339,7 +338,7 @@
}else{
return ''
}
- },minWidth: 180,align:'center'},
+ },minWidth: 130,align:'center'},
{title: '重置资金密码',
templet: function (d) {
if(d.identity != 'LEVEL_TM' && d.identity != '' && d.identity != null){
@@ -347,11 +346,11 @@
}else{
return ''
}
- },minWidth: 180,align:'center'},
+ },minWidth: 130,align:'center'},
{title: '后台拨付',
templet: function (d) {
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="payUsdt" shiro:hasPermission="user:update">拨付</button>'
- },minWidth: 180,align:'center'},
+ },minWidth: 130,align:'center'},
]]
});
}
--
Gitblit v1.9.1