From 9fe13ab6626a7abadcd0d67ca780363cd92cb024 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 10 Nov 2020 15:42:22 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 6 ++++++
src/main/resources/templates/febs/views/modules/member/member.html | 3 +++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 6 +++++-
src/main/resources/mapper/modules/MemberWalletCoinMapper.xml | 9 +++++++++
src/main/java/com/xcong/excoin/modules/member/mapper/MemberWalletCoinMapper.java | 3 +++
5 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index 0a848e7..12a0dc2 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -178,6 +178,12 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(exist = false)
private Date endTime;
+
+ @TableField(exist = false)
+ private BigDecimal usdtAmount;
+
+ @TableField(exist = false)
+ private BigDecimal rfncAmount;
/**
* 查询条件：账号类型
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberWalletCoinMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberWalletCoinMapper.java
index c522bfd..88c78cd 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberWalletCoinMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberWalletCoinMapper.java
@@ -7,6 +7,7 @@
import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
import java.math.BigDecimal;
+import java.util.HashMap;
public interface MemberWalletCoinMapper extends BaseMapper<MemberWalletCoinEntity> {
@@ -15,4 +16,6 @@
TdCoinWallet selectTdCoinWalletByAddress(@Param("address") String address, @Param("symbol") String symbol);
int updateTdCoinWalletAvaliable(@Param("money") BigDecimal money, @Param("address") String address);
+
+ HashMap<String, Object> selectMemberWalletCoinByMemberId(@Param("memberId") Long memberId);
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 73aff17..add560d 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -187,7 +187,11 @@
String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
memberEntitys.setRealName(firstName+secondName);
- }
+
+ HashMap<String, Object> coinMap = memberWalletCoinMapper.selectMemberWalletCoinByMemberId(memberEntitys.getId());
+ memberEntitys.setUsdtAmount((BigDecimal) coinMap.get("usdt"));
+ memberEntitys.setRfncAmount((BigDecimal) coinMap.get("rfnc"));
+ }
}
return selectMemberListInPage;
}
diff --git a/src/main/resources/mapper/modules/MemberWalletCoinMapper.xml b/src/main/resources/mapper/modules/MemberWalletCoinMapper.xml
index 761c431..24d9634 100644
--- a/src/main/resources/mapper/modules/MemberWalletCoinMapper.xml
+++ b/src/main/resources/mapper/modules/MemberWalletCoinMapper.xml
@@ -17,4 +17,13 @@
set available_balance=available_balance+#{money}
where address=#{address}
</update>
+
+ <select id="selectMemberWalletCoinByMemberId" resultType="java.util.HashMap">
+ select
+ member_id,
+ MAX(case wallet_code when 'USDT' then available_balance else 0 end) usdt,
+ MAX(case wallet_code when 'RFNC' then available_balance else 0 end) rfnc
+ from member_wallet_coin
+ where member_id=#{memberId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index 0a6ec5b..f340fd7 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -116,6 +116,7 @@
elem: $view.find('table'),
id: 'userTable',
url: ctx + 'member/getList',
+ totalRow : true,
cols: [[
{field: 'phone', title: '手机号', minWidth: 150,align:'left'},
{field: 'email', title: '邮箱', minWidth: 100,align:'left'},
@@ -125,6 +126,8 @@
return '<a lay-event="examine" shiro:hasPermission="user:update">'+d.inviteId+'</a>'
}, minWidth: 80,align:'center'},
{field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
+ {field: 'usdtAmount', title: 'USDT', minWidth: 80,align:'center', totalRow: true},
+ {field: 'rfncAmount', title: 'RFNC', minWidth: 80,align:'center', totalRow: true},
// {field: 'accountType', title: '账号类型',
// templet: function (d) {
// if (d.accountType === 2) {
--
Gitblit v1.9.1