From b86ee5977a11e1f119e7fb118fa6f28bb604a834 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 18:12:43 +0800
Subject: [PATCH] 20200721  daiamtijiao

---
 src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java |   70 +++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
index 8ecae99..c9dc765 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
@@ -165,6 +165,20 @@
 		
 		if (records != null) {
             for (ContractHoldOrderEntity holdOrderEntity : records) {
+            	
+            	Long memberId = holdOrderEntity.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;
+					holdOrderEntity.setRealName(realName);
+				}
+            	
+            	
             	MemberEntity selectById = memberMapper.selectById(holdOrderEntity.getMemberId());
                 // 获取最新价
                 BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
@@ -202,6 +216,22 @@
 			QueryRequest request) {
 		Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
 		IPage<ContractOrderEntity> findMemberAccountInfoListInPage = contractHoldOrderMapper.findHistoryOrderInfoAloneInfoInPage(page, contractOrderEntity);
+		List<ContractOrderEntity> records = findMemberAccountInfoListInPage.getRecords();
+		if(records != null && records.size() > 0) {
+			for(ContractOrderEntity contractOrderEntitys : records) {
+				Long memberId = contractOrderEntitys.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;
+					contractOrderEntitys.setRealName(realName);
+				}
+			}
+		}
 		return findMemberAccountInfoListInPage;
 	}
 
@@ -237,6 +267,46 @@
 		}
 		return findMemberAccountInfoListInPage;
 	}
+
+	@Override
+	public IPage<MemberAccountInfoVo> findmemberAccountInfoAloneListInPage(MemberEntity memberEntity,
+			QueryRequest request) {
+		Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberAccountInfoVo> selectMemberListInPage = memberMapper.findMemberAccountInfoAloneListInPage(page, memberEntity);
+		List<MemberAccountInfoVo> records = selectMemberListInPage.getRecords();
+		if(records.size() > 0) {
+			for(MemberAccountInfoVo memberAccountInfoVo : records) {
+				Long memberId = memberAccountInfoVo.getId();
+				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;
+					memberAccountInfoVo.setRealName(realName);
+				}
+				//总盈亏
+				String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymid(memberId);
+		        BigDecimal bd=new BigDecimal(rewardratioByMid);
+				memberAccountInfoVo.setRewardratioByMid(bd);
+				String inviteId = memberMapper.selectAgentForAccount(memberId);
+				if("".equals(inviteId) || inviteId == null) {
+					memberAccountInfoVo.setIsSuAccount(0);
+				}else {
+					memberAccountInfoVo.setIsSuAccount(1);
+				}
+				List<MemberWalletAgentEntity> selectByMaps = memberWalletAgentMapper.selectByMap(columnMap);
+				if(selectByMaps.size() > 0) {
+					BigDecimal availableBalance = selectByMaps.get(0).getAvailableBalance();
+					memberAccountInfoVo.setAgentAvailableBalance(availableBalance);
+				}
+				
+			}
+		}
+        return selectMemberListInPage;
+	}
 	
 	
 	

--
Gitblit v1.9.1