From 0d74b08831ab8d77d065104985623c829b3e27f2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 11:11:15 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java | 15 +++++++++------
1 files changed, 9 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 fa78683..1addfdb 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -41,8 +41,9 @@
@Resource
private FollowTraderProfitInfoDao followTraderProfitInfoDao;
+
//@Scheduled(cron = "0 0/30 * * * ? ")
- @Scheduled(cron = "0/30 * * * * ?")
+ @Scheduled(cron = "0/5 * * * * ?")
public void traderProfitUpdate() {
log.info("交易员定时任务执行");
// 查询所有交易员信息
@@ -52,10 +53,12 @@
Long tradeMemberId = trader.getMemberId();
FollowTraderProfitInfoEntity traderInfoProfit = followTraderProfitInfoDao.selectTraderInfoProfitByMemberId(tradeMemberId);
// 累计收益率
- BigDecimal totalProfitRatio = contractOrderDao.selectFollowOrderTotalProfitByMemberId(tradeMemberId);
+ BigDecimal ljsyl = contractOrderDao.selectFollowOrderTotalProfitByMemberId(tradeMemberId);
+ BigDecimal totalProfitRatio = (ljsyl == null?BigDecimal.ZERO:ljsyl.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 +72,10 @@
traderInfoProfit.setWinRate(winRate);
}
- // 跟随者总收益
+ // 当前跟随者总收益
BigDecimal followerProfit = followFollowerProfitDao.selectAllFollowerProfit(tradeMemberId);
traderInfoProfit.setFollowerTotalProfit(followerProfit);
- // 累计跟随人数
+ // 当前跟随人数
int followerCnt = followFollowerProfitDao.selectFollowerCntByTradeMemberId(tradeMemberId);
traderInfoProfit.setTotalFollowerCnt(followerCnt);
--
Gitblit v1.9.1