From 58959179bbcf0383836159e3ac18461725bf223b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Sep 2020 11:33:14 +0800
Subject: [PATCH] 20200911
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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 09742ca..97b5e76 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
@@ -650,6 +650,10 @@
String walletNum = memberMapper.selectBBZCForBasicRealData();
String walletCoinNum = memberMapper.selectHYZCForBasicRealData();
String agentNum = memberMapper.selectDLZCForBasicRealData();
+ double allCoin = 0 ;
+ allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+ +(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+ +(agentNum == null ? 0 : Double.parseDouble(agentNum));
double platformProfitAndLoss = 0 ;
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
@@ -674,6 +678,7 @@
memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+ memberDataInfoVo.setAllCoin(allCoin);
}
selectMemberListInPage.setTotal(1);
return selectMemberListInPage;
@@ -903,6 +908,10 @@
String walletNum = memberMapper.selectBBZCForBasicRealDataAlone();
String walletCoinNum = memberMapper.selectHYZCForBasicRealDataAlone();
String agentNum = memberMapper.selectDLZCForBasicRealDataAlone();
+ double allCoin = 0 ;
+ allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+ +(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+ +(agentNum == null ? 0 : Double.parseDouble(agentNum));
double platformProfitAndLoss = 0 ;
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
@@ -927,6 +936,7 @@
memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+ memberDataInfoVo.setAllCoin(allCoin);
}
selectMemberListInPage.setTotal(1);
return selectMemberListInPage;
@@ -966,6 +976,10 @@
String walletNum = memberMapper.selectBBZCForBasicData();
String walletCoinNum = memberMapper.selectHYZCForBasicData();
String agentNum = memberMapper.selectDLZCForBasicData();
+ double allCoin = 0 ;
+ allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+ +(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+ +(agentNum == null ? 0 : Double.parseDouble(agentNum));
double platformProfitAndLoss = 0 ;
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
@@ -990,6 +1004,7 @@
memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+ memberDataInfoVo.setAllCoin(allCoin);
}
selectMemberListInPage.setTotal(1);
return selectMemberListInPage;
@@ -1030,6 +1045,10 @@
String walletNum = memberMapper.selectBBZCForBasicAllDataAlone();
String walletCoinNum = memberMapper.selectHYZCForBasicAllDataAlone();
String agentNum = memberMapper.selectDLZCForBasicAllDataAlone();
+ double allCoin = 0 ;
+ allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+ +(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+ +(agentNum == null ? 0 : Double.parseDouble(agentNum));
double platformProfitAndLoss = 0 ;
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
@@ -1054,6 +1073,7 @@
memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+ memberDataInfoVo.setAllCoin(allCoin);
}
selectMemberListInPage.setTotal(1);
return selectMemberListInPage;
@@ -1156,6 +1176,7 @@
//USDT充币总额+USDT提币总额
String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealTestDataAlone();
String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealTestDataAlone();
+
//USDT充值总额+USDT提现总额
String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealTestDataAlone();
String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealTestDataAlone();
@@ -1182,18 +1203,25 @@
String walletNum = memberMapper.selectBBZCForBasicRealTestDataAlone();
String walletCoinNum = memberMapper.selectHYZCForBasicRealTestDataAlone();
String agentNum = memberMapper.selectDLZCForBasicRealTestDataAlone();
+ double allCoin = 0 ;
+ allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+ +(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+ +(agentNum == null ? 0 : Double.parseDouble(agentNum));
double platformProfitAndLoss = 0 ;
+
+
+
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
- platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+ platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : (Double.parseDouble(totalAmountUsdtS)-6780));
platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
List<MemberDataInfoVo> records = selectMemberListInPage.getRecords();
for(MemberDataInfoVo memberDataInfoVo : records) {
memberDataInfoVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
memberDataInfoVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
memberDataInfoVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
- memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+ memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : (Double.parseDouble(totalAmountUsdtS)-6780));
memberDataInfoVo.setClosingPrice(closingpriceByMid == null ? "0" : closingpriceByMid);
memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == null ? "0" : sellClosingpriceByMid);
memberDataInfoVo.setFee(returnMoneyByMid == null ? "0" : returnMoneyByMid);
@@ -1206,6 +1234,7 @@
memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+ memberDataInfoVo.setAllCoin(allCoin);
}
selectMemberListInPage.setTotal(1);
return selectMemberListInPage;
@@ -1254,14 +1283,14 @@
double platformProfitAndLoss = 0 ;
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
- platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+ platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : (Double.parseDouble(totalAmountUsdtS)-6780));
platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
List<MemberDataInfoVo> records = selectMemberListInPage.getRecords();
for(MemberDataInfoVo memberDataInfoVo : records) {
memberDataInfoVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
memberDataInfoVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
memberDataInfoVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
- memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+ memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : (Double.parseDouble(totalAmountUsdtS)-6780));
memberDataInfoVo.setClosingPrice(closingpriceByMid == null ? "0" : closingpriceByMid);
memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == null ? "0" : sellClosingpriceByMid);
memberDataInfoVo.setFee(returnMoneyByMid == null ? "0" : returnMoneyByMid);
--
Gitblit v1.9.1