From 6c4ca033bf15f7bb6fa01f15e06212ad5ba0868d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 15 May 2021 17:59:26 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml b/src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml
index 374d8e0..7454a0e 100644
--- a/src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml
+++ b/src/main/resources/mapper/documentary/FollowFollowerOrderRelationDao.xml
@@ -29,10 +29,17 @@
<select id="selectFollowHoldOrderByTradeOrderNo" resultType="com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity">
select a.*
from follow_follower_order_relation a, follow_follower_profit b
- where a.trade_member_id=b.trade_member_id and a.trade_order_no=#{orderNo} and b.is_follow=1
+ where a.member_id=b.member_id and a.trade_order_no=#{orderNo} and b.is_follow=1
and a.order_type=1
</select>
+ <select id="selectFollowOrderByTradeOrderNo" resultType="com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity">
+ select a.*
+ from follow_follower_order_relation a, follow_follower_profit b
+ where a.member_id=b.member_id and a.trade_order_no=#{orderNo} and b.is_follow=1
+ and a.order_type=2
+ </select>
+
<select id="selectTraderTotalProfit" resultType="java.math.BigDecimal">
select sum(b.reward_amount)
from follow_follower_order_relation a, contract_order b
--
Gitblit v1.9.1