From 6a0e1564efae8aa6069bddedef749bf5c8b9b0c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 15:52:36 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index 4fed875..a9ab9ca 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -48,13 +48,14 @@
<id column="p_id" property="id" />
<result column="pro_unit" property="proUnit" />
<result column="manage_expense" property="manageExpense" />
+ <result column="pro_num" property="proNum" />
</association>
</resultMap>
<select id="selectAllValidOrders" resultMap="orderMap">
- select a.*, b.id p_id, b.pro_unit, b.manage_expense from yd_order a
+ select a.*, b.id p_id, b.pro_unit, b.pro_num, b.manage_expense from yd_order a
inner join yd_product b on a.product_id=b.id
- where a.state=2 and a.type = 1
+ where a.state=2 and a.type = 1 and b.coin='XCH'
</select>
<update id="UpdateByIdAndState">
@@ -90,10 +91,10 @@
</update>
<select id="selectTeamAllPower" resultMap="orderMap">
- select a.*, c.id p_id, c.pro_unit
+ select a.*, c.id p_id, c.pro_unit, c.pro_num
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
+ inner join yd_product c on c.id = a.product_id and c.pro_unit!='节点'
where a.type=1
</select>
--
Gitblit v1.9.1