From 497d9399da3fe78f7ef1934f92953d00df3ac549 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 30 Jul 2020 15:02:55 +0800
Subject: [PATCH] Merge branch 'master' into follow

---
 src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml b/src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml
index cc8e13f..5465376 100644
--- a/src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml
+++ b/src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml
@@ -15,7 +15,53 @@
 			follow_follower_profit 
 		WHERE 
 			trade_member_id = #{tradeMemberId} 
+			and is_follow = 1
 		order by create_time desc
     </select>
+    
+	<select id="selectFollowFollowerProfitEntitys" resultType="com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity">
+		SELECT
+			*
+		FROM
+			follow_follower_profit 
+		WHERE 
+			member_id = #{memberId} 
+			and is_follow = 1
+		order by create_time desc
+    </select>
+    
+	<select id="getMyFollowOrderHistoryRecords" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
+		SELECT
+			*
+		FROM
+			contract_order 
+		WHERE 
+			member_id = #{memberId} 
+			and contract_type = 2
+			and order_type in (3,4)
+			and closing_type not in (4,5)
+		order by opening_time desc
+    </select>
+	<select id="getMyFollowOrderNowRecords" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
+		SELECT
+			*
+		FROM
+			contract_hold_order 
+		WHERE 
+			member_id = #{memberId} 
+			and contract_type = 2
+		order by opening_time desc
+    </select>
+    
+	<select id="getFollowOrderNowRecords" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
+		SELECT
+			*
+		FROM
+			contract_hold_order 
+		WHERE 
+			member_id = #{memberId} 
+			and contract_type = 2
+		order by opening_time desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1