Browse Source

门店登录接口优化

liyuan 5 days ago
parent
commit
7faf125b18

+ 3 - 3
blade-auth/src/main/java/org/springblade/auth/granter/WeChatTokenGranter.java

@@ -54,9 +54,6 @@ public class WeChatTokenGranter extends AbstractTokenGranter {
 		// 前端应固定传 4
 		String loginType = requestParams.get(TokenUtil.GRANT_TYPE_KEY);
 		String storeId = requestParams.get(TokenUtil.STORE_ID);
-		if (!StringUtils.hasText(storeId)) {
-			throw new UserDeniedAuthorizationException("请联系门店添加用户");
-		}
 		if (!StringUtils.hasText(loginType)) {
 			throw new UserDeniedAuthorizationException("缺少平台数据,请退出小程序重新登录");
 		}
@@ -66,6 +63,9 @@ 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)) {
+			throw new UserDeniedAuthorizationException("请扫描门店二维码进行注册登录");
+		}
 		if (!ObjectUtils.isEmpty(userInfo) && NumberEnum.ONE.number.equals(userInfo.getUser().getWorkingStatus())) {
 			throw new UserDeniedAuthorizationException(TokenUtil.USER_NOT_EXIST);
 		}