From f96f41f814f976073e582588d1e23fa84dae7951 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jul 2020 11:07:07 +0800
Subject: [PATCH] 20200724 代码提交
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 24e4eb0..1ca8f8d 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
@@ -114,9 +114,21 @@
Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MemberAccountInfoVo> selectMemberListInPage = memberMapper.findMemberAccountInfoListInPage(page, memberEntity);
List<MemberAccountInfoVo> records = selectMemberListInPage.getRecords();
- if(records.size() > 0) {
+ if(CollUtil.isNotEmpty(records)) {
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(CollUtil.isNotEmpty(selectByMap)) {
+ 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);
@@ -127,11 +139,12 @@
}else {
memberAccountInfoVo.setIsSuAccount(1);
}
- Map<String, Object> columnMap = new HashMap<>();
+
+ Map<String, Object> columnMaps = new HashMap<>();
columnMap.put("member_id", memberId);
- List<MemberWalletAgentEntity> selectByMap = memberWalletAgentMapper.selectByMap(columnMap);
- if(selectByMap.size() > 0) {
- BigDecimal availableBalance = selectByMap.get(0).getAvailableBalance();
+ List<MemberWalletAgentEntity> selectByMaps = memberWalletAgentMapper.selectByMap(columnMaps);
+ if(CollUtil.isNotEmpty(selectByMaps)) {
+ BigDecimal availableBalance = selectByMaps.get(0).getAvailableBalance();
memberAccountInfoVo.setAgentAvailableBalance(availableBalance);
}
--
Gitblit v1.9.1