From 6f984093fc3d52ae71788a2eecd0b99c1e13d588 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 19 Feb 2024 14:35:24 +0800
Subject: [PATCH] 文件上传服务器地址
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 ++
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index be739e4..8efbeee 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -286,6 +286,8 @@
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(mallMember.getLevel(), mallMember.getLevel());
if (dic != null) {
mallMemberVo.setLevelName(dic.getDescription());
+ }else{
+ mallMemberVo.setLevelName("非会员");
}
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
mallMemberVo.setGsd(mallMemberAmount.getGsd());
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 07ec1b2..278e80d 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -543,7 +543,7 @@
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
left join mall_member_amount b on b.member_id = m.id
- LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL_REQUIRE'
+ LEFT JOIN data_dictionary_custom d on d.code = m.level and d.type = m.level
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
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 be228b3..1bef851 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -325,7 +325,7 @@
{field: 'fcmCntFrozen', title: '代币冻结', minWidth: 120,align:'left'},
{field: 'tokenAva', title: '宝石可用', minWidth: 120,align:'left'},
{field: 'tokenFrozen', title: '宝石冻结', minWidth: 120,align:'left'},
- // {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
+ {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
// {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left',hide:toolbarMallmember},
// {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' ,hide:toolbarMallmember},
// {field: 'creater', title: '联创', templet:'#switchCreate', minWidth: 120,align:'left' ,hide:toolbarMallmember},
--
Gitblit v1.9.1