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/service/user/UserService.java

@@ -853,6 +853,8 @@ public class UserService {
 			if(userext.getMiniAppOpenId()==null){
 			if(userext.getMiniAppOpenId()==null){
 				userext.setInviterUid(req.getInviterUid());
 				userext.setInviterUid(req.getInviterUid());
 				this.updateUserExtWeiXinInfo(userext, weiXinInfoJSON);
 				this.updateUserExtWeiXinInfo(userext, weiXinInfoJSON);
+			}else{
+				this.updateUserExtWeiXinInfo(userext, weiXinInfoJSON);
 			}
 			}
         }else{
         }else{
         	//否则生成新的用户信息
         	//否则生成新的用户信息
@@ -1637,9 +1639,9 @@ public class UserService {
      * 当前uid大多数等于bindedmobilePhone,新增加的社员都是uid等于手机号码, 所以更改优先使用手机号码查询用户信息
      * 当前uid大多数等于bindedmobilePhone,新增加的社员都是uid等于手机号码, 所以更改优先使用手机号码查询用户信息
      */
      */
     public UserBean getUserDetail(UserQuery userQuery) {
     public UserBean getUserDetail(UserQuery userQuery) {
-        UserExt userExt = this.userExtDao.GetUserExtInfoByPhone(userQuery.getUid());
+    	UserExt userExt = this.userExtDao.getUserExtInfoByUid(userQuery.getUid());
         if (userExt == null) {
         if (userExt == null) {
-            userExt = this.userExtDao.getUserExtInfoByUid(userQuery.getUid());
+        	 userExt = this.userExtDao.GetUserExtInfoByPhone(userQuery.getUid());
         }
         }
         if (userExt == null) {
         if (userExt == null) {
             return null;
             return null;