From e8cde022a3ce50751144bf994194bfa3e163febb Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 8 Apr 2020 23:31:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E9=80=9A=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yixiang/modules/security/rest/AuthController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java index 61154c11..f9913247 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthController.java @@ -237,10 +237,11 @@ public class AuthController { }else{ 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(); wechatUser.setUid(yxUser.getUid()); wechatUser.setUnionid(wxMpUser.getUnionId()); + wechatUser.setOpenid(wxMpUser.getOpenId()); wechatUserService.updateById(wechatUser); } @@ -383,10 +384,11 @@ public class AuthController { }else{ 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(); wechatUser.setUid(yxUser.getUid()); wechatUser.setUnionid(session.getUnionid()); + wechatUser.setRoutineOpenid(session.getOpenid()); wechatUserService.updateById(wechatUser); }