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

---
 src/main/resources/mapper/yunding/YdOrderDao.xml |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index 0309bea..c031f39 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -48,11 +48,12 @@
             <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
     </select>
@@ -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,18 +107,22 @@
 
     <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 where referer_id = #{inviteId}
+            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,
-               sum(quantity) powerNum
-        from member a
-        left join yd_order b where b.member_id = a.id
-        where a.referer_id = #{record.inviteId}
-            and b.type = 1
-        group by a.member_id
-        order by a.create_time desc
+        SELECT
+            a.invite_id invitephone
+        FROM
+            member a
+        WHERE
+            a.referer_id = #{record.inviteId}
+    </select>
+
+    <select id="selectMemberByInviteId" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+        select * 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