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
24163b75
authored
Nov 08, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
repair the normal teetime can not modify teetime
parent
45b3a606
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
33 deletions
src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java
View file @
24163b75
...
...
@@ -526,16 +526,6 @@ public class AsmCourseResourceService {
}
public
List
<
CommuneResourceBean
>
getOutDateCommuneResources
(
CommuneResourceQuery
communeResourceQuery
){
this
.
resourcePriceDao
.
getEventActivityResources
(
communeResourceQuery
);
return
null
;
}
/**
* 查詢社员资源V3
...
...
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
View file @
24163b75
...
...
@@ -1055,32 +1055,38 @@ public class OpEventActivityOrderService
StringBuilder
desc
=
new
StringBuilder
(
"原TeeTime["
).
append
(
orderItem
.
getTeeTime
())
.
append
(
"] 改为 ["
).
append
(
orderProcessBean
.
getTeeTime
()).
append
(
"]"
);
orderItem
.
setTeeTime
(
orderProcessBean
.
getTeeTime
());
String
newTeeTime
=
orderProcessBean
.
getTeeTime
();
if
(
newTeeTime
!=
null
){
String
[]
teetimes
=
newTeeTime
.
split
(
":"
);
if
(
teetimes
!=
null
&&
teetimes
.
length
==
2
){
int
groupNum
=
Integer
.
valueOf
(
teetimes
[
0
])*
60
+
Integer
.
valueOf
(
teetimes
[
1
]);
List
<
Integer
>
resourceIds
=
this
.
courseResourceService
.
getResourceByTeeTimeAndDate
(
orderProcessBean
.
getProductId
(),
groupNum
,
orderItem
.
getPlayDate
(),
orderItem
.
getCommunePrice
(),
orderItem
.
getCommuneGuestPrice
());
if
(
resourceIds
!=
null
&&
resourceIds
.
size
()
>
0
){
orderProcessBean
.
setProcessDesc
(
desc
.
toString
());
Integer
oldResourceId
=
orderItem
.
getResourceId
();
Integer
newResourceId
=
resourceIds
.
get
(
0
);
this
.
changeCustomerInfo
(
orderProcessBean
,
newResourceId
);
//打球 人数
int
size
=
orderItem
.
getQuantity
();
//先清除老的资源id对应的库存
this
.
changeResourceInventory
(
oldResourceId
,
orderItem
.
getPlayDate
(),
size
);
//增加新的资源id对应的库存
this
.
changeResourceInventory
(
newResourceId
,
orderItem
.
getPlayDate
(),
-
size
);
//变更后,在orderItem表里面将资源id变更掉
orderItem
.
setResourceId
(
newResourceId
);
this
.
eventActivityOrderItemDao
.
update
(
orderItem
);
}
else
{
throw
new
OrderException
(
ResponseStatusEnum
.
FAIL
.
getValue
(),
"该teetime没有资源或者价格不一样,请更换!"
);
//非实时teetime资源不支持后台换组
if
(
orderItem
.
getRealTimeTeeTimeType
()
==
ResourceRealTimeTeeTimeTypeEnum
.
NORMAL
.
getValue
()){
this
.
eventActivityOrderItemDao
.
update
(
orderItem
);
orderProcessBean
.
setProcessDesc
(
desc
.
toString
());
}
else
{
String
newTeeTime
=
orderProcessBean
.
getTeeTime
();
if
(
newTeeTime
!=
null
){
String
[]
teetimes
=
newTeeTime
.
split
(
":"
);
if
(
teetimes
!=
null
&&
teetimes
.
length
==
2
){
int
groupNum
=
Integer
.
valueOf
(
teetimes
[
0
])*
60
+
Integer
.
valueOf
(
teetimes
[
1
]);
List
<
Integer
>
resourceIds
=
this
.
courseResourceService
.
getResourceByTeeTimeAndDate
(
orderProcessBean
.
getProductId
(),
groupNum
,
orderItem
.
getPlayDate
(),
orderItem
.
getCommunePrice
(),
orderItem
.
getCommuneGuestPrice
());
if
(
resourceIds
!=
null
&&
resourceIds
.
size
()
>
0
){
orderProcessBean
.
setProcessDesc
(
desc
.
toString
());
Integer
oldResourceId
=
orderItem
.
getResourceId
();
Integer
newResourceId
=
resourceIds
.
get
(
0
);
this
.
changeCustomerInfo
(
orderProcessBean
,
newResourceId
);
//打球 人数
int
size
=
orderItem
.
getQuantity
();
//先清除老的资源id对应的库存
this
.
changeResourceInventory
(
oldResourceId
,
orderItem
.
getPlayDate
(),
size
);
//增加新的资源id对应的库存
this
.
changeResourceInventory
(
newResourceId
,
orderItem
.
getPlayDate
(),
-
size
);
//变更后,在orderItem表里面将资源id变更掉
orderItem
.
setResourceId
(
newResourceId
);
this
.
eventActivityOrderItemDao
.
update
(
orderItem
);
}
else
{
throw
new
OrderException
(
ResponseStatusEnum
.
FAIL
.
getValue
(),
"该teetime没有资源或者价格不一样,请更换!"
);
}
}
}
}
}
}
...
...
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