From 4d6d1bbc959a14ba8777022ddb24340ddb7925f4 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 04 Mar 2021 21:25:40 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 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 b2857d5..6db2a42 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
@@ -637,17 +637,17 @@
         long parseLong = Long.parseLong(tradeId);
         
         //只能跟随一个人
-        Map<String, Object> columnMaps = new HashMap<>();
-        columnMaps.put("member_id", memberId);
-        List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
-        if(CollUtil.isNotEmpty(followFollowerSettingEntityAllows)) {
-        	for(FollowFollowerSettingEntity followFollowerSettingEntityAllow : followFollowerSettingEntityAllows) {
-        		Long tradeIdAllow = followFollowerSettingEntityAllow.getTraderId();
-        		if(parseLong != tradeIdAllow) {
-        			return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
-        		}
-        	}
-        }
+//        Map<String, Object> columnMaps = new HashMap<>();
+//        columnMaps.put("member_id", memberId);
+//        List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
+//        if(CollUtil.isNotEmpty(followFollowerSettingEntityAllows)) {
+//        	for(FollowFollowerSettingEntity followFollowerSettingEntityAllow : followFollowerSettingEntityAllows) {
+//        		Long tradeIdAllow = followFollowerSettingEntityAllow.getTraderId();
+//        		if(parseLong != tradeIdAllow) {
+//        			return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
+//        		}
+//        	}
+//        }
         
         //获取【跟随者设置】数据
         FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);
@@ -748,6 +748,18 @@
 		String nickname = followTraderInfoEntity.getNickname();
 		String declaration = followTraderInfoEntity.getDeclaration();
 		Integer isAll = followTraderInfoEntity.getIsAll();
+		Integer followNum = followTraderInfoEntity.getFollowNum();
+		//获取当前跟单人数
+		Map<String, Object> columnMap = new HashMap<>();
+		columnMap.put("trade_id", traderId);
+		columnMap.put("is_follow", FollowFollowerProfitEntity.IS_FOLLOW_Y);
+		List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
+		if(CollUtil.isNotEmpty(selectByMap)) {
+			followTraderProfitInfoVo.setFollowNumNow(selectByMap.size());
+		}else {
+			followTraderProfitInfoVo.setFollowNumNow(0);
+		}
+		followTraderProfitInfoVo.setFollowNum(followNum);
 		followTraderProfitInfoVo.setAvatar(avatar);
 		followTraderProfitInfoVo.setNickname(nickname);
 		followTraderProfitInfoVo.setDeclaration(declaration);

--
Gitblit v1.9.1