From 620a9fd5a96642612231698e236a218d50b6c221 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 15:35:44 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 ba8d937..e5168e9 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
@@ -511,6 +511,15 @@
return Result.fail(MessageSourceUtils.getString("documentary_service_0014"));
}
+ //不可以处于跟单状态
+ Map<String, Object> columnMaps = new HashMap<>();
+ columnMaps.put("member_id", memberId);
+ columnMaps.put("is_follow", 1);
+ List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);
+ if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {
+ return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
+ }
+
//判断当前用户是否是逐仓模式
MemberEntity selectById2 = memberDao.selectById(memberId);
Integer contractPositionType = selectById2.getContractPositionType();
@@ -596,6 +605,7 @@
Long memberId = LoginUserUtils.getAppLoginUser().getId();
DocumentaryOrderSetInfoVo documentaryOrderSetInfoVo = new DocumentaryOrderSetInfoVo();
long parseLong = Long.parseLong(tradeId);
+
//获取【跟随者设置】数据
FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);
@@ -622,8 +632,11 @@
documentaryOrderSetInfoVo.setFollowCnt(followCnt);
Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();
- documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);
-
+ if(maxFollowCnt > 0){
+ documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt.toString());
+ }
+ documentaryOrderSetInfoVo.setMaxFollowCnt(null);
+ log.info(memberId + "-最大持仓张数-"+maxFollowCnt.toString());
return Result.ok(documentaryOrderSetInfoVo);
}
--
Gitblit v1.9.1