From 1fc82463c1e370a26360e8ee015be17a0dfc468c Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Thu, 11 Jun 2020 19:14:19 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin_manage.git
---
src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml b/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml
index 5cd0bf9..95fbff9 100644
--- a/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml
+++ b/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml
@@ -3,18 +3,15 @@
<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper">
- <select id="findmemberQuickBuySaleListInPage" resultType="com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity">
+ <select id="findmemberQuickBuySaleListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo">
select * from member_quick_buy_sale s left join member m on m.id = s.member_id
<where>
s.order_type = 'B'
<if test="record != null" >
- <if test="record.createTime!=null">
- and s.create_time >=#{record.createTime}
+ <if test="record.account!=null and record.account!=''">
+ and (m.phone = #{record.account} or m.email = #{record.account} or s.member_id=#{record.account})
</if>
- <if test="record.memberId!=null">
- and (m.phone = #{record.memberId} or m.email = #{record.memberId} or m.invite_id=#{record.memberId})
- </if>
- <if test="record.orderStatus!=null" >
+ <if test="record.orderStatus!=null and record.orderStatus!= 0" >
and s.order_status = #{record.orderStatus}
</if>
</if>
--
Gitblit v1.9.1