From 3d0aa53f29bf42e9f2a28cdbbd109f0e9bb86e7c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 18:17:27 +0800
Subject: [PATCH] 20210326 交易员列表定时器
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 143 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 113 insertions(+), 30 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 fa96ee8..6baf44e 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
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -160,7 +161,17 @@
FollowTraderProfitInfoEntity followTraderProfitInfoEntity = new FollowTraderProfitInfoEntity();
if(FollowTraderInfoEntity.IS_SETFRIST_Y.equals(type)) {
followTraderProfitInfoEntity.setType(type);
+ }else {
+ String nicknameDto = recordsPageDto.getNickname();
+ followTraderProfitInfoEntity.setNickname(nicknameDto);
+ int totalProfitRatioSc = recordsPageDto.getTotalProfitRatioSc();
+ followTraderProfitInfoEntity.setTotalProfitRatioSc(totalProfitRatioSc);
+ int totalFollowerCntSc = recordsPageDto.getTotalFollowerCntSc();
+ followTraderProfitInfoEntity.setTotalFollowerCntSc(totalFollowerCntSc);
+ int winRateSc = recordsPageDto.getWinRateSc();
+ followTraderProfitInfoEntity.setWinRateSc(winRateSc);
}
+
IPage<FollowTraderProfitInfoVo> followTraderProfitInfoList = followTraderProfitInfoDao.selectFollowTraderProfitInfoEntity(page, followTraderProfitInfoEntity);
List<FollowTraderProfitInfoVo> followTraderProfitInfoVoList = followTraderProfitInfoList.getRecords();
@@ -176,9 +187,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();
@@ -376,7 +405,7 @@
myFollowOrderVo.setLeverRatio(leverRatio);
BigDecimal rewardAmount = contractOrderEntity.getRewardAmount().setScale(2, BigDecimal.ROUND_DOWN);
myFollowOrderVo.setRewardAmount(rewardAmount);
- BigDecimal rewardRatio = contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal rewardRatio = contractOrderEntity.getRewardRatio() == null ? BigDecimal.ZERO : contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);
myFollowOrderVo.setRewardRatio(rewardRatio);
int symbolCnt = contractOrderEntity.getSymbolCnt();
myFollowOrderVo.setSymbolCnt(symbolCnt);
@@ -497,7 +526,7 @@
String nickname = followTraderInfoEntity.getNickname();
myFollowTraderInfoVo.setNickname(nickname);
BigDecimal totalPrincipal = FollowFollowerProfitEntity.getTotalPrincipal();
- myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
+ myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal.setScale(2, BigDecimal.ROUND_DOWN));
BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();
myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
@@ -750,6 +779,9 @@
String declaration = followTraderInfoEntity.getDeclaration();
Integer isAll = followTraderInfoEntity.getIsAll();
Integer followNum = followTraderInfoEntity.getFollowNum();
+ Date entryTime = followTraderInfoEntity.getEntryTime();
+ int datePoor = getDatePoor(entryTime, new Date());
+ followTraderProfitInfoVo.setEntryDays(datePoor);
//获取当前跟单人数
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("trade_id", traderId);
@@ -760,12 +792,34 @@
}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);
followTraderProfitInfoVo.setDeclaration(declaration);
followTraderProfitInfoVo.setIsAll(isAll);
return Result.ok(followTraderProfitInfoVo);
+ }
+
+ //获取两个时间之间的日期
+ private int getDatePoor(Date endDate, Date nowDate) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(endDate);
+ long time1 = cal.getTimeInMillis();
+ cal.setTime(nowDate);
+ long time2 = cal.getTimeInMillis();
+ long between_days=(time2-time1)/(1000*3600*24);
+ int parseInt = Integer.parseInt(String.valueOf(between_days));
+ parseInt = parseInt + 1;
+ return parseInt ;
}
@Override
@@ -940,7 +994,22 @@
TradeProfitInfoVo tradeProfitInfoVo = new TradeProfitInfoVo();
//获取【交易员信息表】数据
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+ Date entryTime = followTraderInfoEntity.getEntryTime();
+ int datePoor = getDatePoor(entryTime, new Date());
+ tradeProfitInfoVo.setEntryDays(datePoor);
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();
@@ -1079,6 +1148,7 @@
BigDecimal rewardAmount = orderEntity.getRewardAmount();
allRewardAmount = allRewardAmount.add(rewardAmount);
BigDecimal rewardRatio = orderEntity.getRewardRatio();
+ rewardRatio = rewardRatio == null ? BigDecimal.ZERO : rewardRatio;
allRewardRatio = allRewardRatio.add(rewardRatio);
}
}
@@ -1101,7 +1171,7 @@
myFollowOrderVo.setLeverRatio(leverRatio);
BigDecimal rewardAmount = contractOrderEntity.getRewardAmount().setScale(2, BigDecimal.ROUND_DOWN);
myFollowOrderVo.setRewardAmount(rewardAmount);
- BigDecimal rewardRatio = contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);
+ BigDecimal rewardRatio = contractOrderEntity.getRewardRatio() == null ? BigDecimal.ZERO : contractOrderEntity.getRewardRatio().setScale(4, BigDecimal.ROUND_DOWN);
myFollowOrderVo.setRewardRatio(rewardRatio);
int symbolCnt = contractOrderEntity.getSymbolCnt();
myFollowOrderVo.setSymbolCnt(symbolCnt);
@@ -1271,44 +1341,57 @@
public Result getDocumentaryOrderSetState(String tradeId) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- boolean orderSetState = false;
long parseLong = Long.parseLong(tradeId);
- //只能跟随一个人
- Map<String, Object> columnMaps = new HashMap<>();
- columnMaps.put("member_id", memberId);
- List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
- if(CollUtil.isEmpty(followFollowerSettingEntityAllows)) {
- orderSetState = Boolean.TRUE;
- }else {
- if(followFollowerSettingEntityAllows.size() == 1) {
- Long tradeIdAllow = followFollowerSettingEntityAllows.get(0).getTraderId();
- if(parseLong == tradeIdAllow) {
- orderSetState = Boolean.TRUE;
- }
- }
- }
- //交易员判断
- Map<String, Object> columnMapTrader = new HashMap<>();
- columnMapTrader.put("member_id", memberId);
+ //交易员判断
+ Map<String, Object> columnMapTrader = new HashMap<>();
+ columnMapTrader.put("member_id", memberId);
List<FollowTraderInfoEntity> followTraderInfoEntitys = followTraderInfoDao.selectByMap(columnMapTrader);
- //没有审核记录
+
+ //只能跟随一个人
+ Map<String, Object> columnMaps = new HashMap<>();
+ columnMaps.put("member_id", memberId);
+ List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
+
+ //没有交易员审核记录
if(CollUtil.isEmpty(followTraderInfoEntitys)) {
- orderSetState = Boolean.TRUE;
+ //没有跟随记录
+ if(CollUtil.isEmpty(followFollowerSettingEntityAllows)) {
+ return Result.ok("获取成功");
+ }else {
+ //有跟随记录
+ if(followFollowerSettingEntityAllows.size() == 1) {
+ Long tradeIdAllow = followFollowerSettingEntityAllows.get(0).getTraderId();
+ if(parseLong == tradeIdAllow) {
+ return Result.ok("获取成功");
+ }else{
+ return Result.fail("最多跟单一人");
+ }
+ }else{
+ return Result.fail("已经跟随多人，请修改");
+ }
+ }
}else{
Integer verifyStatus = followTraderInfoEntitys.get(0).getVerifyStatus();
if(FollowTraderInfoEntity.VERIFYSTATUS_N == verifyStatus) {
- orderSetState = Boolean.TRUE;
+ if(CollUtil.isEmpty(followFollowerSettingEntityAllows)) {
+ return Result.ok("获取成功");
+ }else {
+ if(followFollowerSettingEntityAllows.size() == 1) {
+ Long tradeIdAllow = followFollowerSettingEntityAllows.get(0).getTraderId();
+ if(parseLong == tradeIdAllow) {
+ return Result.ok("获取成功");
+ }else{
+ return Result.fail("最多跟单一人");
+ }
+ }else{
+ return Result.fail("已经跟随多人，请修改");
+ }
+ }
}else if(FollowTraderInfoEntity.VERIFYSTATUS_Y == verifyStatus){
return Result.fail("交易员不允许跟单");
}else {
return Result.fail("交易员审核中不允许跟单");
}
- }
-
- if (orderSetState) {
- return Result.ok("获取成功");
- } else {
- return Result.fail("最多跟单一人");
}
}
--
Gitblit v1.9.1