From 5f3f7f33303c1b96a36de3b91155e49f3a56ff09 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 15 Nov 2020 20:36:41 +0800
Subject: [PATCH] Merge branches 'cpv-back' and 'roc-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage into cpv-back
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 9a0677e..c81723e 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
@@ -436,9 +436,9 @@
}
// 转币 需要扣除手续费
amount = amount.subtract(selectById.getFeeAmount());
- if("ROC".equals(symbol) && !"Y".equals(selectById.getIsInside())){
+ if("CPV".equals(symbol) && !"Y".equals(selectById.getIsInside())){
// 如果是ROC 则自动转
- String transfer = RocService.transfer(amount, address, "ROC");
+ String transfer = RocService.transfer(amount, address, "CPV");
if(!"success".equals(transfer)){
FebsResponse febsResponse = new FebsResponse();
return febsResponse.fail().message(transfer);
@@ -773,7 +773,7 @@
//USDT充币总额+USDT提币总额
String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT");
- String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"ROC");
+ String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"CPV");
memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
memberInfoDetailVo.setChargeCoinRoc(totalAmountUsdtBRoc == null ? 0 : Double.parseDouble(totalAmountUsdtBRoc));
String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);
@@ -810,7 +810,7 @@
//账户金额
String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT");
- String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC");
+ String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"CPV");
memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc));
//String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);
@@ -1338,7 +1338,7 @@
//USDT充币总额+USDT提币总额
String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT");
- String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"ROC");
+ String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"CPV");
memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
memberInfoDetailVo.setChargeCoinRoc(totalAmountUsdtBRoc == null ? 0 : Double.parseDouble(totalAmountUsdtBRoc));
String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);
@@ -1375,7 +1375,7 @@
//账户金额
String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT");
- String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC");
+ String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"CPV");
memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc));
//String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);
--
Gitblit v1.9.1