|
@@ -60,14 +60,17 @@ public class WxH5MpController {
|
|
//获取微信用户信息
|
|
//获取微信用户信息
|
|
WxOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(param.getCode());
|
|
WxOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(param.getCode());
|
|
WxOAuth2UserInfo wxMpUser = wxMpService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
|
|
WxOAuth2UserInfo wxMpUser = wxMpService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
|
|
- FsUser user = userService.selectFsUserByUnionid(wxMpUser.getUnionId());
|
|
|
|
|
|
+// FsUser user = userService.selectFsUserByUnionid(wxMpUser.getUnionId());
|
|
|
|
+ FsUser user = userService.selectFsUserByMaOpenId(wxMpUser.getOpenid());
|
|
if (user != null) {
|
|
if (user != null) {
|
|
//修改
|
|
//修改
|
|
FsUser userMap = new FsUser();
|
|
FsUser userMap = new FsUser();
|
|
userMap.setUserId(user.getUserId());
|
|
userMap.setUserId(user.getUserId());
|
|
userMap.setMpOpenId(wxMpUser.getOpenid());
|
|
userMap.setMpOpenId(wxMpUser.getOpenid());
|
|
|
|
+ userMap.setUnionId(wxMpUser.getUnionId());
|
|
userMap.setUpdateTime(new DateTime());
|
|
userMap.setUpdateTime(new DateTime());
|
|
userMap.setNickname(wxMpUser.getNickname());
|
|
userMap.setNickname(wxMpUser.getNickname());
|
|
|
|
+ user.setAvatar(wxMpUser.getHeadImgUrl());
|
|
userService.updateFsUser(userMap);
|
|
userService.updateFsUser(userMap);
|
|
} else {
|
|
} else {
|
|
//新增
|
|
//新增
|