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

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

@@ -47,5 +47,18 @@ public class RecommendStaticController {
 		return response;
 	}
 
+	@ResponseBody
+	@RequestMapping(value = "/rankingXiehe", method = RequestMethod.POST)
+	public Response<List<RecommendRankBean>> getRankingXiehe() {
+
+		Response<List<RecommendRankBean>> response = new Response<List<RecommendRankBean>>();
+		List<RecommendRankBean> rankingList = new ArrayList<RecommendRankBean>();
+		
+
+		// 查询数据库最新版本的App
+		 rankingList = UserService.getRankingXiehe();
+		 response.setBody(rankingList);
+		return response;
+	}
 
 }

src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java

@@ -1225,23 +1225,18 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
         return query.executeUpdate();
 	}
 
-	public List<RecommendRankBean> getRanking() {
+	public List<RecommendRankBean> getRanking(Integer activityId) {
 		String sql = " SELECT b.recommendUid inviterUid,d.UserName as inviterUserName,COUNT(*) AS myNum1 FROM ord_order a "
 				+ " LEFT JOIN ord_communeitem b ON a.OrderID = b.OrderID"
 				+ " LEFT JOIN bsc_userext  d ON d.uid = b.recommendUid"
 				+ " WHERE a.OrderCategory = 16  "
-				+ "  AND a.ProcessStatus&16=16    AND b.activityId = 3"
+				+ "  AND a.ProcessStatus&16=16    AND b.activityId = "+activityId
 				+ " GROUP BY b.recommendUid ORDER BY myNum1 DESC"
 				+ "";
         Query query = getSession().createSQLQuery(sql)
         		.addScalar("inviterUid", StandardBasicTypes.STRING)
 				.addScalar("inviterUserName", StandardBasicTypes.STRING)
 				.addScalar("myNum1", StandardBasicTypes.INTEGER)
-//				.addScalar("myNum2", StandardBasicTypes.INTEGER)
-//				.addScalar("myNum3", StandardBasicTypes.INTEGER)
-//				.addScalar("myNum4", StandardBasicTypes.INTEGER)
-//				.addScalar("myNum5", StandardBasicTypes.INTEGER)
-//				.addScalar("myNum6", StandardBasicTypes.INTEGER)
         		.setResultTransformer(Transformers.aliasToBean(RecommendRankBean.class));
         List<RecommendRankBean> rankingBeanList = query.list();
 		return rankingBeanList;

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

@@ -3239,9 +3239,15 @@ public class UserService {
 	}
 
 	public List<RecommendRankBean> getRanking() {
-		List<RecommendRankBean> rankingList = userExtDao.getRanking();
+		List<RecommendRankBean> rankingList = userExtDao.getRanking(3);
 		
 		return rankingList;
 	}	
 
+
+	public List<RecommendRankBean> getRankingXiehe() {
+		List<RecommendRankBean> rankingList = userExtDao.getRanking(5);
+		
+		return rankingList;
+	}
 }