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
a9fd4c0f
Commit
a9fd4c0f
authored
Jan 04, 2025
by
Smile
Committed by
wux
Jan 09, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员等级配置,同等级相同顺序报错
parent
c1fc2206
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
MemberUserLevelConfigServiceImpl.java
...ember/service/level/MemberUserLevelConfigServiceImpl.java
+1
-1
OrderBackPageVO.java
.../iocoder/yudao/module/order/vo/order/OrderBackPageVO.java
+1
-1
No files found.
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberUserLevelConfigServiceImpl.java
View file @
a9fd4c0f
...
...
@@ -191,7 +191,7 @@ public class MemberUserLevelConfigServiceImpl extends AbstractService<MemberUser
}
else
{
throw
exception
(
SCORE_RULE_STATUS_ERROR
);
}
memberUserLevelConfigMapper
.
updateById
(
memberUs
erLevelConfigDO
);
memberUserLevelConfigMapper
.
updateById
(
upMemb
erLevelConfigDO
);
}
private
void
createLog
(
MemberUserLevelConfigDO
memberUserLevelConfigDO
,
Integer
operateType
){
MemberUserLevelLogCreateReq
memberUserLevelLogcreateReq
=
MemberUserLevelLogCreateReq
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java
View file @
a9fd4c0f
...
...
@@ -665,7 +665,7 @@ public class OrderBackPageVO {
private
void
getOrderDesc
()
{
// TODO 这里的文案国际化现在只支持两种语言,如果需要支持更多的语言,需要优化
Integer
lang
=
Objects
.
nonNull
(
this
.
lang
)
?
this
.
lang
:
I18nMessage
.
getLang
();
if
(
null
!=
this
.
status
&&
this
.
status
.
equals
(
OrderStatusEnum
.
CANCEL
.
getValue
())
&&
this
.
userType
!=
null
)
{
if
(
null
!=
this
.
status
&&
this
.
status
.
equals
(
OrderStatusEnum
.
CANCEL
.
getValue
())
&&
this
.
userType
!=
null
)
{
String
message
=
this
.
userType
==
2
?
OrderStatusMsgEnum
.
CANCEL
.
getAdminSourceName
()
:
OrderStatusMsgEnum
.
CANCEL
.
getCustomerSourceName
();
this
.
statusMsg
=
lang
==
0
?
I18nMessage
.
getZhMessage
(
message
)
:
I18nMessage
.
getEnMessage
(
message
);
}
else
if
(
null
!=
this
.
abnormalState
&&
this
.
abnormalState
>
0
)
{
...
...
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