From 5210a07df3aadf5ad832e46a00cf523b63fa43ba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Aug 2020 11:49:32 +0800
Subject: [PATCH] 202000820

---
 src/main/resources/templates/febs/views/modules/member/memberDataInfoAlone.html     |    1 +
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java   |   25 +++++++++++++++++++++++++
 src/main/resources/templates/febs/views/modules/member/memberDataInfoAll.html       |    1 +
 src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAlone.html  |    1 +
 src/main/resources/templates/febs/views/modules/member/memberDataInfoAloneTest.html |    1 +
 src/main/resources/templates/febs/views/modules/member/memberDataInfo.html          |    1 +
 6 files changed, 30 insertions(+), 0 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..63cda1f 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;
@@ -1182,6 +1202,10 @@
 		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));
@@ -1206,6 +1230,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;
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDataInfo.html b/src/main/resources/templates/febs/views/modules/member/memberDataInfo.html
index b946f46..70bbe85 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDataInfo.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfo.html
@@ -44,6 +44,7 @@
                 {field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
                 {field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
                 {field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
+                {field: 'allCoin', title: '平台总资产', minWidth: 200,align:'center'},
                 {field: 'platformProfitAndLoss', title: '平台剩余USDT',
                 	templet: function (d) {
                         if (d.platformProfitAndLoss > '0') {
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAll.html b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAll.html
index c7b122a..00cafb2 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAll.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAll.html
@@ -44,6 +44,7 @@
                 {field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
                 {field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
                 {field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
+                {field: 'allCoin', title: '平台总资产', minWidth: 200,align:'center'},
                 {field: 'platformProfitAndLoss', title: '平台剩余USDT',
                 	templet: function (d) {
                         if (d.platformProfitAndLoss > '0') {
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAlone.html b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAlone.html
index 889bb31..ba9eb12 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAlone.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAlone.html
@@ -44,6 +44,7 @@
                 {field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
                 {field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
                 {field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
+                {field: 'allCoin', title: '平台总资产', minWidth: 200,align:'center'},
                 {field: 'platformProfitAndLoss', title: '平台剩余USDT',
                 	templet: function (d) {
                         if (d.platformProfitAndLoss > '0') {
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAlone.html b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAlone.html
index aa76cbd..e4d7966 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAlone.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAlone.html
@@ -44,6 +44,7 @@
                 {field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
                 {field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
                 {field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
+                {field: 'allCoin', title: '平台总资产', minWidth: 200,align:'center'},
                 {field: 'platformProfitAndLoss', title: '平台剩余USDT',
                 	templet: function (d) {
                         if (d.platformProfitAndLoss > '0') {
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAloneTest.html b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAloneTest.html
index 5905fc2..7b69870 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAloneTest.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAloneTest.html
@@ -44,6 +44,7 @@
                 {field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
                 {field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
                 {field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
+                {field: 'allCoin', title: '平台总资产', minWidth: 200,align:'center'},
                 {field: 'platformProfitAndLoss', title: '平台剩余USDT',
                 	templet: function (d) {
                         if (d.platformProfitAndLoss > '0') {

--
Gitblit v1.9.1