|
|
|
@@ -85,7 +85,20 @@ public class WxCUserServiceImpl implements WxCUserService { |
|
|
|
// 1. check user exist |
|
|
|
WxCUser userQ = new WxCUser(); |
|
|
|
userQ.setTenantId(authorizerInfo.getTenantId()); |
|
|
|
userQ.setUnionId(mpUser.getUnionId()); |
|
|
|
boolean bHaveUnionId = false; |
|
|
|
if(StringUtils.isNotBlank(mpUser.getUnionId())) { |
|
|
|
userQ.setUnionId(mpUser.getUnionId()); |
|
|
|
bHaveUnionId = true; |
|
|
|
} else { |
|
|
|
userQ.setOpenAppId(authorizerInfo.getOpenAppid()); |
|
|
|
if(authorizerInfo.getType().equals(EnumAppType.MP_S.getCode())) { |
|
|
|
userQ.setMpOpenId(mpUser.getOpenId()); |
|
|
|
userQ.setMpAppId(authorizerInfo.getAuthorizerAppid()); |
|
|
|
} else if(authorizerInfo.getType().equals(EnumAppType.MP_P.getCode())) { |
|
|
|
userQ.setSubsOpenId(mpUser.getOpenId()); |
|
|
|
userQ.setSubsAppId(authorizerInfo.getAuthorizerAppid()); |
|
|
|
} |
|
|
|
} |
|
|
|
WxCUser oldUser = getByObject(userQ); |
|
|
|
boolean bHave = false; |
|
|
|
if(oldUser != null) { |
|
|
|
@@ -96,13 +109,15 @@ public class WxCUserServiceImpl implements WxCUserService { |
|
|
|
// 未找到,且是关注消息, 直接返回 |
|
|
|
return 0; |
|
|
|
} |
|
|
|
userQ.setOpenAppId(authorizerInfo.getOpenAppid()); |
|
|
|
if(authorizerInfo.getType().equals(EnumAppType.MP_S.getCode())) { |
|
|
|
userQ.setMpOpenId(mpUser.getOpenId()); |
|
|
|
userQ.setMpAppId(authorizerInfo.getAuthorizerAppid()); |
|
|
|
} else if(authorizerInfo.getType().equals(EnumAppType.MP_P.getCode())) { |
|
|
|
userQ.setSubsOpenId(mpUser.getOpenId()); |
|
|
|
userQ.setSubsAppId(authorizerInfo.getAuthorizerAppid()); |
|
|
|
if(bHaveUnionId) { |
|
|
|
userQ.setOpenAppId(authorizerInfo.getOpenAppid()); |
|
|
|
if (authorizerInfo.getType().equals(EnumAppType.MP_S.getCode())) { |
|
|
|
userQ.setMpOpenId(mpUser.getOpenId()); |
|
|
|
userQ.setMpAppId(authorizerInfo.getAuthorizerAppid()); |
|
|
|
} else if (authorizerInfo.getType().equals(EnumAppType.MP_P.getCode())) { |
|
|
|
userQ.setSubsOpenId(mpUser.getOpenId()); |
|
|
|
userQ.setSubsAppId(authorizerInfo.getAuthorizerAppid()); |
|
|
|
} |
|
|
|
} |
|
|
|
if(((oldUser != null && StringUtils.isBlank(oldUser.getNickName())) || (oldUser == null)) |
|
|
|
&& StringUtils.isNotBlank(mpUser.getNickname())) { |
|
|
|
|