From 09de95ab5415f1511191f4e68c3bd74e4ab7f09d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 05 Mar 2021 15:29:13 +0800
Subject: [PATCH] 20210305 满员状态
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 18 ++++++++++++++++++
src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java | 7 ++++++-
2 files changed, 24 insertions(+), 1 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 1678366..df506ea 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
@@ -176,9 +176,27 @@
}else {
FollowTraderProfitInfoVo.setDocumentaryType(2);
}
+
}
Long traderId = FollowTraderProfitInfoVo.getTraderId();
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);
+
+ //获取当前跟单人数
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("trader_id", traderId);
+ List<FollowFollowerSettingEntity> selectByMap = followFollowerSettingDao.selectByMap(columnMap);
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ Integer followNum = followTraderInfoEntity.getFollowNum();
+ int size = selectByMap.size();
+ if(followNum > size) {
+ FollowTraderProfitInfoVo.setIsActualAll(2);
+ }else {
+ FollowTraderProfitInfoVo.setIsActualAll(1);
+ }
+ }else {
+ FollowTraderProfitInfoVo.setIsActualAll(2);
+ }
+
String avatar = followTraderInfoEntity.getAvatar();
FollowTraderProfitInfoVo.setAvatar(avatar);
String nickname = followTraderInfoEntity.getNickname();
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
index 155c8fe..65a7cdf 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
@@ -82,8 +82,13 @@
/**
* 是否满员 1-是2-否
*/
- @ApiModelProperty("是否满员 1-是2-否")
+ @ApiModelProperty("交易员是否设置满员 1-是2-否")
private Integer isAll;
+ /**
+ * 是否满员 1-是2-否
+ */
+ @ApiModelProperty("实际是否满员 1-是2-否")
+ private Integer isActualAll;
/**
* 跟单状态 1：已跟单2：未跟单
*/
--
Gitblit v1.9.1