From cc5c9ed0c1ec76a7db8f4052b979ec9523747d23 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 04 Feb 2026 15:55:05 +0800
Subject: [PATCH] fix(mallMember): 修复会员角色ID字段映射错误
---
src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java | 4 ++--
src/main/resources/templates/febs/views/modules/mallMember/vip-level-setting.html | 6 +++---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 3 +++
src/main/resources/mapper/modules/MallMemberMapper.xml | 4 ++--
src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java | 2 +-
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 2 +-
6 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
index 5d37a56..31930b9 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
@@ -663,12 +663,12 @@
MallMember mallMember = mallMemberService.getBaseMapper().selectById(member.getId());
mallMemberService.update(null,
Wrappers.lambdaUpdate(MallMember.class)
- .set(MallMember::getLevel, member.getLevel())
+ .set(MallMember::getMemberRoleId, member.getMemberRoleId())
.eq(MallMember::getId, mallMember.getId())
);
aiMemberService.update(null,
Wrappers.lambdaUpdate(AiMember.class)
- .set(AiMember::getMemberRoleId, member.getLevel())
+ .set(AiMember::getMemberRoleId, member.getMemberRoleId())
.eq(AiMember::getId, mallMember.getMemberUuid())
.eq(AiMember::getCompanyId, mallMember.getCompanyId())
);
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
index 2f38a9d..d4b3658 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
@@ -409,7 +409,7 @@
Map<String, Object> data = new HashMap<>();
data.put("id", mallMember.getId());
- data.put("level", mallMember.getLevel());
+ data.put("memberRoleId", mallMember.getMemberRoleId());
model.addAttribute("vipLevelSet", data);
return FebsUtil.view("modules/mallMember/vip-level-setting");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index be72b93..3b2d229 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -115,6 +115,9 @@
private String memberRoleId;
@TableField(exist = false)
+ private String memberRoleIdName;
+
+ @TableField(exist = false)
private String referrerName;
@TableField(exist = false)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index ab5e29e..7cf6ca8 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -53,14 +53,14 @@
e.name companyName,
e.code companyCode,
b.name storeMasterName,
- f.name levelName,
+ f.name memberRoleIdName,
c.name directorName
FROM mall_member a
left join happy_sale_level b on b.code = a.store_master
left join happy_member_level c on c.code = a.director
left join mall_member_wallet d on d.member_id = a.id
left join ai_company e on e.id = a.company_id
- left join ai_member_role f on f.id = a.level
+ left join ai_member_role f on f.id = a.member_role_id
<where>
and a.phone is not null
<if test="record != null" >
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index f926174..fcf7ef6 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -399,7 +399,7 @@
{field: 'realName', title: '真实姓名', minWidth: 100,align:'center'},
{field: 'phone', title: '联系方式', minWidth: 150,align:'center'},
{field: 'companyName', title: '公司', minWidth: 150,align:'center'},
- {field: 'levelName', title: '角色', minWidth: 150,align:'center'},
+ {field: 'memberRoleIdName', title: '角色', minWidth: 150,align:'center'},
// {field: 'score', title: '会员经验', minWidth: 150,align:'center'},
// {field: 'prizeScore', title: '积分', minWidth: 150,align:'center'},
// {field: 'commission', title: '可用佣金', minWidth: 150,align:'center'},
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/vip-level-setting.html b/src/main/resources/templates/febs/views/modules/mallMember/vip-level-setting.html
index 54615bd..fe1c7f3 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/vip-level-setting.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/vip-level-setting.html
@@ -29,7 +29,7 @@
<div class="layui-inline">
<label class="layui-form-label">角色：</label>
<div class="layui-input-inline">
- <select lay-verify="required" name="level" class="vip-level-set-level" id="levelSet">
+ <select lay-verify="required" name="memberRoleId" class="vip-level-set-level" id="levelSet">
<option value="">请选择</option>
</select>
</div>
@@ -62,7 +62,7 @@
function initMemberLevel() {
form.val("vip-level-set-form", {
"id": vipLevelSet.id,
- "level": vipLevelSet.level
+ "memberRoleId": vipLevelSet.memberRoleId
});
}
@@ -75,7 +75,7 @@
}
layui.use('form', function () {
var form = layui.form;
- $("#levelSet").val(vipLevelSet.level)
+ $("#levelSet").val(vipLevelSet.memberRoleId)
form.render();
});
});
--
Gitblit v1.9.1