From eb9d939661413fc70975b0a75b44126c257bdc49 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Apr 2021 18:27:43 +0800
Subject: [PATCH] 20210414 测试账号的跟随者不返利给交易员
---
src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 e005fc5..2242c0b 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -52,7 +52,6 @@
//@Scheduled(cron = "0 0/30 * * * ? ")
@Scheduled(cron = "0/5 * * * * ?")
public void traderProfitUpdate() {
- log.info("交易员定时任务执行");
// 查询所有交易员信息
List<FollowTraderInfoEntity> allTraders = followTraderInfoDao.selectAllTraderInfo();
if (CollUtil.isNotEmpty(allTraders)) {
@@ -93,13 +92,15 @@
List<ContractOrderEntity> orders = contractOrderDao.selectFollowOrderListByMemberId(tradeMemberId);
traderInfoProfit.setTotalOrderCnt(CollUtil.isNotEmpty(orders) ? orders.size() : 0);
// 近三周胜率
- Integer winCnt = contractOrderDao.selectFollowOrderCntForWinRate(tradeMemberId, 1);
- Integer allCnt = contractOrderDao.selectFollowOrderCntForWinRate(tradeMemberId, null);
-
- if (winCnt != null && allCnt != null && allCnt!=0) {
- BigDecimal winRate = BigDecimal.valueOf(winCnt).divide(BigDecimal.valueOf(allCnt), 4, BigDecimal.ROUND_DOWN);
- traderInfoProfit.setWinRate(winRate);
+ BigDecimal winCnt = contractOrderDao.selectFollowOrderCntForWinRate(tradeMemberId, 1);
+ winCnt = (winCnt == null?BigDecimal.ZERO:winCnt.setScale(2, BigDecimal.ROUND_DOWN));
+ BigDecimal allCnt = contractOrderDao.selectFollowOrderCntForWinRate(tradeMemberId, null);
+ allCnt = (allCnt == null?BigDecimal.ZERO:allCnt.setScale(2, BigDecimal.ROUND_DOWN));
+ BigDecimal winRate = BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_DOWN);
+ if (allCnt.compareTo(BigDecimal.ZERO) > 0) {
+ winRate = winCnt.divide(allCnt, 2, BigDecimal.ROUND_DOWN).setScale(2, BigDecimal.ROUND_DOWN);
}
+ traderInfoProfit.setWinRate(winRate);
Date date = new Date();
DateTime offsetDay = DateUtil.offsetDay(new Date(), -30);
//30天胜率（30天盈利总单数/30平仓总单数）
--
Gitblit v1.9.1