From 19589e0699d7ab0a56f80691e1ec0e5cec7fd17c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 05 Mar 2021 17:21:10 +0800
Subject: [PATCH] 20210305  满员状态

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 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 bbe01e9..c1f2f73 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();
@@ -760,6 +778,15 @@
 		}else {
 			followTraderProfitInfoVo.setFollowNumNow(0);
 		}
+		if(CollUtil.isNotEmpty(selectByMap)) {
+			if(followNum > selectByMap.size()){
+				followTraderProfitInfoVo.setIsActualAll(2);
+			}else{
+				followTraderProfitInfoVo.setIsActualAll(1);
+			}
+		}else {
+			followTraderProfitInfoVo.setIsActualAll(2);
+		}
 		followTraderProfitInfoVo.setFollowNum(followNum);
 		followTraderProfitInfoVo.setAvatar(avatar);
 		followTraderProfitInfoVo.setNickname(nickname);
@@ -941,6 +968,18 @@
         //获取【交易员信息表】数据
         FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
         if(ObjectUtil.isNotEmpty(followTraderInfoEntity)) {
+			Integer followNum = followTraderInfoEntity.getFollowNum();
+			//获取当前跟单人数
+			Map<String, Object> columnMap = new HashMap<>();
+			columnMap.put("trade_id", followTraderInfoEntity.getId());
+			columnMap.put("is_follow", FollowFollowerProfitEntity.IS_FOLLOW_Y);
+			List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
+			if(CollUtil.isNotEmpty(selectByMap)) {
+				tradeProfitInfoVo.setFollowNumNow(selectByMap.size());
+			}else {
+				tradeProfitInfoVo.setFollowNumNow(0);
+			}
+			tradeProfitInfoVo.setFollowNum(followNum);
         	String avatar = followTraderInfoEntity.getAvatar();
         	tradeProfitInfoVo.setAvatar(avatar);
         	String nickname = followTraderInfoEntity.getNickname();

--
Gitblit v1.9.1