From ad8c985be319fe085a04b266770f941f4c3426d9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 19:10:15 +0800
Subject: [PATCH] 20210304  交易员详情显示跟单最大人数

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   18 ++++++++++++++++--
 1 files changed, 16 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 2f93ebe..9948713 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
@@ -317,7 +317,7 @@
 				}
 
 				profitOrLess = profitOrLess.add(rewardRatio).setScale(2, BigDecimal.ROUND_DOWN);
-				totalBondAmount = totalBondAmount.add(contractHoldOrderEntity.getBondAmount());
+				totalBondAmount = totalBondAmount.add(contractHoldOrderEntity.getBondAmount()).setScale(2, BigDecimal.ROUND_DOWN);
 			}
 		}
 
@@ -677,8 +677,9 @@
         Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();
         if(maxFollowCnt > 0){
         	documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt.toString());
+		}else {
+			documentaryOrderSetInfoVo.setMaxFollowCnt("");
 		}
-        documentaryOrderSetInfoVo.setMaxFollowCnt("");
         log.info(memberId + "-最大持仓张数-"+maxFollowCnt.toString());
 		return Result.ok(documentaryOrderSetInfoVo);
 	}
@@ -747,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);
@@ -820,6 +833,7 @@
         	followTraderInfoEntity.setDeclaration(declaration);
         }
         followTraderInfoEntity.setLabels(labels);
+        followTraderInfoEntity.setFollowNum(FollowTraderInfoEntity.FOLLOWNUM_DEFAULT);
         followTraderInfoEntity.setIsAll(FollowTraderInfoEntity.IS_ALL_N);
         followTraderInfoEntity.setProfitRatio(BigDecimal.ZERO);
         followTraderInfoEntity.setVerifyStatus(FollowTraderInfoEntity.VERIFYSTATUS_ING);

--
Gitblit v1.9.1