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

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

+package com.ctrip.fun.golf.api.version;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.user.RecommendRankBean;
+import com.ctrip.fun.golf.service.user.UserMService;
+
+@Controller
+@RequestMapping(value = "/recommend/static")
+public class RecommendStaticController {
+
+	@Autowired
+	private UserMService userService;
+	
+	@ResponseBody
+	@RequestMapping(value = "/ranking", method = RequestMethod.POST)
+	public Response<List<RecommendRankBean>> getRanking() {
+
+		Response<List<RecommendRankBean>> response = new Response<List<RecommendRankBean>>();
+		List<RecommendRankBean> rankingList = new ArrayList<RecommendRankBean>();
+
+		// 查询数据库最新版本的App
+		rankingList = userService.getRanking();
+		response.setBody(rankingList);
+		
+		return response;
+	}
+}

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

@@ -20,6 +20,7 @@ import com.ctrip.fun.common.vo.user.LoginBean;
 import com.ctrip.fun.common.vo.user.LoginResultBean;
 import com.ctrip.fun.common.vo.user.MiniAppLoginBean;
 import com.ctrip.fun.common.vo.user.MiniAppLoginResultBean;
+import com.ctrip.fun.common.vo.user.RecommendRankBean;
 import com.ctrip.fun.common.vo.user.RecommendUserBean;
 import com.ctrip.fun.common.vo.user.RecommendUserItemBean;
 import com.ctrip.fun.common.vo.user.RecommendUserListQuery;
@@ -735,4 +736,15 @@ public class UserMService extends BaseService {
         return response.getBody();		
 	}
 
+	public List<RecommendRankBean> getRanking() {
+		
+        HttpEntity<String> entity = new HttpEntity<String>("");
+        Response<List<RecommendRankBean>> response = super.exchange(
+                this.getServiceUri("uri.recommend.getRanking"), HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<List<RecommendRankBean>>>() {
+                }).getBody();
+        
+        return response.getBody();	
+	}
+
 }

src/main/resources/rpc.properties

@@ -85,6 +85,7 @@ uri.user.sendVerifyCodeForBlueFocus=/fun-golf-service/user/sendVerifyCodeForBlue
 uri.user.validateMobilePhoneForBlueFocus=/fun-golf-service/user/validateMobilePhoneForBlueFocus
 uri.user.saveUserDetail = /fun-golf-service/user/saveUserDetail
 uri.user.getUserByUmNickName = /fun-golf-service/user/getUserByUmNickName
+uri.recommend.getRanking = /fun-golf-service/recommend/static/ranking
 
 #recommend
 uri.recommend.queryRecommendList=/fun-golf-service/recommend/recommendList