From 85a8ca034763c90625c2a6bf844c1d0656cd5591 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 23 Jul 2020 11:30:43 +0800
Subject: [PATCH] 20200723  代码提交

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   74 ++++++++++++++++++++++++++++++++++++
 1 files changed, 73 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 d6d1059..64ea437 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
@@ -841,7 +841,7 @@
 	public IPage<MemberDataInfoVo> findMemberDataInfoAloneDtoListInPage(MemberEntity memberEntity,
 			QueryRequest request) {
 		Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
-		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.selectMemberDataInfoDtoListInPageAlone(page, memberEntity);
+		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.selectMemberDataInfoDtoRealListInPageAlone(page, memberEntity);
 		//USDT充币总额+USDT提币总额
     	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataAlone();
     	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataAlone();
@@ -1027,4 +1027,76 @@
         return selectMemberListInPage;
 	}
 
+
+	@Override
+	public IPage<MemberEntity> findMemberListTestInPage(MemberEntity member, QueryRequest request) {
+        Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<MemberEntity> selectMemberListInPage = this.baseMapper.findMemberListTestInPage(page, member);
+        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
+	public IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinTestListInPage(
+			MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+		Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		
+		IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findMemberWithdrawCoinTestListInPage(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);
+				
+				Long memberId = memberCoinWithdrawVo.getMemberId();
+				Map<String, Object> columnMap = new HashMap<>();
+				columnMap.put("member_id", memberId);
+				List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+				if(selectByMap != null && selectByMap.size() > 0) {
+					MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+					String firstName = memberAuthenticationEntity.getFirstName();
+					String secondName = memberAuthenticationEntity.getSecondName();
+					String realName = firstName + secondName;
+					memberCoinWithdrawVo.setRealName(realName);
+				}
+			}
+		}
+        return findmemberQuickBuySaleListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberCoinChargeVo> findMemberApplyCoinAloneTestInPage(MemberCoinChargeEntity memberCoinChargeEntity,
+			QueryRequest request) {
+		Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findMemberApplyCoinAloneTestInPage(page, memberCoinChargeEntity);
+		List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords();
+		if(records != null && records.size() > 0) {
+			for(MemberCoinChargeVo memberCoinChargeVo : records) {
+				Long memberId = memberCoinChargeVo.getMemberId();
+				Map<String, Object> columnMap = new HashMap<>();
+				columnMap.put("member_id", memberId);
+				List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+				if(selectByMap != null && selectByMap.size() > 0) {
+					MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+					String firstName = memberAuthenticationEntity.getFirstName();
+					String secondName = memberAuthenticationEntity.getSecondName();
+					String realName = firstName + secondName;
+					memberCoinChargeVo.setRealName(realName);
+				}
+			}
+		}
+        return findmemberQuickBuySaleListInPage;
+	}
+
 }

--
Gitblit v1.9.1