From 9ef1f7389587bd35f26bb96935a788784f57cb07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 01 Dec 2020 14:35:34 +0800
Subject: [PATCH] 20201201
---
src/main/resources/templates/febs/views/modules/member/withdrawCoin.html | 26 +++++++++++---------------
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 12 ++++++------
2 files changed, 17 insertions(+), 21 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 59cc90e..e1ac069 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
@@ -437,9 +437,9 @@
}
// 转币 需要扣除手续费
amount = amount.subtract(selectById.getFeeAmount());
- if("ROC".equals(symbol) && !"Y".equals(selectById.getIsInside())){
+ if("SER".equals(symbol) && !"Y".equals(selectById.getIsInside())){
// 如果是ROC 则自动转
- String transfer = RocService.transfer(amount, address, "ROC");
+ String transfer = RocService.transfer(amount, address, "SER");
if(!"success".equals(transfer)){
FebsResponse febsResponse = new FebsResponse();
return febsResponse.fail().message(transfer);
@@ -787,7 +787,7 @@
//USDT充币总额+USDT提币总额
String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT");
- String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"ROC");
+ String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"SER");
memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
memberInfoDetailVo.setChargeCoinRoc(totalAmountUsdtBRoc == null ? 0 : Double.parseDouble(totalAmountUsdtBRoc));
String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);
@@ -824,7 +824,7 @@
//账户金额
String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT");
- String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC");
+ String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"SER");
memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc));
//String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);
@@ -1352,7 +1352,7 @@
//USDT充币总额+USDT提币总额
String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT");
- String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"ROC");
+ String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"SER");
memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
memberInfoDetailVo.setChargeCoinRoc(totalAmountUsdtBRoc == null ? 0 : Double.parseDouble(totalAmountUsdtBRoc));
String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);
@@ -1389,7 +1389,7 @@
//账户金额
String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT");
- String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC");
+ String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"SER");
memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc));
//String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);
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 6a721da..1847ca1 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -62,12 +62,9 @@
<!-- <span shiro:lacksPermission="coin:check">-->
<!-- <span class="layui-badge-dot febs-bg-orange"></span> 无权限-->
<!-- </span>-->
- {{# if(d.status === 1) { }}
<a lay-event="confirm" shiro:hasPermission="coin:check" >确认</a>
<a lay-event="cancel" shiro:hasPermission="coin:check" >拒绝</a>
- {{# } else { }}
- {{# } }}
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
@@ -184,18 +181,17 @@
return '<span style="color:red;">拒绝</span>'
}
},minWidth: 100,align:'center'},
- // {title: '操作', toolbar: '#user-option'
- // templet: function (d) {
- // if (d.status === 1) {
- // return '<a lay-event="confirm" shiro:hasPermission="coin:check">确认</a>'
- // +'<i class="layui-icon febs-edit-area febs-blue"></i>'
- // +'<a lay-event="cancel" shiro:hasPermission="coin:check">拒绝</a>'
- // +'<a lay-event="examine" >查看</a>'
- // }else {
- // return '<a lay-event="examine" >查看</a>'
- // }
- // }
- // ,minWidth: 200,align:'center'}
+ {title: '操作', toolbar: '#user-option',templet: function (d) {
+ if (d.status === 1) {
+ return '<a lay-event="confirm" shiro:hasPermission="coin:check">确认</a>'
+ +'<i class="layui-icon febs-edit-area febs-blue"></i>'
+ +'<a lay-event="cancel" shiro:hasPermission="coin:check">拒绝</a>'
+ +'<a lay-event="examine" >查看</a>'
+ }else {
+ return '<a lay-event="examine" >查看</a>'
+ }
+ }
+ ,minWidth: 200,align:'center'}
]]
});
}
--
Gitblit v1.9.1