From a53fb9086c7b174ea0bd3d1f80c90af9f0daac23 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 17:10:08 +0800
Subject: [PATCH] 20200721  代码提交

---
 src/main/resources/templates/febs/views/modules/member/memberDataInfoAlone.html    |    2 
 src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java       |    9 +
 src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java             |   30 +++++
 src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java          |    2 
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java  |   64 ++++++++++
 src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAlone.html |   73 ++++++++++++
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java     |    9 +
 src/main/resources/mapper/modules/MemberMapper.xml                                 |  166 ++++++++++++++++++++++++++-
 8 files changed, 346 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 5d87b15..4a6893c 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -222,6 +222,15 @@
     }
     
     /**
+     * 平台全部信息---列表alone
+     */
+    @GetMapping("memberDataInfoAllAlone")
+    public FebsResponse memberDataInfoAllAlone(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoAllAloneListInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    
+    /**
      * 用户详细信息---列表
      * @return
      */
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index 3791287..af28cab 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -85,6 +85,15 @@
     	return FebsUtil.view("modules/member/memberDataInfoAlone");
     }
     /**
+     * 平台全部信息---列表alone
+     * @return
+     */
+    @GetMapping("memberDataInfoAllAlone")
+    @RequiresPermissions("memberDataInfoAllAlone:view")
+    public String memberDataInfoAllAlone() {
+    	return FebsUtil.view("modules/member/memberDataInfoAllAlone");
+    }
+    /**
 	 * 基础数据---查询
 	 */
     @GetMapping("memberDataInfoLists/{id}")
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
index b417d08..baceed8 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
@@ -150,5 +150,35 @@
 	String selectHYZCForBasicRealDataAlone();
 
 	String selectDLZCForBasicRealDataAlone();
+
+	String selectTotalAmountUsdtBForBasicAllDataAlone();
+
+	String selectTotalAmountUsdtSForBasicAllDataAlone();
+
+	String selectTotalAmountUsdtCZForBasicAllDataAlone();
+
+	String selectTotalAmountUsdtTXForBasicAllDataAlone();
+
+	String selectReturnMoneyForBasicAllDataAlone();
+
+	String selectClosingpriceForBasicAllDataAlone();
+
+	String selectSellClosingpriceForBasicAllDataAlone();
+
+	String selectRewardratioForBasicAllDataAlone();
+
+	String selectSFCCForBasicAllDataAlone();
+
+	String selectBBZHForBasicAllDataAlone();
+
+	String selectHYZHForBasicAllDataAlone();
+
+	String selectprepriceForBasicAllDataAlone();
+
+	String selectBBZCForBasicAllDataAlone();
+
+	String selectHYZCForBasicAllDataAlone();
+
+	String selectDLZCForBasicAllDataAlone();
     
 }
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
index 667bcbd..f42a644 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
@@ -78,4 +78,6 @@
 
 	IPage<MemberDataInfoVo> findMemberDataInfoAllInPage(MemberEntity memberEntity, QueryRequest request);
 
+	IPage<MemberDataInfoVo> findMemberDataInfoAllAloneListInPage(MemberEntity memberEntity, QueryRequest request);
+
 }
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 2a330c0..d6d1059 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
@@ -963,4 +963,68 @@
         return selectMemberListInPage;
 	}
 
+
+	@Override
+	public IPage<MemberDataInfoVo> findMemberDataInfoAllAloneListInPage(MemberEntity memberEntity,
+			QueryRequest request) {
+		Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.selectMemberDataInfoDtoListInPageAlone(page, memberEntity);
+		//USDT充币总额+USDT提币总额
+    	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicAllDataAlone();
+    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicAllDataAlone();
+    	//USDT充值总额+USDT提现总额
+    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicAllDataAlone();
+    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicAllDataAlone();
+		//佣金
+		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicAllDataAlone();
+		//开仓手续费总额
+		String closingpriceByMid = memberMapper.selectClosingpriceForBasicAllDataAlone();
+		//平仓总手续费
+		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicAllDataAlone();
+		
+		//总盈亏
+		String rewardratioByMid = memberMapper.selectRewardratioForBasicAllDataAlone();
+		
+		//持仓人数
+		String notNullNumber = memberMapper.selectSFCCForBasicAllDataAlone();
+		//币币账户不为空的人数
+		String walletNumber = memberMapper.selectBBZHForBasicAllDataAlone();
+		//合约账户不为空的人数
+		String walletCoinNumber = memberMapper.selectHYZHForBasicAllDataAlone();
+		//持仓手续费
+		String doingPrice = memberMapper.selectprepriceForBasicAllDataAlone();
+		
+		//账户金额
+		String walletNum = memberMapper.selectBBZCForBasicAllDataAlone();
+		String walletCoinNum = memberMapper.selectHYZCForBasicAllDataAlone();
+		String agentNum = memberMapper.selectDLZCForBasicAllDataAlone();
+		
+		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 - (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.setClosingPrice(closingpriceByMid == null ? "0" : closingpriceByMid);
+			memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == null ? "0" : sellClosingpriceByMid);
+			memberDataInfoVo.setFee(returnMoneyByMid == null ? "0" : returnMoneyByMid);
+			memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : rewardratioByMid);
+			memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
+			memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
+			memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
+			memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0 ? "0" : platformProfitAndLoss+"");
+			memberDataInfoVo.setDoingPrice(doingPrice == null ? "0" : doingPrice);
+			memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
+			memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
+			memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+		}
+		selectMemberListInPage.setTotal(1);
+        return selectMemberListInPage;
+	}
+
 }
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 1062c1a..408f849 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -134,6 +134,16 @@
 		AND FIND_IN_SET('22015141', m.referer_ids)
 		and m.account_type = 1;
 	</select>
+	<select id="selectTotalAmountUsdtBForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(s.amount),'0')  as amount
+		FROM
+			member_coin_charge s
+		LEFT JOIN member m ON m.id = s.member_id
+		where 
+			s.symbol = 'USDT'
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
 	<select id="selectTotalAmountUsdtBForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(a.amount),'0')  as amount
@@ -181,6 +191,18 @@
 		AND a.is_inside = 'N'
 		AND FIND_IN_SET('22015141', m.referer_ids)
 		and m.account_type = 1;
+	</select>
+	<select id="selectTotalAmountUsdtSForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.amount),'0') as amount
+		FROM
+			member_coin_withdraw a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a. STATUS = 2
+		AND a.is_inside = 'N'
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
 	</select>
 	<select id="selectTotalAmountUsdtSForBasicData" resultType="java.lang.String">
 		SELECT
@@ -232,6 +254,17 @@
 		AND FIND_IN_SET('22015141', m.referer_ids)
 		and m.account_type = 1;
 	</select>
+	<select id="selectTotalAmountUsdtCZForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(amount_usdt),'0')
+		FROM
+			member_quick_buy_sale a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.order_type = 'B'
+		AND a.order_status = 3
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
 	<select id="selectTotalAmountUsdtCZForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(amount_usdt),'0')
@@ -281,6 +314,17 @@
 		AND FIND_IN_SET('22015141', m.referer_ids)
 		and m.account_type = 1;
 	</select>
+	<select id="selectTotalAmountUsdtTXForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(amount_usdt),'0')
+		FROM
+			member_quick_buy_sale a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.order_type = 'S'
+		AND a.order_status = 2
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
 	<select id="selectTotalAmountUsdtTXForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(amount_usdt),'0')
@@ -322,7 +366,20 @@
 			s.type = 3
 		AND s.content LIKE '%佣金到账%'
 		AND s. STATUS = '1'
-		AND FIND_IN_SET('22015141', m.referer_ids)
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
+	<select id="selectReturnMoneyForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(s.amount), '0')
+		FROM
+			member_account_money_change s
+			
+		LEFT JOIN member m ON m.id = s.member_id
+		WHERE
+			s.type = 3
+		AND s.content LIKE '%佣金到账%'
+		AND s. STATUS = '1'
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
 	</select>
 	<select id="selectClosingpriceForBasicRealDataBymemberId" resultType="java.lang.String">
 		SELECT
@@ -364,6 +421,18 @@
 		and a.order_status = '1'
 		AND FIND_IN_SET('22015141', m.referer_ids)
 		and m.account_type = 1;
+	</select>
+	<select id="selectClosingpriceForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.opening_fee_amount),'0')
+		FROM
+			contract_order a
+
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+		a.closing_type = '0'
+		and a.order_status = '1'
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
 	</select>
 	<select id="selectClosingpriceForBasicData" resultType="java.lang.String">
 		SELECT
@@ -415,6 +484,18 @@
 		AND FIND_IN_SET('22015141', m.referer_ids)
 		and m.account_type = 1;
 	</select>
+	<select id="selectSellClosingpriceForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.closing_fee_amount),'0')
+		FROM
+			contract_order a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
+			and a.order_status = '1'
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
 	<select id="selectSellClosingpriceForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(a.closing_fee_amount),'0')
@@ -463,6 +544,17 @@
 		AND a.order_status = '1'
 		AND FIND_IN_SET('22015141', m.referer_ids)
 		and m.account_type = 1;
+	</select>
+	<select id="selectRewardratioForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(a.reward_amount), '0')
+		FROM
+			contract_order a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
+		AND a.order_status = '1'
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
 	</select>
 	<select id="selectRewardratioForBasicData" resultType="java.lang.String">
 		SELECT
@@ -529,6 +621,29 @@
 					s.member_id
 			) b
 	</select>
+	<select id="selectSFCCForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			COUNT(b.id)
+		FROM
+			(
+				SELECT
+					s.id
+				FROM
+					contract_hold_order s
+				WHERE
+					s.member_id IN (
+						SELECT
+							id
+						FROM
+							member
+						WHERE
+							account_type = '1'
+							AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+					)
+				GROUP BY
+					s.member_id
+			) b
+	</select>
 	<select id="selectSFCCForBasicData" resultType="java.lang.String">
 		SELECT
 			COUNT(b.id)
@@ -572,6 +687,17 @@
 		AND FIND_IN_SET('22015141', m.referer_ids)
 							and m.account_type = 1;
 	</select>
+	<select id="selectBBZHForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			COUNT(a.id)
+		FROM
+			member_wallet_coin a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.wallet_code = 'USDT'
+		AND a.available_balance > 1
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
 	<select id="selectBBZHForBasicData" resultType="java.lang.String">
 		SELECT
 			COUNT(a.id)
@@ -599,7 +725,7 @@
 			AND account_status = '1'
 		)
 	</select>
-	<select id="selectHYZHForBasicRealDataAlone" resultType="java.lang.String">
+	<select id="selectHYZHForBasicAllDataAlone" resultType="java.lang.String">
 		SELECT
 			COUNT(a.id)
 		FROM
@@ -609,8 +735,7 @@
 		WHERE
 			a.wallet_code = 'USDT'
 		AND a.total_balance > 1
-		AND FIND_IN_SET('22015141', m.referer_ids)
-							and m.account_type = 1;
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
 	</select>
 	<select id="selectHYZHForBasicData" resultType="java.lang.String">
 		SELECT
@@ -645,14 +770,13 @@
 				AND account_status = '1'
 			)
 	</select>
-	<select id="selectprepriceForBasicRealDataAlone" resultType="java.lang.String">
+	<select id="selectprepriceForBasicAllDataAlone" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(a.hold_amount),'0')
 		FROM
 			contract_order a
 		LEFT JOIN member m ON m.id = a.member_id
-		WHERE FIND_IN_SET('22015141', m.referer_ids)
-							and m.account_type = 1;
+		WHERE (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
 	</select>
 	<select id="selectprepriceForBasicData" resultType="java.lang.String">
 		SELECT
@@ -697,6 +821,16 @@
 		AND FIND_IN_SET('22015141', m.referer_ids)
 							and m.account_type = 1;
 	</select>
+	<select id="selectBBZCForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(available_balance),'0')
+		FROM
+			member_wallet_coin a
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE
+			a.wallet_code = 'USDT'
+		AND (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
 	<select id="selectBBZCForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(available_balance),'0')
@@ -739,6 +873,15 @@
 		WHERE FIND_IN_SET('22015141', m.referer_ids) 
 		and m.account_type = 1;
 	</select>
+	<select id="selectHYZCForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(total_balance),'0')
+		FROM
+			member_wallet_contract a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
 	<select id="selectHYZCForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(total_balance),'0')
@@ -779,6 +922,15 @@
 		WHERE FIND_IN_SET('22015141', m.referer_ids)
 		and m.account_type = 1;
 	</select>
+	<select id="selectDLZCForBasicAllDataAlone" resultType="java.lang.String">
+		SELECT
+			IFNULL(SUM(total_balance),'0')
+		FROM
+			member_wallet_agent a
+			
+		LEFT JOIN member m ON m.id = a.member_id
+		WHERE (FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
+	</select>
 	<select id="selectDLZCForBasicData" resultType="java.lang.String">
 		SELECT
 			IFNULL(SUM(total_balance),'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
new file mode 100644
index 0000000..889bb31
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAlone.html
@@ -0,0 +1,73 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="平台全部数据">
+    <div class="layui-row febs-container">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body febs-table-full">
+                     <table id=usersTable></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 表格操作栏 start -->
+<script type="text/html" id="user-option">
+    <span shiro:lacksPermission="user:view,user:update,user:delete">
+        <span class="layui-badge-dot febs-bg-orange"></span> 无权限
+    </span>
+</script>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+// 引入组件并初始化
+layui.use([ 'jquery',  'form', 'table', 'febs'], function () {
+    var $ = layui.jquery,
+        laydate = layui.laydate,
+        febs = layui.febs,
+        form = layui.form,
+        table = layui.table,
+        $view = $('#febs-user'),
+        tableIns;
+
+    form.render();
+    // 表格初始化
+    initTable();
+
+    function initTable() {
+
+        tableInss = febs.table.init({
+            elem: $('#usersTable'),
+            url: ctx + 'member/memberDataInfoAllAlone',
+            cols: [[
+            	{field: 'memberCount', title: '注册用户数', minWidth: 120,align:'center'},
+            	{field: 'notNullNumber', title: '持仓用户数', minWidth: 120,align:'center'},
+                {field: 'walletNumber', title: '币币账户有余额个数', minWidth: 200,align:'center'},
+                {field: 'walletNum', title: '币币账户余额', minWidth: 200,align:'center'},
+                {field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
+                {field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
+                {field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
+                {field: 'platformProfitAndLoss', title: '平台剩余USDT',
+                	templet: function (d) {
+                        if (d.platformProfitAndLoss > '0') {
+                            return '<span style="color:green;">'+d.platformProfitAndLoss+'</span>'
+                        } else {
+                            return '<span style="color:red;">'+d.platformProfitAndLoss+'</span>'
+                        }
+                    }, minWidth: 200,align:'center'},
+                {field: 'chargeCoin', title: '充币', minWidth: 200,align:'center'},
+                {field: 'appealCoin', title: '提币', minWidth: 200,align:'center'},
+                {field: 'fee', title: '佣金', minWidth: 200,align:'center'},
+                {field: 'closingPrice', title: '开仓手续费', minWidth: 200,align:'center'},
+                {field: 'sellClosingPrice', title: '平仓手续费', minWidth: 200,align:'center'},
+                {field: 'doingPrice', title: '持仓手续费', minWidth: 200,align:'center'},
+                {field: 'yingkui', title: '订单盈亏',
+                	templet: function (d) {
+                        if (d.yingkui > '0') {
+                            return '<span style="color:green;">'+d.yingkui+'</span>'
+                        } else {
+                            return '<span style="color:red;">'+d.yingkui+'</span>'
+                        }
+                    }, minWidth: 200,align:'center'},
+            ]]
+        });
+    }
+})
+</script>
\ No newline at end of file
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 02931f9..aa76cbd 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAlone.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAlone.html
@@ -66,8 +66,6 @@
                             return '<span style="color:red;">'+d.yingkui+'</span>'
                         }
                     }, minWidth: 200,align:'center'},
-                {field: 'chargeUsdt', title: 'usdt充值', minWidth: 200,align:'center'},
-                {field: 'appealUsdt', title: 'usdt提现', minWidth: 200,align:'center'},
             ]]
         });
     }

--
Gitblit v1.9.1