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
ac5e23c5
authored
Feb 11, 2018
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.6' of 192.168.10.6:caosy/fun-golf-mobile into f-6.6.6
parents
913b3b3b
cc7fec35
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 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 @
ac5e23c5
...
...
@@ -530,6 +530,9 @@ public class CourseOrderController {
mp
.
put
(
"fairwayLength"
,
bean
.
getFairwayLength
());
mp
.
put
(
"teeTime"
,
bean
.
getTeeTime
());
mp
.
put
(
"salePrice"
,
bean
.
getSalePrice
());
mp
.
put
(
"vipFirstReduction"
,
bean
.
getVipFirstReduction
());
mp
.
put
(
"vipMaxRandom"
,
bean
.
getVipMaxRandom
());
mp
.
put
(
"vipMinRandom"
,
bean
.
getVipMinRandom
());
mp
.
put
(
"marketPrice"
,
bean
.
getMarketPrice
());
mp
.
put
(
"vipSaveAmount"
,
bean
.
getVipSaveAmount
());
...
...
@@ -928,6 +931,11 @@ public class CourseOrderController {
resourceMap
.
put
(
"salePrice"
,
aggregationResourceBean
.
getSalePrice
());
resourceMap
.
put
(
"memberPrice"
,
aggregationResourceBean
.
getMemberPrice
());
resourceMap
.
put
(
"memberCashRebate"
,
aggregationResourceBean
.
getMemberCashRebate
());
resourceMap
.
put
(
"vipFirstReduction"
,
aggregationResourceBean
.
getVipFirstReduction
());
resourceMap
.
put
(
"vipMinRandom"
,
aggregationResourceBean
.
getVipMinRandom
());
resourceMap
.
put
(
"vipMaxRandom"
,
aggregationResourceBean
.
getVipMaxRandom
());
resourceMap
.
put
(
"marketPrice"
,
aggregationResourceBean
.
getMarketPrice
());
resourceMap
.
put
(
"productId"
,
aggregationResourceBean
.
getProductId
());
resourceMap
.
put
(
"productName"
,
aggregationResourceBean
.
getProductName
());
...
...
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