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

@@ -567,8 +567,34 @@ public class UserMController {
     @Security(index = 1, field = "token")
     public Object userDetail(UserQuery userQuery) {
         userQuery.setUid(UserContext.getUserId());
-        UserBean userBean = userMService.userDetail(userQuery);
-        Map mp = new HashMap();
+        Map mp = changeToMap(userQuery);
+        return mp;
+    }
+
+    /**
+     * 用户详情
+     * 
+     * @param UserQuery
+     *            UserQuery
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    @ResponseBody
+    @RequestMapping(value = "/v1/usersInfo/{uid}", method = RequestMethod.GET)
+    public Object userDetail1(@PathVariable String uid) {
+    	 UserQuery userQuery = new UserQuery();
+    	 userQuery.setUid(uid);
+//        userQuery.setUid(UserContext.getUserId());
+        Map mp = changeToMap(userQuery);
+        return mp;
+    }
+
+	private Map changeToMap(UserQuery userQuery) {
+		UserBean userBean = userMService.userDetail(userQuery);
+		if(userBean ==null){
+			return null;
+		}
+        Map<String, Comparable> mp = new HashMap<>();
         mp.put("token", userQuery.getToken());// add by caosy
         mp.put("address", userBean.getAddress());
         mp.put("birth", userBean.getBirth());
@@ -623,10 +649,8 @@ public class UserMController {
         mp.put("occupation",userBean.getOccupation());        
         mp.put("hobby",userBean.getHobby());        
         mp.put("golfLevel",userBean.getGolfLevel());
-        
-        
-        return mp;
-    }
+		return mp;
+	}
 
     @ResponseBody
     @RequestMapping(value = "/v1/me/adr/{token}", method = RequestMethod.GET)