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

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 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 fb21469..2a330c0 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
@@ -11,6 +11,7 @@
 import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
 import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
 import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
+import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinAddressEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
@@ -566,7 +567,7 @@
 		}else {
 			selectById.setCertifyStatus(MemberEntity.CERTIFY_STATUS_N);
 			Map<String, Object> columnMap = new HashMap<>();
-			columnMap.put("member_id", selectById);
+			columnMap.put("member_id", selectById.getId());
 			memberAuthenticationMapper.deleteByMap(columnMap);
 		}
 		selectById.setIdcardNo(memberAuthenticationEntity.getIdcardNo());
@@ -769,6 +770,22 @@
 			QueryRequest request) {
 		Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
 		IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findmemberApplyCoinAloneInPage(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;
 	}
 
@@ -786,6 +803,18 @@
 				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;

--
Gitblit v1.9.1