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
bdc960fd
authored
Nov 13, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
repair that changeresource error when in the same time
parent
38889c08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
5 deletions
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
View file @
bdc960fd
...
...
@@ -1046,21 +1046,30 @@ public class OpEventActivityOrderService
public
void
setEventActivityOrderItemDao
(
EventActivityOrderItemDao
eventActivityOrderItemDao
)
{
this
.
eventActivityOrderItemDao
=
eventActivityOrderItemDao
;
}
private
void
changeResource
(
EventActivityOrderProcessBean
orderProcessBean
)
{
List
<
EventActivityOrderItem
>
orderItems
=
this
.
eventActivityOrderItemDao
.
getOrderItemByOrderId
(
orderProcessBean
.
getOrderId
());
if
(
orderItems
!=
null
&&
orderItems
.
size
()
>
0
)
{
EventActivityOrderItem
orderItem
=
orderItems
.
get
(
0
);
String
oldTeeTime
=
orderItem
.
getTeeTime
();
String
newTeeTime
=
orderProcessBean
.
getTeeTime
();
if
(
oldTeeTime
!=
null
&&
oldTeeTime
.
equals
(
newTeeTime
)){
//相同的时间不需要修改了
return
;
}
StringBuilder
desc
=
new
StringBuilder
(
"原TeeTime["
).
append
(
orderItem
.
getTeeTime
())
.
append
(
"] 改为 ["
).
append
(
orderProcessBean
.
getTeeTime
()).
append
(
"]"
);
orderItem
.
setTeeTime
(
orderProcessBean
.
getTeeTime
());
//非实时teetime资源不支持后台换组
if
(
orderItem
.
getRealTimeTeeTimeType
()
==
ResourceRealTimeTeeTimeTypeEnum
.
NORMAL
.
getValue
()){
orderItem
.
setTeeTime
(
orderProcessBean
.
getTeeTime
());
this
.
eventActivityOrderItemDao
.
update
(
orderItem
);
orderProcessBean
.
setProcessDesc
(
desc
.
toString
());
this
.
processSuccessedOrderLog
(
orderProcessBean
);
if
(
orderProcessBean
.
isSendMsg
()){
this
.
sendMsg
(
orderProcessBean
);
}
}
else
{
String
newTeeTime
=
orderProcessBean
.
getTeeTime
();
if
(
newTeeTime
!=
null
){
String
[]
teetimes
=
newTeeTime
.
split
(
":"
);
if
(
teetimes
!=
null
&&
teetimes
.
length
==
2
){
...
...
@@ -1079,7 +1088,12 @@ public class OpEventActivityOrderService
this
.
changeResourceInventory
(
newResourceId
,
orderItem
.
getPlayDate
(),
-
size
);
//变更后,在orderItem表里面将资源id变更掉
orderItem
.
setResourceId
(
newResourceId
);
orderItem
.
setTeeTime
(
orderProcessBean
.
getTeeTime
());
this
.
eventActivityOrderItemDao
.
update
(
orderItem
);
this
.
processSuccessedOrderLog
(
orderProcessBean
);
if
(
orderProcessBean
.
isSendMsg
()){
this
.
sendMsg
(
orderProcessBean
);
}
}
else
{
throw
new
OrderException
(
ResponseStatusEnum
.
FAIL
.
getValue
(),
"该teetime没有资源或者价格不一样,请更换!"
);
}
...
...
@@ -1128,8 +1142,6 @@ public class OpEventActivityOrderService
public
void
confirmEventActivityOrderResourceTeeTime
(
EventActivityOrderProcessBean
orderProcessBean
)
{
this
.
changeResource
(
orderProcessBean
);
this
.
processSuccessedOrderLog
(
orderProcessBean
);
this
.
sendMsg
(
orderProcessBean
);
}
}
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