Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-mobile
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
a30678e3
authored
Feb 05, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add vipPrice
parent
a51e1cb8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
src/main/java/com/ctrip/fun/golf/api/course/CourseOrderController.java
src/main/java/com/ctrip/fun/golf/api/course/CourseOrderController.java
View file @
a30678e3
...
...
@@ -399,12 +399,12 @@ public class CourseOrderController {
asmCourseresourceQuery
.
setSortDirection
(
SortDirectionEnum
.
ASC
);
}
PagedResponseBean
<
CourseBean
>
pagedResponseBean
=
courseService
.
queryRewardCourses
(
asmCourseresourceQuery
);
Map
map
=
new
HashMap
();
List
<
Map
>
result
=
new
ArrayList
();
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>
();
List
<
Map
>
result
=
new
ArrayList
<
Map
>
();
Collection
<
CourseBean
>
beans
=
pagedResponseBean
.
getResult
();
if
(
beans
!=
null
)
{
for
(
CourseBean
bean
:
beans
)
{
Map
mp
=
new
HashMap
();
Map
<
String
,
Object
>
mp
=
new
HashMap
<
String
,
Object
>
();
mp
.
put
(
"courseId"
,
bean
.
getId
());
mp
.
put
(
"name"
,
bean
.
getName
());
mp
.
put
(
"address"
,
bean
.
getAddress
());
...
...
@@ -530,8 +530,8 @@ public class CourseOrderController {
mp
.
put
(
"fairwayLength"
,
bean
.
getFairwayLength
());
mp
.
put
(
"teeTime"
,
bean
.
getTeeTime
());
mp
.
put
(
"salePrice"
,
bean
.
getSalePrice
());
mp
.
put
(
"vipPrice"
,
bean
.
getVipPrice
());
mp
.
put
(
"marketPrice"
,
bean
.
getMarketPrice
());
mp
.
put
(
"vipSaveAmount"
,
bean
.
getVipSaveAmount
());
mp
.
put
(
"distance"
,
bean
.
getDistance
());
mp
.
put
(
"inventoryType"
,
bean
.
getInventoryType
());
...
...
@@ -593,7 +593,7 @@ public class CourseOrderController {
public
Object
getCourseResourceDetailV7
(
AsmCourseresourceQuery
asmCourseresourceQuery
)
{
asmCourseresourceQuery
.
setVersion
(
"v7"
);
AggregationCourseResourceBean
aggregationCourseResourceBean
=
courseService
.
getCourseResourceDetail
(
asmCourseresourceQuery
);
Map
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
Map
<
String
,
Object
>
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
map
.
put
(
"imagePaths"
,
aggregationCourseResourceBean
.
getImagePaths
());
String
version
=
asmCourseresourceQuery
.
getVersion
().
toLowerCase
();
if
(
version
.
compareTo
(
"v4"
)
>=
0
)
{
...
...
@@ -641,7 +641,7 @@ public class CourseOrderController {
public
Object
getCourseResourceDetailV6
(
AsmCourseresourceQuery
asmCourseresourceQuery
)
{
asmCourseresourceQuery
.
setVersion
(
"v6"
);
AggregationCourseResourceBean
aggregationCourseResourceBean
=
courseService
.
getCourseResourceDetail
(
asmCourseresourceQuery
);
Map
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
Map
<
String
,
Object
>
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
map
.
put
(
"imagePaths"
,
aggregationCourseResourceBean
.
getImagePaths
());
String
version
=
asmCourseresourceQuery
.
getVersion
().
toLowerCase
();
if
(
version
.
compareTo
(
"v4"
)
>=
0
)
{
...
...
@@ -690,7 +690,7 @@ public class CourseOrderController {
public
Object
getCourseResourceDetailV5
(
AsmCourseresourceQuery
asmCourseresourceQuery
)
{
asmCourseresourceQuery
.
setVersion
(
"v5"
);
AggregationCourseResourceBean
aggregationCourseResourceBean
=
courseService
.
getCourseResourceDetail
(
asmCourseresourceQuery
);
Map
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
Map
<
String
,
Object
>
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
map
.
put
(
"imagePaths"
,
aggregationCourseResourceBean
.
getImagePaths
());
String
version
=
asmCourseresourceQuery
.
getVersion
().
toLowerCase
();
if
(
version
.
compareTo
(
"v4"
)
>=
0
)
{
...
...
@@ -755,7 +755,7 @@ public class CourseOrderController {
public
Object
getCourseResourceDetailV4
(
AsmCourseresourceQuery
asmCourseresourceQuery
)
{
asmCourseresourceQuery
.
setVersion
(
"v4"
);
AggregationCourseResourceBean
aggregationCourseResourceBean
=
courseService
.
getCourseResourceDetail
(
asmCourseresourceQuery
);
Map
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
Map
<
String
,
Object
>
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
map
.
put
(
"imagePaths"
,
aggregationCourseResourceBean
.
getImagePaths
());
String
version
=
asmCourseresourceQuery
.
getVersion
().
toLowerCase
();
if
(
version
.
compareTo
(
"v4"
)
>=
0
)
{
...
...
@@ -799,7 +799,7 @@ public class CourseOrderController {
public
Object
getCourseResourceDetailV2
(
AsmCourseresourceQuery
asmCourseresourceQuery
)
{
asmCourseresourceQuery
.
setVersion
(
"v2"
);
AggregationCourseResourceBean
aggregationCourseResourceBean
=
courseService
.
getCourseResourceDetail
(
asmCourseresourceQuery
);
Map
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
Map
<
String
,
Object
>
map
=
this
.
setCourseResourceDetailMap
(
asmCourseresourceQuery
,
aggregationCourseResourceBean
);
map
.
put
(
"imagePaths"
,
aggregationCourseResourceBean
.
getImagePaths
());
return
map
;
}
...
...
@@ -820,7 +820,7 @@ public class CourseOrderController {
* @return
*/
@SuppressWarnings
(
"unchecked"
)
private
Map
setCourseResourceDetailMap
(
AsmCourseresourceQuery
asmCourseresourceQuery
,
AggregationCourseResourceBean
aggregationCourseResourceBean
)
{
private
Map
<
String
,
Object
>
setCourseResourceDetailMap
(
AsmCourseresourceQuery
asmCourseresourceQuery
,
AggregationCourseResourceBean
aggregationCourseResourceBean
)
{
Map
map
=
new
HashMap
();
List
<
Map
>
resourceList
=
new
ArrayList
<
Map
>();
List
<
Map
>
memberResourceList
=
new
ArrayList
<
Map
>();
...
...
@@ -922,7 +922,7 @@ public class CourseOrderController {
&&
!(
asmCourseresourceQuery
.
getVersion
()
!=
null
&&
asmCourseresourceQuery
.
getVersion
().
compareTo
(
"v5"
)
>=
0
))
{
continue
;
}
Map
resourceMap
=
new
HashMap
();
Map
<
String
,
Object
>
resourceMap
=
new
HashMap
<
String
,
Object
>
();
resourceMap
.
put
(
"resourceName"
,
aggregationResourceBean
.
getResourceName
());
resourceMap
.
put
(
"service"
,
aggregationResourceBean
.
getService
());
resourceMap
.
put
(
"salePrice"
,
aggregationResourceBean
.
getSalePrice
());
...
...
@@ -1017,7 +1017,6 @@ public class CourseOrderController {
bean
.
setSalePrice
(
0
d
);
//电话预订底价日历显示为0
}
map
.
put
(
"price"
,
bean
.
getSalePrice
());
map
.
put
(
"vipPrice"
,
bean
.
getVipPrice
());
map
.
put
(
"teeTime"
,
bean
.
getTeeTime
());
if
(
version
.
toLowerCase
().
compareTo
(
"v2"
)
>=
0
)
{
...
...
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