Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
head_group
xyqb-user2
Commits
c57a4298
Commit
c57a4298
authored
Mar 28, 2018
by
技术部-任文超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善微信关联动作,完善log
parent
986fb8ab
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
5 deletions
+18
-5
UserController.java
...ntgroup/xyqb/controller/internal/user/UserController.java
+18
-5
No files found.
src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
View file @
c57a4298
...
@@ -478,10 +478,23 @@ public class UserController implements IBaseController {
...
@@ -478,10 +478,23 @@ public class UserController implements IBaseController {
public
JsonResult
associateWithWechat
(
String
openId
)
{
public
JsonResult
associateWithWechat
(
String
openId
)
{
User
user
=
getCurrentUserFromRedis
();
User
user
=
getCurrentUserFromRedis
();
Long
userId
=
user
.
getId
();
Long
userId
=
user
.
getId
();
WechatUserInfo
userInfo
=
wechatService
.
findWechatUserInfoFromDb
(
openId
);
/* 判断用户是否已绑定其他微信 */
if
(
Objects
.
isNull
(
userInfo
)
&&
Objects
.
nonNull
(
userId
))
{
WechatUserInfo
userInfoInDb
=
wechatService
.
queryByUserId
(
userId
);
userInfo
=
wechatService
.
queryByUserId
(
userId
);
if
(
Objects
.
nonNull
(
userInfoInDb
))
{
if
(
Objects
.
equals
(
openId
,
userInfoInDb
.
getOpenId
())){
LOGGER
.
info
(
"微信关联成功:重复关联:跳过:user:[{}],openId:[{}],wechatUserInfo:[{}]"
,
user
,
openId
,
userInfoInDb
);
return
JsonResult
.
buildSuccessResult
(
"微信关联成功"
,
null
);
}
else
if
(
StringUtils
.
isNotBlank
(
userInfoInDb
.
getOpenId
())){
// 不做绑定
LOGGER
.
warn
(
"微信关联失败,该用户已绑定其他微信:user:[{}],openId:[{}],wechatUserInfo:[{}]"
,
user
,
openId
,
userInfoInDb
);
return
JsonResult
.
buildErrorStateResult
(
"该用户已绑定其他微信"
,
null
);
}
else
{
// 清除无效微信信息
wechatService
.
forbiddenUserWeChat
(
userId
);
}
}
}
/* 执行绑定 */
WechatUserInfo
userInfo
=
wechatService
.
findWechatUserInfoFromDb
(
openId
);
LOGGER
.
info
(
"微信关联:user:[{}],openId:[{}],wechatUserInfo:[{}]"
,
user
,
openId
,
userInfo
);
LOGGER
.
info
(
"微信关联:user:[{}],openId:[{}],wechatUserInfo:[{}]"
,
user
,
openId
,
userInfo
);
// 无微信信息
// 无微信信息
if
(
userInfo
==
null
)
{
if
(
userInfo
==
null
)
{
...
@@ -503,8 +516,8 @@ public class UserController implements IBaseController {
...
@@ -503,8 +516,8 @@ public class UserController implements IBaseController {
LOGGER
.
info
(
"微信关联成功:user:[{}],openId:[{}],wechatUserInfo:[{}]"
,
user
,
openId
,
userInfo
);
LOGGER
.
info
(
"微信关联成功:user:[{}],openId:[{}],wechatUserInfo:[{}]"
,
user
,
openId
,
userInfo
);
}
catch
(
Exception
ex
)
{
}
catch
(
Exception
ex
)
{
// 不做绑定
// 不做绑定
LOGGER
.
warn
(
"微信关联失败,
该手机号已绑定其他微信号码
:user:[{}],openId:[{}],wechatUserInfo:[{}]"
,
user
,
openId
,
userInfo
,
ex
);
LOGGER
.
warn
(
"微信关联失败,
保存遇到问题
:user:[{}],openId:[{}],wechatUserInfo:[{}]"
,
user
,
openId
,
userInfo
,
ex
);
return
JsonResult
.
buildErrorStateResult
(
"
该手机号已绑定其他微信号码
"
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"
微信关联失败
"
,
null
);
}
}
return
JsonResult
.
buildSuccessResult
(
"微信关联成功"
,
null
);
return
JsonResult
.
buildSuccessResult
(
"微信关联成功"
,
null
);
}
}
...
...
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