From fc5d2e8c20e82550eaf0e7ff1dc19f85d73a41bd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 30 Jul 2020 18:28:18 +0800
Subject: [PATCH] 20200730 代码提交
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 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 a5b126c..c36640a 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
@@ -62,6 +62,7 @@
import com.xcong.excoin.utils.RedisUtils;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
@@ -121,6 +122,19 @@
List<FollowTraderProfitInfoVo> followTraderProfitInfoVoList = followTraderProfitInfoList.getRecords();
if(CollUtil.isNotEmpty(followTraderProfitInfoVoList)) {
for(FollowTraderProfitInfoVo FollowTraderProfitInfoVo : followTraderProfitInfoVoList) {
+ MemberEntity user = LoginUserUtils.getUser();
+ if(ObjectUtil.isNotEmpty(user)) {
+ Long traderId = FollowTraderProfitInfoVo.getTraderId();
+ Long memberId = user.getId();
+ FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);
+ if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
+ FollowTraderProfitInfoVo.setDocumentaaryType(1);
+ }else {
+ FollowTraderProfitInfoVo.setDocumentaaryType(2);
+ }
+ }else {
+ FollowTraderProfitInfoVo.setDocumentaaryType(2);
+ }
Long traderId = FollowTraderProfitInfoVo.getTraderId();
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);
String avatar = followTraderInfoEntity.getAvatar();
@@ -131,8 +145,6 @@
FollowTraderProfitInfoVo.setDeclaration(declaration);
Integer isAll = followTraderInfoEntity.getIsAll();
FollowTraderProfitInfoVo.setIsAll(isAll);
- Integer isOpen = followTraderInfoEntity.getIsOpen();
- FollowTraderProfitInfoVo.setIsOpen(isOpen);
}
}
return Result.ok(followTraderProfitInfoVoList);
@@ -141,26 +153,35 @@
@Override
public Result getHistoryOrderRecords(@Valid HistoryOrderRecordsDto historyOrderRecordsDto) {
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(historyOrderRecordsDto.getTradeId());
+ Long memberId = followTraderInfoEntity.getMemberId();
+
Page<HistoryOrderRecordsVo> page = new Page<>(historyOrderRecordsDto.getPageNum(), historyOrderRecordsDto.getPageSize());
- IPage<HistoryOrderRecordsVo> historyOrderRecordsVoList = followTraderProfitInfoDao.selectHistoryOrderRecords(page, historyOrderRecordsDto.getMemberId());
+ IPage<HistoryOrderRecordsVo> historyOrderRecordsVoList = followTraderProfitInfoDao.selectHistoryOrderRecords(page, memberId);
return Result.ok(historyOrderRecordsVoList);
}
@Override
public Result getFollowRecords(@Valid FollowRecordsDto followRecordsDto) {
+ FollowTraderInfoEntity followTraderInfoEn = followTraderInfoDao.selectById(followRecordsDto.getTradeId());
+ Long memberId = followTraderInfoEn.getMemberId();
+
Page<FollowRecordsVo> page = new Page<>(followRecordsDto.getPageNum(), followRecordsDto.getPageSize());
- IPage<FollowRecordsVo> historyOrderRecordsVoList = followFollowerProfitDao.selectFollowRecords(page, followRecordsDto.getTradeMemberId());
+ IPage<FollowRecordsVo> historyOrderRecordsVoList = followFollowerProfitDao.selectFollowRecords(page, memberId);
List<FollowRecordsVo> records = historyOrderRecordsVoList.getRecords();
if(CollUtil.isNotEmpty(records)) {
for(FollowRecordsVo followRecordsVo : records) {
- Long tradeId = followRecordsVo.getTradeId();
- FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
- String avatar = followTraderInfoEntity.getAvatar();
- followRecordsVo.setAvatar(avatar);
- String nickname = followTraderInfoEntity.getNickname();
- followRecordsVo.setNickname(nickname);
+ Long memberIds = followRecordsVo.getMemberId();
+ MemberEntity MemberEntity = memberDao.selectById(memberIds);
+ String phone = MemberEntity.getPhone();
+ String email = MemberEntity.getEmail();
+ if(StrUtil.isNotEmpty(phone)) {
+ followRecordsVo.setNickname(phone);
+ }else {
+ followRecordsVo.setNickname(email);
+ }
}
}
return Result.ok(historyOrderRecordsVoList);
--
Gitblit v1.9.1