Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
63220fe0
authored
Sep 28, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify the logic of backgroundcancelorder
parent
3941cde7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
View file @
63220fe0
...
...
@@ -1259,12 +1259,14 @@ public class EventActivityOrderService extends
if
(
eventActivityOrderItem
!=
null
){
realTimeTeeTimeType
=
eventActivityOrderItem
.
getRealTimeTeeTimeType
();
}
if
(
eventCustomerInfoService
.
isValidEventCustomer
(
orderId
,
order
.
getUid
())
&&
realTimeTeeTimeType
==
ResourceRealTimeTeeTimeTypeEnum
.
NORMAL
.
getValue
()){
if
(
realTimeTeeTimeType
==
ResourceRealTimeTeeTimeTypeEnum
.
NORMAL
.
getValue
()){
if
(
eventCustomerInfoService
.
isValidEventCustomer
(
orderId
,
order
.
getUid
())){
//只有在这个单子对应的库存真正被占用了,才返还库存,否则无效的占位是不会多返的
this
.
returnInventory
(
order
,
false
);
}
}
else
{
this
.
returnInventory
(
order
,
false
);
}
int
processStatus
=
order
.
getProcessStatus
();
processStatus
|=
OrderStatusBitEnum
.
CANCELING
.
getValue
();
processStatus
|=
OrderStatusBitEnum
.
CANCELED
.
getValue
();
...
...
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