From 556717400f442495b77bbb16bbb4e1965763795f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 15 Jul 2020 10:28:28 +0800
Subject: [PATCH] 20200715  代码提交

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 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 ac30e07..252d6fe 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
@@ -181,7 +181,16 @@
     @Override
     public IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request) {
         Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return this.baseMapper.selectMemberListInPage(page, memberEntity);
+        IPage<MemberEntity> selectMemberListInPage = this.baseMapper.selectMemberListInPage(page, memberEntity);
+        List<MemberEntity> records = selectMemberListInPage.getRecords();
+        if(records != null && records.size() > 0) {
+        	for(MemberEntity memberEntitys : records) {
+        		String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
+        		String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
+        		memberEntitys.setRealName(firstName+secondName);
+        	}
+        }
+        return selectMemberListInPage;
     }
 
 	@Override
@@ -386,7 +395,17 @@
 	public IPage<MemberCoinWithdrawVo> findmemberWithdrawCoinListInPage(
 			MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
 		Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		
 		IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findmemberWithdrawCoinListInPage(page, memberCoinWithdrawEntity);
+		List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
+		if(records != null && records.size() > 0) {
+			for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
+				BigDecimal amount = memberCoinWithdrawVo.getAmount();
+				BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
+				BigDecimal subtract = amount.subtract(feeAmount);
+				memberCoinWithdrawVo.setRealAmount(subtract);
+			}
+		}
         return findmemberQuickBuySaleListInPage;
 	}
 
@@ -560,8 +579,10 @@
 		String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealData();
 		//平仓总手续费
 		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealData();
+		
 		//总盈亏
 		String rewardratioByMid = memberMapper.selectRewardratioForBasicRealData();
+		
 		//持仓人数
 		String notNullNumber = memberMapper.selectSFCCForBasicRealData();
 		//币币账户不为空的人数

--
Gitblit v1.9.1