From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole

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

diff --git a/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml b/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
index f498ab6..03a89ae 100644
--- a/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
+++ b/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
@@ -28,4 +28,19 @@
 		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 * from coins_order_deal
+        <if test="record != null">
+            <where>
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+                <if test="record.symbol != null and record.symbol != ''">
+                    and symbol = #{record.symbol}
+                </if>
+            </where>
+        </if>
+        order by create_time desc
+    </select>
+	
 </mapper>

--
Gitblit v1.9.1