Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
57889e06
Commit
57889e06
authored
Dec 31, 2024
by
Smile
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:管理端会员等级显示错误,应该按照会员本身的等级详情显示
parent
7940f8cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
MemberUserController.java
...le/member/controller/admin/user/MemberUserController.java
+14
-4
No files found.
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
View file @
57889e06
...
@@ -22,10 +22,13 @@ import cn.iocoder.yudao.module.member.convert.user.UserConvert;
...
@@ -22,10 +22,13 @@ import cn.iocoder.yudao.module.member.convert.user.UserConvert;
import
cn.iocoder.yudao.module.member.convert.userCardAuth.UserCardAuthConvert
;
import
cn.iocoder.yudao.module.member.convert.userCardAuth.UserCardAuthConvert
;
import
cn.iocoder.yudao.module.member.convert.userEnterpriseAuth.UserEnterpriseAuthConvert
;
import
cn.iocoder.yudao.module.member.convert.userEnterpriseAuth.UserEnterpriseAuthConvert
;
import
cn.iocoder.yudao.module.member.convert.userOperationLog.UserOperationLogConvert
;
import
cn.iocoder.yudao.module.member.convert.userOperationLog.UserOperationLogConvert
;
import
cn.iocoder.yudao.module.member.dal.dataobject.level.MemberUserLevelConfigDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.memberUserLevelDetail.MemberUserLevelDetailsDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.userCardAuth.UserCardAuthDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.userCardAuth.UserCardAuthDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.userEnterpriseAuth.UserEnterpriseAuthDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.userEnterpriseAuth.UserEnterpriseAuthDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.userOperationLog.UserOperationLogDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.userOperationLog.UserOperationLogDO
;
import
cn.iocoder.yudao.module.member.dal.mysql.userLevelDetails.MemberUserLevelDetailsMapper
;
import
cn.iocoder.yudao.module.member.enums.ErrorCodeConstants
;
import
cn.iocoder.yudao.module.member.enums.ErrorCodeConstants
;
import
cn.iocoder.yudao.module.member.enums.UserAuditStatusEnum
;
import
cn.iocoder.yudao.module.member.enums.UserAuditStatusEnum
;
import
cn.iocoder.yudao.module.member.service.level.MemberUserLevelConfigService
;
import
cn.iocoder.yudao.module.member.service.level.MemberUserLevelConfigService
;
...
@@ -41,6 +44,7 @@ import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseResp
...
@@ -41,6 +44,7 @@ import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseResp
import
cn.iocoder.yudao.module.member.vo.userLevel.MemberUserScoreLevelVO
;
import
cn.iocoder.yudao.module.member.vo.userLevel.MemberUserScoreLevelVO
;
import
cn.iocoder.yudao.module.member.vo.userOperationLog.UserOperationLogBackVO
;
import
cn.iocoder.yudao.module.member.vo.userOperationLog.UserOperationLogBackVO
;
import
com.alibaba.excel.util.CollectionUtils
;
import
com.alibaba.excel.util.CollectionUtils
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
...
@@ -101,6 +105,8 @@ public class MemberUserController {
...
@@ -101,6 +105,8 @@ public class MemberUserController {
@Resource
@Resource
private
MemberUserLevelConfigService
memberUserLevelConfigService
;
private
MemberUserLevelConfigService
memberUserLevelConfigService
;
@Resource
private
MemberUserLevelDetailsMapper
memberUserLevelDetailsMapper
;
@GetMapping
(
"/member-user-list"
)
@GetMapping
(
"/member-user-list"
)
...
@@ -143,15 +149,19 @@ public class MemberUserController {
...
@@ -143,15 +149,19 @@ public class MemberUserController {
if
(
passwordEncoder
.
matches
(
"88888888"
,
user
.
getPassword
()))
{
if
(
passwordEncoder
.
matches
(
"88888888"
,
user
.
getPassword
()))
{
userBackVO
.
setIsSimplePassword
(
Boolean
.
TRUE
);
userBackVO
.
setIsSimplePassword
(
Boolean
.
TRUE
);
}
}
MemberUserLevelConfigBaseRespVO
userScoreLevelVO
=
memberUserLevelConfigService
.
getLevelByCount
(
user
.
getTotalScore
());
QueryWrapper
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
eq
(
"member_id"
,
user
.
getId
());
MemberUserLevelDetailsDO
memberUserLevelDetailsDO
=
memberUserLevelDetailsMapper
.
selectOne
(
queryWrapper
);
MemberUserLevelConfigDO
realLevel
=
memberUserLevelConfigService
.
getById
(
memberUserLevelDetailsDO
.
getConfigId
());
// MemberUserLevelConfigBaseRespVO userScoreLevelVO = memberUserLevelConfigService.getLevelByCount(user.getTotalScore());
MemberUserScoreLevelVO
scoreLevelVO
=
MemberUserScoreLevelVO
.
builder
().
memberId
(
user
.
getId
())
MemberUserScoreLevelVO
scoreLevelVO
=
MemberUserScoreLevelVO
.
builder
().
memberId
(
user
.
getId
())
.
memberCode
(
user
.
getMemberCode
())
.
memberCode
(
user
.
getMemberCode
())
.
holdScore
(
user
.
getHoldScore
())
.
holdScore
(
user
.
getHoldScore
())
.
expiredScore
(
user
.
getExpiredScore
())
.
expiredScore
(
user
.
getExpiredScore
())
.
usedScore
(
user
.
getUsedScore
())
.
usedScore
(
user
.
getUsedScore
())
.
levelIcon
(
userScoreLevelVO
.
getIcon
())
.
levelIcon
(
realLevel
.
getIcon
())
.
levelName
(
userScoreLevelVO
.
getName
())
.
levelName
(
realLevel
.
getName
())
.
level
(
userScoreLevelVO
.
getLevel
())
.
level
(
realLevel
.
getLevel
())
.
build
();
.
build
();
userBackVO
.
setUserScoreLevelInfo
(
scoreLevelVO
);
userBackVO
.
setUserScoreLevelInfo
(
scoreLevelVO
);
userBackVO
.
setPassword
(
null
);
userBackVO
.
setPassword
(
null
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment