From d15555767aee94413eaf36f61cf482ae4a421c07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Jul 2020 18:45:16 +0800
Subject: [PATCH] 20200714 代码提交
---
src/main/resources/templates/febs/views/modules/member/withdrawCoin.html | 9 +++++----
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 10 ++++++++++
src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java | 4 ++++
3 files changed, 19 insertions(+), 4 deletions(-)
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 b0c39a3..f3e672d 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
@@ -386,7 +386,17 @@
public IPage<MemberCoinWithdrawVo> findmemberWithdrawCoinListInPage(
MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+
IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findmemberWithdrawCoinListInPage(page, memberCoinWithdrawEntity);
+ List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
+ BigDecimal amount = memberCoinWithdrawVo.getAmount();
+ BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
+ BigDecimal subtract = amount.subtract(feeAmount);
+ memberCoinWithdrawVo.setRealAmount(subtract);
+ }
+ }
return findmemberQuickBuySaleListInPage;
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java b/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java
index 80e9a90..0645723 100644
--- a/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java
@@ -37,6 +37,10 @@
*/
private BigDecimal amount;
/**
+ * 到账金额
+ */
+ private BigDecimal realAmount;
+ /**
* 手续费
*/
private BigDecimal feeAmount;
diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
index 99d8e6f..f275e9c 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -149,10 +149,6 @@
}, minWidth: 200,align:'center'},
{field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
{field: 'symbol', title: '币种', minWidth: 100,align:'center'},
- {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},
- {field: 'address', title: '提币地址', minWidth: 300,align:'center'},
- {field: 'feeAmount', title: '提币手续费', minWidth: 100,align:'center', totalRow: true},
- {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},
{field: 'isInside', title: '内部转账',
templet: function (d) {
if (d.isInside === 'Y') {
@@ -161,6 +157,11 @@
return '<span style="color:green;">否</span>'
}
},minWidth: 100,align:'center'},
+ {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},
+ {field: 'realAmount', title: '到账金额', minWidth: 120,align:'center' ,totalRow: true},
+ {field: 'address', title: '提币地址', minWidth: 300,align:'center'},
+ {field: 'feeAmount', title: '提币手续费', minWidth: 100,align:'center', totalRow: true},
+ {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
--
Gitblit v1.9.1