记得上下班打卡 | 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
d392be04
Commit
d392be04
authored
May 12, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 添加接口 的 sku时间重合判断
parent
a2986147
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
GoblinListServiceImpl.java
...ice/goblin/service/impl/manage/GoblinListServiceImpl.java
+2
-2
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinListServiceImpl.java
View file @
d392be04
...
...
@@ -134,12 +134,12 @@ public class GoblinListServiceImpl implements IGoblinListService {
if
((
st
.
isAfter
(
collectItem
.
getTimeStart
().
minusSeconds
(
1
))
&&
st
.
isBefore
(
collectItem
.
getTimeEnd
().
minusSeconds
(
1
)))
||
(
et
.
isAfter
(
collectItem
.
getTimeStart
().
minusSeconds
(
1
))
&&
et
.
isBefore
(
collectItem
.
getTimeEnd
().
minusSeconds
(
1
)))
||
(
st
.
isBefore
(
collectItem
.
getTimeStart
().
minusSeconds
(
1
))
&&
et
.
isAfter
(
collectItem
.
getTimeEnd
().
minusSeconds
(
1
)))
)
{
)
{
//开始时间不能在其他时间段内/结束间不能在其他时间段内/开始结束时间不能包含其他时间段
return
ResponseDto
.
failure
(
"sku时间不能重合"
);
}
}
else
{
if
(
st
.
isBefore
(
collectItem
.
getTimeStart
().
minusSeconds
(
1
))
&&
et
.
isAfter
(
collectItem
.
getTimeStart
().
minusSeconds
(
1
))){
return
ResponseDto
.
failure
(
"sku时间不能重合"
);
return
ResponseDto
.
failure
(
"sku时间不能重合"
);
//开始结束时间不能包含只有开始时间的时间段
}
}
}
...
...
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