From 7c6f033b8754b07bf5c75ae8745a982d76f9abb4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Sep 2022 19:28:14 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 9c42c9d..dd74bb6 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -33,7 +33,7 @@
                 </if>
             </if>
         </where>
-        order by m.CREATED_TIME desc
+        GROUP BY m.id order by m.CREATED_TIME desc
     </select>
 
     <select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
@@ -88,8 +88,8 @@
              where e.status in (2, 3, 4) and e.order_type=1 and (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) amount,
             (select count(1) from mall_member e
                       inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
-             where e.invite_id=a.invite_id or e.referrer_id=a.invite_id) orderCnt,
-            (select count(1) from mall_member x where x.referrer_id=a.invite_id) cnt
+             where find_in_set(a.invite_id, e.referrer_ids)) orderCnt,
+            (select count(1) from mall_member x where find_in_set(a.invite_id, x.referrer_ids)) cnt
         from mall_member a
         inner join mall_member_wallet p on a.id=p.member_id
         left join data_dictionary_custom u on a.level=u.code and u.type='AGENT_LEVEL'
@@ -400,4 +400,11 @@
         select * from mall_member
         where level=#{level}
     </select>
+
+    <select id="selectMemberByOpenId" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        SELECT a.*
+        FROM mall_member a
+        where a.open_id = #{openId} limit 1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1