Skip to content

caosy / fun-golf-mobile

Go to a project
Commit bb02ab48 by unknown
Options

Merge branch 'f-6.6.6' of 192.168.10.6:caosy/fun-golf-mobile into f-6.6.6

parents e2252780 a30678e3
Inline Side-by-side
Showing with 11 additions and 10 deletions
src/main/java/com/ctrip/fun/golf/api/course/CourseOrderController.java
......@@ -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());
......@@ -531,6 +531,7 @@ public class CourseOrderController {
mp.put("teeTime", bean.getTeeTime());
mp.put("salePrice", bean.getSalePrice());
mp.put("marketPrice", bean.getMarketPrice());
mp.put("vipSaveAmount", bean.getVipSaveAmount());
mp.put("distance", bean.getDistance());
mp.put("inventoryType", bean.getInventoryType());
......@@ -592,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) {
......@@ -640,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) {
......@@ -689,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) {
......@@ -754,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) {
......@@ -798,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;
}
......@@ -819,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>();
......@@ -921,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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment