Merge branch 'f-6.7.0' into lichong-dev

src/main/java/com/ctrip/fun/golf/api/version/RecommendStaticController.java

@@ -77,4 +77,19 @@ public class RecommendStaticController {
 		
 		return response;
 	}
+
+	/**
+	 * 武夷山套餐活动 武夷山  一晚一球 单人入住1280/套  小程序活动价 2380/4套
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/ranking_wys", method = RequestMethod.POST)
+	public Response<List<RecommendRankBean>> getRankingWys() {
+
+		Response<List<RecommendRankBean>> response = new Response<List<RecommendRankBean>>();
+		List<RecommendRankBean> rankingList  = userService.getRankingWys();
+		response.setBody(rankingList);
+		
+		return response;
+	}
 }

src/main/java/com/ctrip/fun/golf/service/user/UserMService.java

@@ -817,4 +817,14 @@ public class UserMService extends BaseService {
         
         return response.getBody();	
 	}
+
+	public List<RecommendRankBean> getRankingWys() {
+        HttpEntity<String> entity = new HttpEntity<String>("");
+        Response<List<RecommendRankBean>> response = super.exchange(
+                this.getServiceUri("uri.recommend.getRankingWys"), HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<List<RecommendRankBean>>>() {
+                }).getBody();
+        
+        return response.getBody();	
+	}
 }

src/main/resources/rpc.properties

@@ -98,6 +98,7 @@ uri.recommend.getRanking = /fun-golf-service/recommend/static/ranking
 uri.recommend.getRankingXiehe = /fun-golf-service/recommend/static/rankingXiehe
 uri.recommend.getRankingXiehe980 = /fun-golf-service/recommend/static/rankingXiehe980
 uri.recommend.getRanking3600 = /fun-golf-service/recommend/static/ranking3600
+uri.recommend.getRankingWys = /fun-golf-service/recommend/static/rankingWys
 
 #recommend
 uri.recommend.queryRecommendList=/fun-golf-service/recommend/recommendList

src/main/webapp/save_customer.html

@@ -74,6 +74,7 @@
             <div class="label">产品类型</div>
             <div>
                 <select id="productName">
+                    <option value="2380">武夷山2380套票</option>
                     <option value="3600">3600套餐</option>
                     <option value="980">入社980</option>
                     <option value="360">续费360</option>