From 28c75d75794e623b38be0106c126a5a65947a357 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 13:19:17 +0800
Subject: [PATCH] 20210325 交易员头部信息
---
src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java | 1 +
src/main/resources/mapper/contract/ContractOrderDao.xml | 2 +-
src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml | 2 +-
src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java | 11 ++++++-----
src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml | 6 ++++++
5 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java
index d37f698..cbbc8ac 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java
@@ -20,4 +20,5 @@
List<FollowFollowerOrderRelationEntity> selectFollowHoldOrderByTradeOrderNo(@Param("orderNo") String orderNo);
BigDecimal selectTraderTotalProfit(@Param("memberId") Long memberId);
+ BigDecimal selectTraderTotalProfitSelf(@Param("memberId") Long memberId);
}
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 7a82336..9571923 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -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_HALF_UP);
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);
diff --git a/src/main/resources/mapper/contract/ContractOrderDao.xml b/src/main/resources/mapper/contract/ContractOrderDao.xml
index ff042eb..8dea86b 100644
--- a/src/main/resources/mapper/contract/ContractOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractOrderDao.xml
@@ -60,7 +60,7 @@
</select>
<select id="selectFollowOrderTotalProfitByMemberId" resultType="java.math.BigDecimal">
- select sum(reward_ratio)*100
+ select IFNULL(sum(reward_ratio)*100, 0)
from contract_order
where member_id=#{memberId} and contract_type=2
</select>
diff --git a/src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml b/src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml
index f4441bf..7ef1015 100644
--- a/src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml
+++ b/src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml
@@ -38,4 +38,10 @@
from follow_follower_order_relation a, contract_order b
where a.order_id=b.id and a.trade_member_id=#{memberId}
</select>
+
+ <select id="selectTraderTotalProfitSelf" resultType="java.math.BigDecimal">
+ select IFNULL(sum(reward_amount), 0)
+ from contract_order
+ where member_id=#{memberId} and contract_type=2
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml b/src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml
index d92a2c7..6e1fbeb 100644
--- a/src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml
+++ b/src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml
@@ -108,6 +108,6 @@
<select id="selectAllFollowerProfit" resultType="java.math.BigDecimal">
select sum(total_profit)
from follow_follower_profit
- where trade_member_id=#{tradeMemberId}
+ where trade_member_id=#{tradeMemberId} and is_follow = 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1