From df1716a9abacac95261d686bdf0776bc7d6deca2 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 13 Sep 2020 01:15:03 +0800
Subject: [PATCH] 撮合交易代码提交

---
 src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml |   73 ++++++++++++++++++++++--------------
 1 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml b/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
index 03a89ae..303667f 100644
--- a/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
+++ b/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
@@ -1,38 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.xcong.excoin.modules.coin.dao.OrderCoinDealDao">	
-	
-	<select id="selectAllWalletCoinOrder"  resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
-		 select * from coins_order_deal 
-		 <where>
-	 		<if test="memberId != null  and  memberId  != ''">
-	 			 and member_id = #{memberId}
-	 		</if>
-		 </where>
-		 order by create_time desc
+<mapper namespace="com.xcong.excoin.modules.coin.dao.OrderCoinDealDao">
+
+    <select id="selectAllWalletCoinOrder" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
+        select * from coins_order_deal
+        <where>
+            <if test="memberId != null  and  memberId  != ''">
+                and member_id = #{memberId}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectOrderCoinDealByTime" resultType="com.xcong.excoin.trade.ExchangeTrade">
+		SELECT
+            symbol symbol,
+            deal_price price,
+            symbol_cnt amount,
+            deal_amount buyTurnover,
+            deal_amount sellTurnover,
+            order_type direction,
+            create_time time
+		  from coins_order_deal
+		  where symbol = #{symbol}
+		  and order_type  = 1
+		  and order_status = 3
+		  and create_time between #{startTime} and #{endTime}
 	</select>
-	<select id="selectAllWalletCoinOrderBySymbol"  resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
-		 select * from coins_order_deal 
-		 <where>
-	 		<if test="memberId != null  and  memberId  != ''">
-	 			 and member_id = #{memberId}
-	 		</if>
-	 		<if test="symbol != null  and  symbol  != ''">
-	 			 and symbol = #{symbol}
-	 		</if>
-		 </where>
-		 order by create_time desc
-	</select>
-	
-	<select id="selectWalletCoinOrder" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
+    <select id="selectAllWalletCoinOrderBySymbol"
+            resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
+        select * from coins_order_deal
+        <where>
+            <if test="memberId != null  and  memberId  != ''">
+                and member_id = #{memberId}
+            </if>
+            <if test="symbol != null  and  symbol  != ''">
+                and symbol = #{symbol}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectWalletCoinOrder" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
 		select * from coins_order_deal where order_id= #{orderId} and member_id = #{memberId}
 	</select>
-	
-	<select id="findAllWalletCoinOrderInPage" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
+
+    <select id="findAllWalletCoinOrderInPage" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
         select * from coins_order_deal
         <if test="record != null">
             <where>
-                <if test="record.memberId != null" >
+                <if test="record.memberId != null">
                     and member_id=#{record.memberId}
                 </if>
                 <if test="record.symbol != null and record.symbol != ''">
@@ -42,5 +59,5 @@
         </if>
         order by create_time desc
     </select>
-	
+
 </mapper>

--
Gitblit v1.9.1