From 5b5e060cde0480f27924803116af8215d4e41073 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 29 Jul 2020 19:24:41 +0800
Subject: [PATCH] 20200729 代码提交
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index e5ee7d0..f09d08f 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -134,15 +134,12 @@
List<FollowRecordsVo> records = historyOrderRecordsVoList.getRecords();
if(CollUtil.isNotEmpty(records)) {
for(FollowRecordsVo followRecordsVo : records) {
- Long memberId =followRecordsVo.getMemberId();
- MemberEntity member = memberDao.selectById(memberId);
- String email = member.getEmail();
- String phone = member.getPhone();
- if(StrUtil.isNotEmpty(email)) {
- followRecordsVo.setAccount(email);
- }else {
- followRecordsVo.setAccount(phone);
- }
+ Long tradeId = followRecordsVo.getTradeId();
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
+ String avatar = followTraderInfoEntity.getAvatar();
+ followRecordsVo.setAvatar(avatar);
+ String nickname = followTraderInfoEntity.getNickname();
+ followRecordsVo.setNickname(nickname);
}
}
return Result.ok(historyOrderRecordsVoList);
@@ -324,14 +321,14 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
+
+ Page<MyFollowTraderInfoVo> result = new Page<>();
+ List<MyFollowTraderInfoVo> myFollowOrderVos = result.getRecords();
+
Page<FollowFollowerProfitEntity> page = new Page<>(myFollowTraderInfoDto.getPageNum(), myFollowTraderInfoDto.getPageSize());
IPage<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectFollowFollowerProfitEntitys(page, memberId);
-
List<FollowFollowerProfitEntity> records = followFollowerProfitEntitys.getRecords();
if(CollUtil.isNotEmpty(records)) {
- Page<MyFollowTraderInfoVo> result = new Page<>();
- List<MyFollowTraderInfoVo> myFollowOrderVos = result.getRecords();
-
for(FollowFollowerProfitEntity FollowFollowerProfitEntity : records) {
MyFollowTraderInfoVo myFollowTraderInfoVo = new MyFollowTraderInfoVo();
@@ -339,10 +336,8 @@
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
String avatar = followTraderInfoEntity.getAvatar();
myFollowTraderInfoVo.setAvatar(avatar);
-
String nickname = followTraderInfoEntity.getNickname();
myFollowTraderInfoVo.setNickname(nickname);
-
BigDecimal totalPrincipal = FollowFollowerProfitEntity.getTotalPrincipal();
myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
@@ -381,7 +376,7 @@
myFollowOrderVos.add(myFollowTraderInfoVo);
}
}
- return null;
+ return Result.ok(result);
}
--
Gitblit v1.9.1