From baaab35e79a61784cde5c6a503eef3114e2169f0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 10:21:58 +0800
Subject: [PATCH] Merge branch 'activity' into yunding
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index f462c7f..b5b1d61 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -9,10 +9,11 @@
*
FROM
yd_order a
- left join yd_product b on b.id = a.product_id
+ inner join yd_product b on b.id = a.product_id
<if test="record != null">
<where>
and a.member_id = #{record.memberId}
+ and a.type=1
<if test="record.state != null" >
and a.state=#{record.state}
</if>
@@ -67,7 +68,7 @@
*
FROM
yd_order a
- left join yd_product b on b.id = a.product_id
+ inner join yd_product b on b.id = a.product_id
where a.member_id = #{memberId}
and a.id = #{id}
</select>
@@ -87,4 +88,10 @@
s.id = #{id}
</update>
+ <select id="selectTeamAllPower" resultMap="orderMap">
+ select a.*, c.id p_id, c.pro_unit
+ from yd_order a
+ inner join (select * from member a where find_in_set(#{inviteId}, a.referer_ids) or invite_id=#{inviteId}) b on a.member_id=b.id
+ inner join yd_product c on c.id = a.product_id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1