记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
550fae85
Commit
550fae85
authored
Sep 02, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
与产品沟通,最终去除限购判断逻辑,只判断是否开售;
parent
5d320b1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
AdamMemberVo.java
.../java/com/liquidnet/service/adam/dto/vo/AdamMemberVo.java
+3
-1
AdamMemberOrderController.java
...et/service/adam/controller/AdamMemberOrderController.java
+4
-4
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberVo.java
View file @
550fae85
...
...
@@ -85,10 +85,12 @@ public class AdamMemberVo implements java.io.Serializable, Cloneable {
if
(
null
!=
this
.
limitation
&&
this
.
limitation
>
0
)
{
// 限购
if
(
maxMemberLimitation
>=
limitation
)
{
// 名额已满
this
.
setLimitMarker
(
0
);
}
else
{
// 限购未开始
}
else
if
(
null
!=
this
.
limitbAt
&&
null
!=
this
.
limiteAt
)
{
// 限购时间判断
LocalDateTime
now
=
LocalDateTime
.
now
();
boolean
isBetweenLimitTime
=
now
.
isAfter
(
this
.
limitbAt
)
&&
now
.
isBefore
(
this
.
limiteAt
);
this
.
setLimitMarker
(
isBetweenLimitTime
?
1
:
2
);
}
else
{
this
.
setLimitMarker
(
1
);
}
}
else
{
// 不限购
this
.
setLimitMarker
(
1
);
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @
550fae85
...
...
@@ -99,10 +99,10 @@ public class AdamMemberOrderController {
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10216"
));
}
if
(
0
==
memberVo
.
calculateLimitMarker
(
adamRdmService
.
getMaxMemberLimitation
()))
{
// 购买会员限购[0-名额已满|1-允许购买|2-限购未开始]
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10215"
));
}
//
if (0 == memberVo.calculateLimitMarker(adamRdmService.getMaxMemberLimitation())) {
//
// 购买会员限购[0-名额已满|1-允许购买|2-限购未开始]
//
return ResponseDto.failure(ErrorMapping.get("10215"));
//
}
}
AdamRealInfoVo
realInfoVo
=
adamRdmService
.
getRealInfoVoByUid
(
currentUid
);
...
...
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