From a7b8b0c439d0a705bced3fda9b04e38e44c26707 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 21 May 2025 10:53:00 +0800
Subject: [PATCH] fix(mall): 修复管理员禁用会员时未同步更新小程序登录状态
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 2 +-
src/main/resources/mapper/modules/MallMemberMapper.xml | 9 +++++----
src/main/resources/templates/febs/views/modules/mallMember/agentList.html | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
index 1343f35..ffd0c68 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
@@ -279,7 +279,7 @@
.eq(MallMember::getAccountStatus, MallMember.ACCOUNT_STATUS_ENABLE)
.eq(MallMember::getAccountType, MallMember.ACCOUNT_TYPE_NORMAL)
.ne(MallMember::getStoreMaster, 0)
- .orderByAsc(MallMember::getStoreMaster)
+ .orderByDesc(MallMember::getId)
.last("limit 1")
);
// 如果没有找到符合条件的团长，则记录日志并返回
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 769eebc..730ace8 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -190,7 +190,7 @@
<select id="getAgentListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentVo">
- SELECT m.*,a.description levelName,
+ SELECT m.*,a.name levelName,
ifnull((
SELECT
sum(b.amount)
@@ -204,8 +204,9 @@
or find_in_set(m.invite_id, e.referrer_ids)
),0) amount
FROM mall_member m
- left join data_dictionary_custom a on a.code = m.level
+ left join happy_sale_level a on a.code = m.store_master
<where>
+ and m.store_master != 0
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
and m.name like concat('%', #{record.name},'%')
@@ -252,8 +253,8 @@
</select>
<select id="getAgentChildInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentMemberVo">
- select m.*,a.description levelName from mall_member m
- left join data_dictionary_custom a on a.code = m.level
+ select m.*,a.name levelName from mall_member m
+ left join happy_sale_level a on a.code = m.store_master
where find_in_set(#{record.inviteId}, m.referrer_ids)
GROUP BY m.id
ORDER BY
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
index d91fb68..779456c 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -129,7 +129,7 @@
id: 'userAgentTable',
url: ctx + 'admin/mallMember/getAgentList',
cols: [[
- {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ // {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
--
Gitblit v1.9.1