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
86226760
authored
Oct 18, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify the invinventory logic
parent
63220fe0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
src/main/java/com/ctrip/fun/golf/service/order/EventCustomerInfoService.java
src/main/resources/email.properties
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
View file @
86226760
...
...
@@ -387,7 +387,7 @@ public class EventActivityOrderService extends
eventCustomerInfoQuery
.
setUid
(
eventActivityOrderBean
.
getUid
());
List
<
EventCustomerInfo
>
previousOrdersEventCustomerInfos
=
eventCustomerInfoDao
.
getEventCustomerInfosInPreviousOrders
(
eventCustomerInfoQuery
);
if
(
previousOrdersEventCustomerInfos
!=
null
)
{
if
(
previousOrdersEventCustomerInfos
!=
null
&&
eventActivityOrderBean
.
getRealTimeTeeTimeType
()
!=
ResourceRealTimeTeeTimeTypeEnum
.
REALTIME
.
getValue
()
)
{
// 将之前订单中的占位信息清除
for
(
EventCustomerInfo
previousOrdersEventCustomerInfo
:
previousOrdersEventCustomerInfos
)
{
previousOrdersEventCustomerInfo
.
setValidFlag
(
false
);
...
...
src/main/java/com/ctrip/fun/golf/service/order/EventCustomerInfoService.java
View file @
86226760
...
...
@@ -739,11 +739,13 @@ public class EventCustomerInfoService extends
EventCustomerInfo
eventCustomerInfo
=
eventCustomerInfoDao
.
findById
(
eventCustomerInfoId
);
if
(
eventCustomerInfo
.
getConfirmStatus
()
==
EventCustomerInfoConfirmStatusEnum
.
NOT_CONFIRM
.
getValue
())
{
//清占位
eventCustomerInfo
.
setConfirmStatus
(
EventCustomerInfoConfirmStatusEnum
.
CANCEL
.
getValue
());
eventCustomerInfo
.
setValidFlag
(
false
);
eventCustomerInfoDao
.
update
(
eventCustomerInfo
);
}
//返库存
ResourceInventoryQuery
resourceInventoryQuery
=
new
ResourceInventoryQuery
();
resourceInventoryQuery
.
setResourceCategory
(
ResourceCategoryEnum
.
COURSE
.
getValue
());
resourceInventoryQuery
.
setResourceId
(
eventCustomerInfo
.
getResourceId
());
...
...
@@ -752,6 +754,7 @@ public class EventCustomerInfoService extends
+
eventCustomerInfo
.
getEventCustomerId
()
+
"ResourceId="
+
eventCustomerInfo
.
getResourceId
());
this
.
getCourseResourceService
().
addInventory
(
resourceInventoryQuery
,
1
);
}
}
...
...
src/main/resources/email.properties
View file @
86226760
smtp
=
webmail.ctrip
.com
from
=
zgsong111@ctrip
.com
to
=
AWYDZ@Ctrip
.com
smtp
=
smtp.ctripiwan
.com
from
=
caosy@ctripiwan
.com
to
=
iwan@ctripiwan
.com
subject
=
Job
\u
5F02
\u
5E38
content
=
<h2>Exception Info:</h2></br>
username
=
zgsong
password
=
h3xP2d5oUbUh6xmwLKXa4Q==
\ No newline at end of file
username
=
caosy
password
=
584CmXEcOO9cND7sLMzG4+0qqXGN4SIb
\ No newline at end of file
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