From 87381170a51999a7c2314ed9cca14060c3b540a8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Jul 2020 22:55:07 +0800
Subject: [PATCH] 20200720  代码提交

---
 src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java    |    7 ++++++-
 src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java |   15 +++++++++++++++
 src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html      |    5 +++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
index 2db22e1..c10aad7 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
@@ -80,5 +80,10 @@
 	 * 总返佣
 	 */
 	@TableField(exist = false)
-	private String  allAmount;
+	private String allAmount;
+	/**
+	 * 姓名
+	 */
+	@TableField(exist = false)
+	private String  realName;
 }
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 5d38486..5841d40 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
@@ -15,8 +15,10 @@
 import com.xcong.excoin.common.utils.CoinTypeConvert;
 import com.xcong.excoin.common.utils.RedisUtils;
 import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
+import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
 import com.xcong.excoin.modules.member.entity.MemberEntity;
 import com.xcong.excoin.modules.member.mapper.MemberAccountMoneyChangeMapper;
+import com.xcong.excoin.modules.member.mapper.MemberAuthenticationMapper;
 import com.xcong.excoin.modules.member.mapper.MemberMapper;
 import com.xcong.excoin.modules.trademanage.entity.AgentReturnEntity;
 import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
@@ -45,6 +47,8 @@
 	private final ContractOrderMapper contractHoldOrderMapper;
 	
 	private final AgentReturnMapper agentReturnMapper;
+	
+	private final MemberAuthenticationMapper memberAuthenticationMapper;
 	
 	private final RedisUtils redisUtils;
 	
@@ -207,11 +211,22 @@
 		Page<MemberAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
 		IPage<MemberAccountMoneyChangeEntity> findMemberAccountInfoListInPage = 
 				memberAccountMoneyChangeMapper.findMemberAgentReturnInfoAloneInPage(page, memberAccountMoneyChangeEntity);
+		
 		List<MemberAccountMoneyChangeEntity> records = findMemberAccountInfoListInPage.getRecords();
 		if(records != null && records.size() > 0) {
 			for(MemberAccountMoneyChangeEntity accountMoneyChangeEntity : records) {
 				Long memberId = accountMoneyChangeEntity.getMemberId();
 				String allAmount = memberAccountMoneyChangeMapper.selectAccountMoneyChangeByMemberId(memberId);
+				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;
+					accountMoneyChangeEntity.setRealName(realName);
+				}
 				accountMoneyChangeEntity.setAllAmount(allAmount);
 			}
 		}
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html b/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html
index e50eadd..dc313dc 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html
@@ -73,10 +73,11 @@
                 cols: [[
                     {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
                     {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+                    {field: 'realName', title: '姓名', minWidth: 200,align:'left'},
                     {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
                     {field: 'symbol', title: '币种', minWidth: 80,align:'center'},
-                    {field: 'allAmount', title: '总佣金', minWidth: 80,align:'center',totalRow: true},
-                    {field: 'amount', title: '本次金额', minWidth: 80,align:'center',totalRow: true},
+                    {field: 'amount', title: '当天返佣', minWidth: 80,align:'center',totalRow: true},
+                    {field: 'allAmount', title: '总返佣', minWidth: 80,align:'center',totalRow: true},
                     {field: 'content', title: '记录内容', minWidth: 80,align:'center'},
                     {field: 'createTime', title: '时间', minWidth: 80,align:'center'},
                     {field: 'status', title: '状态',

--
Gitblit v1.9.1