From f81f17153ce39e784d35adf159badf16e57469be Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 15:07:28 +0800
Subject: [PATCH] modify

---
 src/main/resources/mapper/yunding/YdOrderDao.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index b5b1d61..3075f61 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -47,13 +47,14 @@
         <association property="ydProductEntity" javaType="com.xcong.excoin.modules.yunding.entity.YdProductEntity">
             <id column="p_id" property="id" />
             <result column="pro_unit" property="proUnit" />
+            <result column="manage_expense" property="manageExpense" />
         </association>
     </resultMap>
 
     <select id="selectAllValidOrders" resultMap="orderMap">
-        select a.*, b.id p_id, b.pro_unit from yd_order a
+        select a.*, b.id p_id, b.pro_unit, b.manage_expense from yd_order a
         inner join yd_product b on a.product_id=b.id
-        where a.state=2
+        where a.state=2 and a.type = 1
     </select>
 
     <update id="UpdateByIdAndState">
@@ -93,5 +94,6 @@
             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
+        where a.type=1
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1