From 4372e6406222ce6b33f8c1c0703b460d39b5814e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 23 六月 2025 14:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/resources/mapper/lmk/CustomerMapper.xml | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/CustomerMapper.xml b/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
index 1c484e7..d98bcd8 100644
--- a/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
@@ -26,6 +26,7 @@
<result property="gradeId" column="grade_id"/>
<result property="experience" column="experience"/>
<result property="createTime" column="create_time"/>
+ <result property="blackId" column="blackId"/>
<collection property="customerTagList" ofType="cn.lili.modules.lmk.domain.vo.CustomerTagVO"
select="selectTagByMemberId"
column="id"
@@ -34,39 +35,36 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
- *
+ LM.*
FROM
- li_member lm
+ li_member LM
+ LEFT JOIN lmk_customer_black LMK ON LM.id = LMK.user_id and LMK.delete_flag = 0
<where>
<!-- 鐢ㄦ埛鍚嶆ā绯婃煡璇� -->
<if test="query.username != null and query.username != ''">
- AND lm.username LIKE CONCAT('%', #{query.username}, '%')
+ AND LM.username LIKE CONCAT('%', #{query.username}, '%')
</if>
<!-- 鏄电О妯＄硦鏌ヨ -->
<if test="query.nickName != null and query.nickName != ''">
- AND lm.nick_name LIKE CONCAT('%', #{query.nickName}, '%')
+ AND LM.nick_name LIKE CONCAT('%', #{query.nickName}, '%')
</if>
<!-- 鎵嬫満鍙风爜绮剧‘鏌ヨ -->
<if test="query.mobile != null and query.mobile != ''">
- AND lm.mobile = #{query.mobile}
+ AND LM.mobile = #{query.mobile}
</if>
<!-- 浼氬憳鐘舵�佽浆 -->
<if test="query.disabled != null and query.disabled != ''">
- AND lm.disabled = #{query.disabled}
+ AND LM.disabled = #{query.disabled}
</if>
<!-- 鍟嗛摵id -->
<if test="query.storeId != null and query.storeId != ''">
- AND lm.store_id = #{query.storeId}
+ AND LM.store_id = #{query.storeId}
</if>
- AND EXISTS (
- SELECT 1
- FROM li_order lo
- WHERE lo.member_id = lm.id
- )
+ AND LM.delete_flag = 0
</where>
ORDER BY lm.create_time DESC
</select>
--
Gitblit v1.8.0