修改添加打球人 信息

src/main/java/com/ctrip/fun/golf/api/friend/FriendsController.java

@@ -120,13 +120,22 @@ public class FriendsController {
     @RequestMapping(value = "/update", method = RequestMethod.POST) 
     public Response<ResponseFriendBean> updateFriend(@RequestBody RequestFriendBean request){
         logger.info(SysUtil.getMethodName() + " request: " + request.toString());
-
+       
         Friend golfFriend = new Friend();
         BeanConverter.copyProperties(golfFriend, request);
         
         golfFriend.setUid(request.getToken());
         Response<ResponseFriendBean> response = new  Response<ResponseFriendBean>();
         Friend oldFriend = this.friendService.get(golfFriend.getFriendId());
+        //判斷添加的好友是不是自己，
+        UserExt userExt = userExtService.GetUserExtInfoByPhone(request.getFriendPhone());
+        if(userExt!=null ){
+        	if((request.getToken().equals(userExt.getUid()))){
+        		response.setStatus(ResponseStatusEnum.FAIL.getValue());
+        		response.setMessage("您不能添加自己為好友！");
+        		return response;
+        	}
+        }
         if(oldFriend == null){
             response.setStatus(ResponseStatusEnum.FAIL.getValue());
             response.setMessage("");
@@ -138,7 +147,7 @@ public class FriendsController {
             return response;
         }
         if(!oldFriend.getFriendPhone().equals(golfFriend.getFriendPhone())){
-            friendService.addPlayerForFriend(golfFriend);
+        	friendService.addPlayerForFriend(golfFriend);
         }
         oldFriend.setBirthday(golfFriend.getBirthday());
         oldFriend.setFriendEmail(golfFriend.getFriendEmail());
@@ -146,13 +155,13 @@ public class FriendsController {
         oldFriend.setFriendPhone(golfFriend.getFriendPhone());
         oldFriend.setSex(golfFriend.getSex());
         oldFriend.setHandicap(golfFriend.getHandicap());
-        Integer friendId = this.friendService.modifyFriend(oldFriend);
+        Integer friendId = friendService.modifyFriend(oldFriend);
         if(friendId < 0){
             response.setStatus(ResponseStatusEnum.FAIL.getValue());
             response.setMessage(String.valueOf(friendId));
         } else {
             ResponseFriendBean responseFriendBean = new ResponseFriendBean();
-            UserExt userExt = userExtService.GetUserExtInfoByPhone(golfFriend.getFriendPhone());
+           
             if(userExt!=null && (checkIfCommuneUser(userExt))){
         		responseFriendBean.setVipGrade(2);
         	}else{

src/main/java/com/ctrip/fun/golf/domain/friend/Friend.java

@@ -126,6 +126,15 @@ public class Friend  implements java.io.Serializable {
     public void setHandicap(int handicap) {
         this.handicap = handicap;
     }
+	@Override
+	public String toString() {
+		return "Friend [friendId=" + friendId + ", uid=" + uid + ", playerId="
+				+ playerId + ", friendPhone=" + friendPhone + ", friendName="
+				+ friendName + ", friendEmail=" + friendEmail + ", birthday="
+				+ birthday + ", sex=" + sex + ", handicap=" + handicap
+				+ ", createTime=" + createTime + ", updateTime=" + updateTime
+				+ "]";
+	}
     
     
     

src/main/java/com/ctrip/fun/golf/service/friend/FriendService.java

@@ -172,6 +172,7 @@ public class FriendService  extends GenericService<FriendDao, Friend, Integer, F
 
     public Integer modifyFriend(Friend friend){
 
+    	System.out.println("++friend+++++++++++++++++"+friend.toString());
 //      Friend friendObj = friendDao.findById(friend.getFriendId());
 //      if(friendObj != null 
 //              && friendObj.getUid().equals(friend.getUid())){
@@ -181,8 +182,9 @@ public class FriendService  extends GenericService<FriendDao, Friend, Integer, F
 //      }
 
         List<Friend> friendlist = friendDao.queryFriendList(friend.getUid(),friend.getFriendPhone().trim(),0);
-        
+       
         if(friendlist != null && friendlist.size()>0){
+
             Friend oldFriend = get(friend.getFriendId());
             if (oldFriend != null && oldFriend.getFriendPhone().equals(friend.getFriendPhone())){
                 //do nothing