From 291cb342a5ffab8d75052d2fe682e81764772614 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 31 Jul 2020 17:13:40 +0800
Subject: [PATCH] 20200731 代码提交
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 44a35ad..19134e4 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
@@ -469,14 +469,14 @@
}
@Override
- public Result getDocumentaryOrderSetInfo() {
+ public Result getDocumentaryOrderSetInfo(String tradeId) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
DocumentaryOrderSetInfoVo documentaryOrderSetInfoVo = new DocumentaryOrderSetInfoVo();
+ long parseLong = Long.parseLong(tradeId);
//获取【跟随者设置】数据
- FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectDocumentaryOrderSetInfoBymemberId(memberId);
- Long tradeId = followFollowerSettingEntity.getTradeId();
- documentaryOrderSetInfoVo.setTraderId(tradeId);
+ FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);
+ documentaryOrderSetInfoVo.setTraderId(parseLong);
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
String avatar = followTraderInfoEntity.getAvatar();
@@ -496,7 +496,6 @@
Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();
documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);
-
return Result.ok(documentaryOrderSetInfoVo);
}
@@ -558,7 +557,7 @@
MemberEntity memberEntity = memberDao.selectById(memberId);
Integer certifyStatus = memberEntity.getCertifyStatus();
if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {
- return Result.ok(MessageSourceUtils.getString("member_controller_0009"));
+ return Result.fail(MessageSourceUtils.getString("member_controller_0009"));
}
//新增【交易员信息表】数据
FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
--
Gitblit v1.9.1