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/dao/user/UserExtDao.java

@@ -1226,22 +1226,22 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
 	}
 
 	public List<RecommendRankBean> getRanking() {
-		String sql = " SELECT a.inviterUid,b.userName as inviterUserName, COUNT(a.miniAppOpenId)  AS myNum1, "
-				+ " COUNT(CASE WHEN a.RegisterTime>'2018-08-05 00:00:00' THEN a.miniAppOpenId END)  AS myNum2 ,"
-				+ " COUNT(CASE WHEN (a.vipGrade&2) = 2 THEN  a.miniAppOpenId END)  AS myNum3  ,"
-				+ " COUNT(CASE WHEN (a.vipGrade&2) != 2 THEN  a.miniAppOpenId END)  AS myNum4 ,"
-				+ " COUNT(CASE WHEN ((a.vipGrade&2) = 2 AND a.communeAgainTime>'2018-08-01'  AND a.communeAgainTime<'2018-08-21'  AND a.communeYears=1) THEN  a.miniAppOpenId END)  AS myNum5, "
-				+ " COUNT(CASE WHEN ((a.vipGrade&2) = 2 AND a.communeAgainTime>'2018-08-01'  AND a.communeAgainTime<'2018-08-21'  AND a.communeYears>1) THEN  a.miniAppOpenId END)  AS myNum6 "
-				+ " FROM bsc_userext a LEFT JOIN bsc_userext b ON a.inviterUid = b.uid  where a.inviterUid is not null  and a.inviterUid <>'' GROUP BY a.inviterUid  ORDER BY myNum4 DESC ";
+		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"
+				+ " 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)
+//				.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

@@ -1635,11 +1635,12 @@ public class UserService {
     
     /**
      * uid为空串是获取用信息失败。
+     * 当前uid大多数等于bindedmobilePhone,新增加的社员都是uid等于手机号码, 所以更改优先使用手机号码查询用户信息
      */
     public UserBean getUserDetail(UserQuery userQuery) {
-        UserExt userExt = this.userExtDao.getUserExtInfoByUid(userQuery.getUid());
+        UserExt userExt = this.userExtDao.GetUserExtInfoByPhone(userQuery.getUid());
         if (userExt == null) {
-            userExt = this.userExtDao.GetUserExtInfoByPhone(userQuery.getUid());
+            userExt = this.userExtDao.getUserExtInfoByUid(userQuery.getUid());
         }
         if (userExt == null) {
             return null;