From 56a985a15e74c16ede9ef354750c82b1e35b97e5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 16:28:49 +0800
Subject: [PATCH] 20210528

---
 src/main/resources/mapper/yunding/YdOrderDao.xml |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index 8045a9f..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>
 
@@ -106,33 +107,30 @@
 
     <select id="selectAllPowerByMemberIdAndElse" resultType="java.lang.Integer">
         select ifnull(sum(quantity),0) from yd_order where type = 1 and member_id in (
-            select member_id from member
+            select id from member
             where find_in_set(#{inviteId}, referer_ids) or invite_id=#{inviteId}
             )
     </select>
 
     <select id="getTeamInfoList" resultType="com.xcong.excoin.modules.yunding.vo.TeamInfoVo">
         SELECT
-            a.phone phone,
-            (
-                SELECT
-                    IFNULL(sum(b.quantity),0)
-                FROM
-                    yd_order b
-                WHERE
-                    b.member_id = a.id
-                  AND b.type = 1
-            ) powerNum
+            a.invite_id invitephone
         FROM
             member a
         WHERE
             a.referer_id = #{record.inviteId}
-        ORDER BY
-            powerNum DESC
     </select>
 
     <select id="selectMemberByInviteId" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
         select * from member
-        where find_in_set(#{inviteId}, a.referer_ids) or invite_id=#{inviteId}
+        where find_in_set(#{inviteId}, referer_ids) or invite_id=#{inviteId}
     </select>
+
+    <select id="selectListByMemberIdAndElse" resultType="com.xcong.excoin.modules.yunding.entity.YdOrderEntity">
+        select * from yd_order where type = 1 and member_id in (
+            select id from member
+            where find_in_set(#{inviteId}, referer_ids) or invite_id=#{inviteId}
+        )
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1