|
|
@@ -63,14 +63,14 @@ public class WeChatTokenGranter extends AbstractTokenGranter {
|
|
|
String appletsId = requestParams.get(TokenUtil.APPLETS_ID);
|
|
|
String openId = requestParams.get(TokenUtil.OPEN_ID);
|
|
|
UserInfo userInfo = userClient.getUserInfoByPhone(phone, String.valueOf(UserEnum.WECHAT.getCategory()));
|
|
|
- if (ObjectUtils.isEmpty(userInfo) && !StringUtils.hasText(storeId)) {
|
|
|
+ boolean userInfoExist = ObjectUtils.isEmpty(userInfo);
|
|
|
+ if (userInfoExist && !StringUtils.hasText(storeId)) {
|
|
|
throw new UserDeniedAuthorizationException("请扫描门店二维码进行注册登录");
|
|
|
}
|
|
|
- if (!ObjectUtils.isEmpty(userInfo) && NumberEnum.ONE.number.equals(userInfo.getUser().getWorkingStatus())) {
|
|
|
+ if (!userInfoExist && NumberEnum.ONE.number.equals(userInfo.getUser().getWorkingStatus())) {
|
|
|
throw new UserDeniedAuthorizationException(TokenUtil.USER_NOT_EXIST);
|
|
|
}
|
|
|
User saveUser = null;
|
|
|
- boolean userInfoExist = Objects.isNull(userInfo);
|
|
|
if (userInfoExist) {
|
|
|
saveUser = new User();
|
|
|
saveUser.setAppletsId(appletsId);
|
liyuan