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
5559e9ad
authored
Feb 27, 2018
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add the vip value to course list and detail
parent
ac5e23c5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
src/main/java/com/ctrip/fun/golf/api/course/CourseOrderController.java
src/main/java/com/ctrip/fun/golf/api/order/AbstractOrderMController.java
src/main/java/com/ctrip/fun/golf/api/course/CourseOrderController.java
View file @
5559e9ad
...
@@ -861,6 +861,9 @@ public class CourseOrderController {
...
@@ -861,6 +861,9 @@ public class CourseOrderController {
map
.
put
(
"phone3"
,
courseBean
.
getPhone3
());
map
.
put
(
"phone3"
,
courseBean
.
getPhone3
());
map
.
put
(
"teeTimes"
,
aggregationCourseResourceBean
.
getTeeTimes
());
map
.
put
(
"teeTimes"
,
aggregationCourseResourceBean
.
getTeeTimes
());
map
.
put
(
"teeTime"
,
aggregationCourseResourceBean
.
getTeeTime
());
map
.
put
(
"teeTime"
,
aggregationCourseResourceBean
.
getTeeTime
());
//vip add by caosy
map
.
put
(
"vipFirstReduction"
,
aggregationCourseResourceBean
.
getVipFirstReduction
());
map
.
put
(
"vipMaxRandom"
,
aggregationCourseResourceBean
.
getVipMaxRandom
());
}
}
if
(
asmCourseresourceQuery
.
getVersion
().
toLowerCase
().
compareTo
(
"v4"
)
>=
0
)
{
if
(
asmCourseresourceQuery
.
getVersion
().
toLowerCase
().
compareTo
(
"v4"
)
>=
0
)
{
List
<
Map
>
campaignList
=
new
ArrayList
<
Map
>();
List
<
Map
>
campaignList
=
new
ArrayList
<
Map
>();
...
...
src/main/java/com/ctrip/fun/golf/api/order/AbstractOrderMController.java
View file @
5559e9ad
...
@@ -306,7 +306,6 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
...
@@ -306,7 +306,6 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
result
.
put
(
"policyNo"
,
bean
.
getPolicyNo
());
result
.
put
(
"policyNo"
,
bean
.
getPolicyNo
());
result
.
put
(
"canDelete"
,
bean
.
isCanDelete
());
result
.
put
(
"canDelete"
,
bean
.
isCanDelete
());
result
.
put
(
"vipDiscountAmount"
,
bean
.
getDiscountAfterOrderAmount
());
result
.
put
(
"vipDiscountAmount"
,
bean
.
getDiscountAfterOrderAmount
());
}
}
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
...
...
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