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

修复打通账户的判断

Browse Source
This commit is contained in:
hupeng
2020-04-08 23:31:00 +08:00
parent 0300342deb
commit e8cde022a3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java
View File

@ -237,10 +237,11 @@ public class AuthController {
}else{ }else{
username = yxUser.getUsername(); username = yxUser.getUsername();
if(StrUtil.isNotBlank(wxMpUser.getOpenId()) && StrUtil.isNotBlank(wxMpUser.getUnionId())){ if(StrUtil.isNotBlank(wxMpUser.getOpenId()) || StrUtil.isNotBlank(wxMpUser.getUnionId())){
YxWechatUser wechatUser = new YxWechatUser(); YxWechatUser wechatUser = new YxWechatUser();
wechatUser.setUid(yxUser.getUid()); wechatUser.setUid(yxUser.getUid());
wechatUser.setUnionid(wxMpUser.getUnionId()); wechatUser.setUnionid(wxMpUser.getUnionId());
wechatUser.setOpenid(wxMpUser.getOpenId());
wechatUserService.updateById(wechatUser); wechatUserService.updateById(wechatUser);
} }
@ -383,10 +384,11 @@ public class AuthController {
}else{ }else{
username = yxUser.getUsername(); username = yxUser.getUsername();
if(StrUtil.isNotBlank(session.getOpenid()) && StrUtil.isNotBlank(session.getUnionid())){ if(StrUtil.isNotBlank(session.getOpenid()) || StrUtil.isNotBlank(session.getUnionid())){
YxWechatUser wechatUser = new YxWechatUser(); YxWechatUser wechatUser = new YxWechatUser();
wechatUser.setUid(yxUser.getUid()); wechatUser.setUid(yxUser.getUid());
wechatUser.setUnionid(session.getUnionid()); wechatUser.setUnionid(session.getUnionid());
wechatUser.setRoutineOpenid(session.getOpenid());
wechatUserService.updateById(wechatUser); wechatUserService.updateById(wechatUser);
} }