Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
84192c53
authored
Mar 09, 2018
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release' of 192.168.10.6:caosy/fun-golf-service into release
parents
485b8109
58d6b262
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
3 deletions
src/main/java/com/ctrip/fun/golf/api/friend/FriendsController.java
src/main/java/com/ctrip/fun/golf/api/friend/FriendsController.java
View file @
84192c53
...
@@ -48,20 +48,30 @@ public class FriendsController {
...
@@ -48,20 +48,30 @@ public class FriendsController {
public
Response
<
ResponseFriendBean
>
addFriend
(
@RequestBody
RequestFriendBean
request
){
public
Response
<
ResponseFriendBean
>
addFriend
(
@RequestBody
RequestFriendBean
request
){
logger
.
info
(
SysUtil
.
getMethodName
()
+
" request: "
+
request
.
toString
());
logger
.
info
(
SysUtil
.
getMethodName
()
+
" request: "
+
request
.
toString
());
Response
<
ResponseFriendBean
>
response
=
new
Response
<
ResponseFriendBean
>();
Friend
golfFriend
=
new
Friend
();
Friend
golfFriend
=
new
Friend
();
BeanConverter
.
copyProperties
(
golfFriend
,
request
);
BeanConverter
.
copyProperties
(
golfFriend
,
request
);
//FIXME 暂时没有token_access, token当uid
//FIXME 暂时没有token_access, token当uid
golfFriend
.
setUid
(
request
.
getToken
());
golfFriend
.
setUid
(
request
.
getToken
());
Integer
friendId
=
this
.
friendService
.
save
(
golfFriend
);
Response
<
ResponseFriendBean
>
response
=
new
Response
<
ResponseFriendBean
>();
//判斷添加的好友是不是自己,
UserExt
userExt
=
userExtService
.
GetUserExtInfoByPhone
(
request
.
getFriendPhone
());
if
(
userExt
!=
null
){
if
((
request
.
getToken
().
equals
(
userExt
.
getUid
()))){
response
.
setStatus
(
ResponseStatusEnum
.
FAIL
.
getValue
());
response
.
setMessage
(
"您不能添加自己為好友!"
);
return
response
;
}
}
Integer
friendId
=
this
.
friendService
.
save
(
golfFriend
);
if
(
friendId
<
0
){
if
(
friendId
<
0
){
response
.
setStatus
(
ResponseStatusEnum
.
FAIL
.
getValue
());
response
.
setStatus
(
ResponseStatusEnum
.
FAIL
.
getValue
());
response
.
setMessage
(
String
.
valueOf
(
friendId
));
response
.
setMessage
(
String
.
valueOf
(
friendId
));
}
else
{
}
else
{
ResponseFriendBean
responseFriendBean
=
new
ResponseFriendBean
();
ResponseFriendBean
responseFriendBean
=
new
ResponseFriendBean
();
Friend
friend
=
this
.
friendService
.
get
(
friendId
);
Friend
friend
=
this
.
friendService
.
get
(
friendId
);
UserExt
userExt
=
userExtService
.
GetUserExtInfoByPhone
(
friend
.
getFriendPhone
());
//
UserExt userExt = userExtService.GetUserExtInfoByPhone(friend.getFriendPhone());
if
(
friend
!=
null
){
if
(
friend
!=
null
){
responseFriendBean
.
setPlayerId
(
friend
.
getPlayerId
());
responseFriendBean
.
setPlayerId
(
friend
.
getPlayerId
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment