Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
Overview
Overview
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
pseer
gxpt_ht
Commits
b1cbe5d9
Commit
b1cbe5d9
authored
Sep 18, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改开门时间间隔为60秒
parent
b7d41ea9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
Constants.java
...common/src/main/java/share/common/constant/Constants.java
+4
-2
OpenInterfaceServiceImpl.java
...a/share/system/service/impl/OpenInterfaceServiceImpl.java
+1
-1
SOrderServiceImpl.java
...ain/java/share/system/service/impl/SOrderServiceImpl.java
+1
-1
No files found.
share-common/src/main/java/share/common/constant/Constants.java
View file @
b1cbe5d9
...
@@ -11,9 +11,11 @@ public class Constants
...
@@ -11,9 +11,11 @@ public class Constants
{
{
//订单提前进场时间限制
//订单提前进场时间限制
public
final
static
Integer
OPEN_DOOR_AHEAD_HOUR
=
3
0
;
public
final
static
Integer
OPEN_DOOR_AHEAD_HOUR
=
6
0
;
//订单提前进场时间限制 -1
//订单提前进场时间限制 -1
public
final
static
Integer
OPEN_DOOR_AHEAD_HOUR_MINUS
=
-
30
;
public
final
static
Integer
OPEN_DOOR_AHEAD_HOUR_MINUS
=
-
60
;
//房间锁定时间
public
final
static
Integer
ROOM_LOCK_HOUR
=
30
;
//保洁锁定订单房间状态延迟时间
//保洁锁定订单房间状态延迟时间
public
final
static
Integer
ROOM_LOCK_DELAY_MINUTE
=
60
;
public
final
static
Integer
ROOM_LOCK_DELAY_MINUTE
=
60
;
...
...
share-system/src/main/java/share/system/service/impl/OpenInterfaceServiceImpl.java
View file @
b1cbe5d9
...
@@ -128,7 +128,7 @@ public class OpenInterfaceServiceImpl implements OpenInterfaceService {
...
@@ -128,7 +128,7 @@ public class OpenInterfaceServiceImpl implements OpenInterfaceService {
throw
new
BaseException
(
"房间当前时段已被占用不可开门!"
);
throw
new
BaseException
(
"房间当前时段已被占用不可开门!"
);
}
}
//判断预约时间是否到达,可提前
3
0分钟开门
//判断预约时间是否到达,可提前
6
0分钟开门
if
(
DateUtils
.
addMinutes
(
sOrder
.
getPreStartDate
(),
Constants
.
OPEN_DOOR_AHEAD_HOUR_MINUS
).
compareTo
(
new
Date
())
>
0
)
{
if
(
DateUtils
.
addMinutes
(
sOrder
.
getPreStartDate
(),
Constants
.
OPEN_DOOR_AHEAD_HOUR_MINUS
).
compareTo
(
new
Date
())
>
0
)
{
throw
new
BaseException
(
"预约时间未到达,可提前"
+
Constants
.
OPEN_DOOR_AHEAD_HOUR
+
"分钟进场,请耐心等候!"
);
throw
new
BaseException
(
"预约时间未到达,可提前"
+
Constants
.
OPEN_DOOR_AHEAD_HOUR
+
"分钟进场,请耐心等候!"
);
}
}
...
...
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
View file @
b1cbe5d9
...
@@ -1457,7 +1457,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
...
@@ -1457,7 +1457,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if
(
redisUtil
.
exists
(
Constants
.
ORDER_LOCK_KEY_PREFIX
+
roomId
))
{
if
(
redisUtil
.
exists
(
Constants
.
ORDER_LOCK_KEY_PREFIX
+
roomId
))
{
throw
new
BaseException
(
"当前房间下单太火爆了,请稍后再试!"
);
throw
new
BaseException
(
"当前房间下单太火爆了,请稍后再试!"
);
}
}
redisUtil
.
set
(
Constants
.
ORDER_LOCK_KEY_PREFIX
+
roomId
,
roomId
,
Long
.
valueOf
(
Constants
.
OPEN_DOOR_AHEAD
_HOUR
));
redisUtil
.
set
(
Constants
.
ORDER_LOCK_KEY_PREFIX
+
roomId
,
roomId
,
Long
.
valueOf
(
Constants
.
ROOM_LOCK
_HOUR
));
}
}
private
void
unLockOrder
(
CreateOrderRequest
request
,
String
keyValue
)
{
private
void
unLockOrder
(
CreateOrderRequest
request
,
String
keyValue
)
{
...
...
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