Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
poc-api
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
poc
poc-api
Commits
f8593ed7
Commit
f8593ed7
authored
Dec 13, 2024
by
alex yao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:權益訂單創建限制
parent
a2a00e43
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
4 deletions
+30
-4
EquityEnum.java
src/main/java/cn/com/poc/equity/constants/EquityEnum.java
+11
-1
EquityOrderRestImpl.java
...java/cn/com/poc/equity/rest/impl/EquityOrderRestImpl.java
+13
-0
equity.properties
src/main/resources/framemax-config/i18n/en/equity.properties
+2
-1
equity.properties
...in/resources/framemax-config/i18n/zh_cn/equity.properties
+2
-1
equity.properties
...in/resources/framemax-config/i18n/zh_tw/equity.properties
+2
-1
No files found.
src/main/java/cn/com/poc/equity/constants/EquityEnum.java
View file @
f8593ed7
...
...
@@ -12,7 +12,17 @@ public class EquityEnum {
* 类型 normal-普通 professional-专业版 , ultimate-旗舰版
*/
public
enum
TYPE
{
normal
,
professional
,
ultimate
;
normal
(
1
),
professional
(
2
),
ultimate
(
3
);
private
Integer
level
;
TYPE
(
Integer
level
)
{
this
.
level
=
level
;
}
public
Integer
getLevel
()
{
return
level
;
}
public
static
boolean
isMatch
(
String
type
)
{
TYPE
[]
values
=
values
();
...
...
src/main/java/cn/com/poc/equity/rest/impl/EquityOrderRestImpl.java
View file @
f8593ed7
...
...
@@ -3,7 +3,9 @@ package cn.com.poc.equity.rest.impl;
import
cn.com.poc.common.utils.Assert
;
import
cn.com.poc.common.utils.BlContext
;
import
cn.com.poc.equity.aggregate.EquityService
;
import
cn.com.poc.equity.aggregate.MemberEquityService
;
import
cn.com.poc.equity.constants.EquityEnum
;
import
cn.com.poc.equity.domain.MemberEquityInfo
;
import
cn.com.poc.equity.dto.CurrentUserPayOrderDto
;
import
cn.com.poc.equity.dto.EquityOrderCreateDto
;
import
cn.com.poc.equity.entity.CurrentUserPayOrderEntity
;
...
...
@@ -26,6 +28,9 @@ public class EquityOrderRestImpl implements EquityOrderRest {
@Resource
private
EquityService
equityService
;
@Resource
private
MemberEquityService
memberEquityService
;
@Override
public
String
createOrder
(
EquityOrderCreateDto
createDto
)
throws
Exception
{
Assert
.
notNull
(
createDto
);
...
...
@@ -42,6 +47,14 @@ public class EquityOrderRestImpl implements EquityOrderRest {
throw
new
I18nMessageException
(
"exception/user.not.login"
);
}
// 获取用户当前权益
MemberEquityInfo
equityInfo
=
memberEquityService
.
getEquityInfo
(
currentUser
.
getUserId
());
EquityEnum
.
TYPE
currentEquityLevel
=
equityInfo
.
getEquityLevel
();
if
(
currentEquityLevel
.
getLevel
()
>
EquityEnum
.
TYPE
.
valueOf
(
createDto
.
getType
()).
getLevel
())
{
throw
new
I18nMessageException
(
"equity/target.equity.is.lower.current.equity"
);
}
return
equityService
.
createEquityOrder
(
EquityEnum
.
TYPE
.
valueOf
(
createDto
.
getType
()),
EquityEnum
.
DOMAIN
.
valueOf
(
createDto
.
getDomain
()),
...
...
src/main/resources/framemax-config/i18n/en/equity.properties
View file @
f8593ed7
...
...
@@ -3,4 +3,5 @@ payment.order.is.issued=The order has been issued
not.enough.points
=
Not enough points
transaction.history.not.exist
=
The slip does not exist
event.not.support
=
Current event is not supported
equity.level.not.exist
=
Equity level does not exist
\ No newline at end of file
equity.level.not.exist
=
Equity level does not exist
target.equity.is.lower.current.equity
=
The target equity is lower than the current equity and cannot be created
\ No newline at end of file
src/main/resources/framemax-config/i18n/zh_cn/equity.properties
View file @
f8593ed7
...
...
@@ -3,4 +3,5 @@ payment.order.is.issued=\u8BE5\u8BA2\u5355\u5DF2\u53D1\u653E
not.enough.points
=
\u
79EF
\u5206\u
4E0D
\u
8DB3
transaction.history.not.exist
=
\u
6D41
\u
6C34
\u
4E0D
\u
5B58
\u5728
event.not.support
=
\u
4E0D
\u
652F
\u6301\u
5F53
\u
524D
\u
4E8B
\u
4EF6
equity.level.not.exist
=
\u6743\u
76CA
\u
7B49
\u
7EA7
\u
4E0D
\u
5B58
\u5728
\ No newline at end of file
equity.level.not.exist
=
\u6743\u
76CA
\u
7B49
\u
7EA7
\u
4E0D
\u
5B58
\u5728
target.equity.is.lower.current.equity
=
\u
76EE
\u6807\u6743\u
76CA
\u
6BD4
\u
5F53
\u
524D
\u6743\u
76CA
\u
4F4E
\u
FF0C
\u
65E0
\u
6CD5
\u
521B
\u
5EFA
\ No newline at end of file
src/main/resources/framemax-config/i18n/zh_tw/equity.properties
View file @
f8593ed7
...
...
@@ -3,4 +3,5 @@ payment.order.is.issued=\u8A02\u55AE\u6B0A\u76CA\u5DF2\u767C\u653E
not.enough.points
=
\u
7A4D
\u5206\u
4E0D
\u
8DB3
transaction.history.not.exist
=
\u
6D41
\u
6C34
\u
55AE
\u
4E0D
\u
5B58
\u5728
event.not.support
=
\u
4E0D
\u
652F
\u6301\u7576\u
524D
\u
4E8B
\u
4EF6
equity.level.not.exist
=
\u
6B0A
\u
76CA
\u
7B49
\u
7D1A
\u
4E0D
\u
5B58
\u5728
\ No newline at end of file
equity.level.not.exist
=
\u
6B0A
\u
76CA
\u
7B49
\u
7D1A
\u
4E0D
\u
5B58
\u5728
target.equity.is.lower.current.equity
=
\u
76EE
\u
6A19
\u
6B0A
\u
76CA
\u
6BD4
\u7576\u
524D
\u
6B0A
\u
76CA
\u
4F4E
\u
FF0C
\u7121\u
6CD5
\u5275\u
5EFA
\ No newline at end of file
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