From 5362b91fef72e64c4600c1feda7c250a487efe61 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 18 Jun 2020 18:00:46 +0800
Subject: [PATCH] 20200618  代码提交

---
 src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml b/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml
index 95fbff9..d6b9f41 100644
--- a/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml
+++ b/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml
@@ -9,7 +9,43 @@
         s.order_type = 'B' 
             <if test="record != null" >
                 <if test="record.account!=null and record.account!=''">
-                    and (m.phone = #{record.account} or m.email = #{record.account} or s.member_id=#{record.account})
+                    and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
+                </if>
+                <if test="record.orderStatus!=null and record.orderStatus!= 0" >
+                    and s.order_status = #{record.orderStatus}
+                </if>
+            </if>
+        </where>
+        order by s.create_time desc
+    </select>
+    
+    <select id="findmemberQuickSaleListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberQuickSaleVo">
+        SELECT
+			s.id,
+			s.create_time createTime,
+			a.phone,
+			a.email,
+			s.member_id memberId,
+			s.unit_price unitPrice,
+			s.amount_cny amountCny,
+			s.amount_usdt amountUsdt,
+			s.order_status orderStatus,
+			m.name,
+			m.account,
+			a.invite_id inviteId,
+			m.payment_qrcode paymentQrcode,
+			m.bank,
+			m.payment_type paymentType,
+			s.order_no orderNo
+		FROM
+			member_quick_buy_sale s
+		LEFT JOIN member_payment_method m ON m.id = s.member_id
+		LEFT JOIN member a ON a.id = s.member_id
+        <where>
+        s.order_type = 'S' 
+            <if test="record != null" >
+                <if test="record.account!=null and record.account!=''">
+                    and (a.phone = #{record.account} or a.email = #{record.account} or a.invite_id=#{record.account})
                 </if>
                 <if test="record.orderStatus!=null and record.orderStatus!= 0" >
                     and s.order_status = #{record.orderStatus}

--
Gitblit v1.9.1