From f98e41f7254a42e4df145703e151728bda4246c1 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Oct 2025 13:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ShopUserMapper.xml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
index afbaca728..a76e284c0 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -150,7 +150,8 @@
         </if>
         WHERE u.main_shop_id = #{mainShopId} and u.phone is not null
         <!-- 性别筛选条件 -->
-        <if test="(param.sexMan == 1 or param.sexWoman == 1 or param.sexUnknown == 1)">
+         <if test="!(param.sexMan == 1 and param.sexWoman == 1 and param.sexUnknown == 1)
+          and (param.sexMan == 1 or param.sexWoman == 1 or param.sexUnknown == 1)">
             AND
             <trim prefix="(" suffix=")" prefixOverrides="OR">
                 <if test="param.sexMan == 1">OR u.sex = 1</if>
@@ -164,16 +165,9 @@
             AND u.is_vip = #{param.isVip}
         </if>
 
-        <!-- 充值状态筛选 -->
-        <if test="param.isRecharge != null">
-            AND
-            <if test="param.isRecharge == 0">
-                u.recharge_count = 0
-            </if>
-            <if test="param.isRecharge != 0">
-                u.recharge_count > 0
-            </if>
-        </if>
+         <if test="param.isRecharge != null">
+             AND u.recharge_count <![CDATA[ ${param.isRecharge == 0 ? '=' : '>'} ]]> 0
+         </if>
         <!-- 只有当有筛选条件时才需要HAVING子句 -->
         <if test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
               param.orderTimeTwoWeeks == 1 or param.orderTimeMoreThanTwoWeeks == 1 or