From 72c766b90d5a7140c4947efa4c9828ae0ed0e9c9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 26 Oct 2023 11:34:22 +0800
Subject: [PATCH] 版本管理

---
 src/main/resources/mapper/modules/ChatUserMapper.xml |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/modules/ChatUserMapper.xml b/src/main/resources/mapper/modules/ChatUserMapper.xml
index c7c4d86..c02649c 100644
--- a/src/main/resources/mapper/modules/ChatUserMapper.xml
+++ b/src/main/resources/mapper/modules/ChatUserMapper.xml
@@ -49,27 +49,33 @@
         a.is_robot isRobot,
         date_format(a.create_time, '%Y-%m-%d %H:%m:%s') createTime,
         IFNULL(sum(b.total_amount), 0) totalAmount,
-        IFNULL(sum(b.ava_amount), 0) avaAmount
+        IFNULL(sum(b.ava_amount), 0) avaAmount,
+        (
+            SELECT
+                COUNT(c.id)
+            FROM chat_red_bag c
+            where c.from_user_id = a.user_id
+                AND c.msg_type = 'GROUP'
+        ) groupRedBagNum
         from chat_user a
         left join chat_wallet b on b.user_id = a.user_id and type = 'USDT'
         <where>
-            <if test="record != null">
-                <if test="record.phone != null and record.phone != ''">
-                    and a.phone like CONCAT('%', CONCAT(#{record.phone}, '%'))
-                </if>
-                <if test="record.nickName != null and record.nickName != ''">
-                    and a.nick_name like CONCAT('%', CONCAT(#{record.nickName}, '%'))
-                </if>
-                <if test="record.inviteId != null and record.inviteId != ''">
-                    and a.invite_id = #{record.inviteId}
-                </if>
-                <if test="record.status != null and record.status != ''">
-                    and a.status = #{record.status}
-                </if>
+            <if test="record.phone != null and record.phone != ''">
+                and a.phone like CONCAT('%', CONCAT(#{record.phone}, '%'))
+            </if>
+            <if test="record.nickName != null and record.nickName != ''">
+                and a.nick_name like CONCAT('%', CONCAT(#{record.nickName}, '%'))
+            </if>
+            <if test="record.inviteId != null and record.inviteId != ''">
+                and (find_in_set(#{record.inviteId}, referrer_ids) or invite_id = #{record.inviteId})
+            </if>
+            <if test="record.isRobot != null">
+                and a.is_robot = #{record.isRobot}
             </if>
         </where>
         group by a.user_id
-        order by a.create_time desc
+        order by
+        a.user_id asc ,a.create_time asc
     </select>
 
     <select id="selectByUserId" resultType="cc.mrbird.febs.mall.entity.ChatUser">

--
Gitblit v1.9.1