cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复代码空指针异常

Browse Source
This commit is contained in:
LIONCITYS\lioncity
2020-11-04 20:27:14 +08:00
parent 1008685781
commit 48ea2c8d60
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
View File

@ -101,7 +101,6 @@ public class AuthService {
WxMaUserInfo wxMpUser = wxMaService.getUserService() WxMaUserInfo wxMpUser = wxMaService.getUserService()
.getUserInfo(session.getSessionKey(), encryptedData, iv); .getUserInfo(session.getSessionKey(), encryptedData, iv);
String openid = wxMpUser.getOpenId(); String openid = wxMpUser.getOpenId();
YxUser returnUser = null;
//如果开启了UnionId //如果开启了UnionId
if (StrUtil.isNotBlank(wxMpUser.getUnionId())) { if (StrUtil.isNotBlank(wxMpUser.getUnionId())) {
openid = wxMpUser.getUnionId(); openid = wxMpUser.getUnionId();
@ -115,7 +114,7 @@ public class AuthService {
//过滤掉表情 //过滤掉表情
String ip = IpUtil.getRequestIp(); String ip = IpUtil.getRequestIp();
YxUser user = YxUser.builder() yxUser = YxUser.builder()
.username(openid) .username(openid)
.nickname(wxMpUser.getNickName()) .nickname(wxMpUser.getNickName())
.avatar(wxMpUser.getAvatarUrl()) .avatar(wxMpUser.getAvatarUrl())
@ -137,14 +136,11 @@ public class AuthService {
.headimgurl(wxMpUser.getAvatarUrl()) .headimgurl(wxMpUser.getAvatarUrl())
.build(); .build();
user.setWxProfile(wechatUserDTO); yxUser.setWxProfile(wechatUserDTO);
userService.save(user); userService.save(yxUser);
returnUser = user;
} else { } else {
returnUser = yxUser;
WechatUserDto wechatUser =yxUser.getWxProfile(); WechatUserDto wechatUser =yxUser.getWxProfile();
if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId())) if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId()))
|| (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(wxMpUser.getUnionId()))) { || (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(wxMpUser.getUnionId()))) {
@ -157,9 +153,9 @@ public class AuthService {
yxUser.setUserType(AppFromEnum.ROUNTINE.getValue()); yxUser.setUserType(AppFromEnum.ROUNTINE.getValue());
userService.updateById(yxUser); userService.updateById(yxUser);
} }
userService.setSpread(spread, returnUser.getUid()); userService.setSpread(spread, yxUser.getUid());
redisUtils.set(ShopConstants.YSHOP_MINI_SESSION_KET + yxUser.getUid(), session.getSessionKey()); redisUtils.set(ShopConstants.YSHOP_MINI_SESSION_KET + yxUser.getUid(), session.getSessionKey());
return returnUser; return yxUser;
} catch (WxErrorException e) { } catch (WxErrorException e) {
e.printStackTrace(); e.printStackTrace();
log.error(e.getMessage()); log.error(e.getMessage());