From 81e2daefc30afbe5ce2e02de198247e93a835ed8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Mar 2021 14:31:06 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
index ee31c58..a1ebba4 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -42,7 +42,7 @@
private FollowTraderProfitInfoDao followTraderProfitInfoDao;
//@Scheduled(cron = "0 0/30 * * * ? ")
- @Scheduled(cron = "0 0/5 * * * ?")
+ @Scheduled(cron = "0/5 * * * * ? *")
public void traderProfitUpdate() {
log.info("交易员定时任务执行");
// 查询所有交易员信息
@@ -52,10 +52,11 @@
Long tradeMemberId = trader.getMemberId();
FollowTraderProfitInfoEntity traderInfoProfit = followTraderProfitInfoDao.selectTraderInfoProfitByMemberId(tradeMemberId);
// 累计收益率
- BigDecimal totalProfitRatio = contractOrderDao.selectFollowOrderTotalProfitByMemberId(tradeMemberId);
+ BigDecimal totalProfitRatio = contractOrderDao.selectFollowOrderTotalProfitByMemberId(tradeMemberId).setScale(2, BigDecimal.ROUND_DOWN);
traderInfoProfit.setTotalProfitRatio(totalProfitRatio);
- // 带单总收益
- BigDecimal totalProfit = followFollowerOrderRelationDao.selectTraderTotalProfit(tradeMemberId);
+ // 带单总收益,只查询交易员自己的带单总收益
+ BigDecimal totalProfit = followFollowerOrderRelationDao.selectTraderTotalProfitSelf(tradeMemberId);
+ //BigDecimal totalProfit = followFollowerOrderRelationDao.selectTraderTotalProfit(tradeMemberId);
traderInfoProfit.setTotalProfit(totalProfit);
// 交易笔数
List<ContractOrderEntity> orders = contractOrderDao.selectFollowOrderByMemberId(tradeMemberId);
@@ -69,10 +70,10 @@
traderInfoProfit.setWinRate(winRate);
}
- // 跟随者总收益
+ // 当前跟随者总收益
BigDecimal followerProfit = followFollowerProfitDao.selectAllFollowerProfit(tradeMemberId);
traderInfoProfit.setFollowerTotalProfit(followerProfit);
- // 累计跟随人数
+ // 当前跟随人数
int followerCnt = followFollowerProfitDao.selectFollowerCntByTradeMemberId(tradeMemberId);
traderInfoProfit.setTotalFollowerCnt(followerCnt);
--
Gitblit v1.9.1