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
1a4ecedc
Commit
1a4ecedc
authored
Dec 31, 2023
by
wuwenlong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
open the door bugfix;
parent
95918c6f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
OrderTask.java
share-quartz/src/main/java/share/quartz/task/OrderTask.java
+1
-1
SOrderServiceImpl.java
...ain/java/share/system/service/impl/SOrderServiceImpl.java
+3
-2
No files found.
share-quartz/src/main/java/share/quartz/task/OrderTask.java
View file @
1a4ecedc
...
@@ -276,7 +276,7 @@ public class OrderTask {
...
@@ -276,7 +276,7 @@ public class OrderTask {
map
.
put
(
"expirationTime"
,
item
.
getEndDate
().
toString
());
map
.
put
(
"expirationTime"
,
item
.
getEndDate
().
toString
());
JSONObject
jsonObject
=
new
JSONObject
(
map
);
JSONObject
jsonObject
=
new
JSONObject
(
map
);
redisUtils
.
set
(
ReceiptRdeisEnum
.
ORDER_NO_KEY
.
getValue
()
+
item
.
getOrderNo
(),
jsonObject
.
toString
());
redisUtils
.
set
(
ReceiptRdeisEnum
.
ORDER_NO_KEY
.
getValue
()
+
item
.
getOrderNo
(),
jsonObject
.
toString
());
orderService
.
updateSOrder
(
item
);
//
orderService.updateSOrder(item);
roomList
.
stream
().
forEach
(
room
->
{
roomList
.
stream
().
forEach
(
room
->
{
if
(
room
.
getId
().
compareTo
(
item
.
getRoomId
())==
0
)
{
if
(
room
.
getId
().
compareTo
(
item
.
getRoomId
())==
0
)
{
room
.
setStatus
(
RoomStatusEnum
.
HOLD
.
getValue
());
room
.
setStatus
(
RoomStatusEnum
.
HOLD
.
getValue
());
...
...
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
View file @
1a4ecedc
...
@@ -973,9 +973,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
...
@@ -973,9 +973,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
* @return
* @return
*/
*/
private
boolean
checkOrderOpenDoor
(
SOrder
order
)
{
private
boolean
checkOrderOpenDoor
(
SOrder
order
)
{
SConsumer
user
=
FrontTokenComponent
.
getWxSConsumerEntry
();
LambdaQueryWrapper
<
SOrder
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
SOrder
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
ne
(
SOrder:
:
getConsumerId
,
user
.
getId
());
queryWrapper
.
ne
(
SOrder:
:
getOrderNo
,
order
.
getOrderNo
());
queryWrapper
.
eq
(
SOrder:
:
getStoreId
,
order
.
getStoreId
());
queryWrapper
.
eq
(
SOrder:
:
getRoomId
,
order
.
getRoomId
());
queryWrapper
.
notIn
(
SOrder:
:
getStatus
,
new
ArrayList
<
Integer
>()
{{
queryWrapper
.
notIn
(
SOrder:
:
getStatus
,
new
ArrayList
<
Integer
>()
{{
add
(
OrderStatusEnum
.
USED
.
getCode
());
add
(
OrderStatusEnum
.
USED
.
getCode
());
add
(
OrderStatusEnum
.
CANCEL
.
getCode
());
add
(
OrderStatusEnum
.
CANCEL
.
getCode
());
...
...
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