Merge branch 'dev/2024/0408/update-product' of Harper/feifan-backend-zx-app into master

微信首次登录添加手机验证码并查询同手机号会员用户绑定

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/auth/AppAuthController.java

@@ -91,6 +91,13 @@ public class AppAuthController {
         return success(true);
     }
 
+    @PostMapping("/social-login-validate-sms-code")
+    @Operation(summary = "社交快捷登录-校验手机验证码")
+    public CommonResult<AppAuthLoginRespVO> socialLoginValidateSmsCode( @RequestBody @Validated SocialLoginValidateSmsCodeReqVO requestVO) {
+        authService.validateSmsCode(getLoginUserId(), requestVO.getReqVO());
+        return success(authService.firstSocialLogin(requestVO.getLoginReqVO(),requestVO.getReqVO().getCode()));
+    }
+
     // ========== 社交登录相关 ==========
 
     @GetMapping("/social-auth-redirect")
@@ -107,7 +114,7 @@ public class AppAuthController {
     @PostMapping("/social-login")
     @Operation(summary = "社交快捷登录，使用 code 授权码", description = "适合未登录的用户，但是社交账号已绑定用户")
     public CommonResult<AppAuthLoginRespVO> socialLogin(@RequestBody @Valid AppAuthSocialLoginReqVO reqVO) {
-        return success(authService.socialLogin(reqVO));
+        return success(authService.socialLogin(reqVO,null));
     }
 
     @PostMapping("/weixin-mini-app-login")

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/auth/vo/SocialLoginValidateSmsCodeReqVO.java

@@ -0,0 +1,24 @@
+package cn.newfeifan.mall.module.member.controller.app.auth.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.Valid;
+
+@Schema(description = "用户 APP - 社交登录验证短信码请求参数")
+@Data
+public class SocialLoginValidateSmsCodeReqVO {
+    /**
+     * 验证短信码的请求信息
+     * 该字段包含了进行短信验证码验证所需的请求参数。
+     */
+    @Valid
+    private AppAuthSmsValidateReqVO reqVO;
+
+    /**
+     * 社交登录请求信息
+     * 该字段包含了社交登录所需的请求参数。
+     */
+    @Valid
+    private AppAuthSocialLoginReqVO loginReqVO;
+}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/auth/MemberAuthService.java

@@ -40,9 +40,19 @@ public interface MemberAuthService {
      * 社交登录，使用 code 授权码
      *
      * @param reqVO 登录信息
+     * @param phone 用户手机号
      * @return 登录结果
      */
-    AppAuthLoginRespVO socialLogin(@Valid AppAuthSocialLoginReqVO reqVO);
+    AppAuthLoginRespVO socialLogin(@Valid AppAuthSocialLoginReqVO reqVO, String phone);
+
+    /**
+     * 首次社交登录，自动注册账号
+     *
+     * @param reqVO 登录信息
+     * @param phone 手机号
+     * @return 登录结果
+     */
+    AppAuthLoginRespVO firstSocialLogin(AppAuthSocialLoginReqVO reqVO,String phone);
 
     /**
      * 微信小程序的一键登录

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/auth/MemberAuthServiceImpl.java

@@ -27,6 +27,7 @@ import cn.newfeifan.mall.module.system.enums.logger.LoginResultEnum;
 import cn.newfeifan.mall.module.system.enums.oauth2.OAuth2ClientConstants;
 import cn.newfeifan.mall.module.system.enums.sms.SmsSceneEnum;
 import cn.newfeifan.mall.module.system.enums.social.SocialTypeEnum;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -101,9 +102,9 @@ public class MemberAuthServiceImpl implements MemberAuthService {
 
     @Override
     @Transactional
-    public AppAuthLoginRespVO socialLogin(AppAuthSocialLoginReqVO reqVO) {
+    public AppAuthLoginRespVO socialLogin(AppAuthSocialLoginReqVO reqVO, String phone) {
         // 使用 code 授权码，进行登录。然后，获得到绑定的用户编号
-        SocialUserRespDTO socialUser = socialUserApi.getSocialUserByCode(UserTypeEnum.MEMBER.getValue(), reqVO.getType(),
+        SocialUserRespDTO socialUser = socialUserApi.getFirstSocialUserByCode(UserTypeEnum.MEMBER.getValue(), reqVO.getType(),
                 reqVO.getCode(), reqVO.getState());
         if (socialUser == null) {
             throw exception(AUTH_SOCIAL_USER_NOT_FOUND);
@@ -113,9 +114,20 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         MemberUserDO user;
         if (socialUser.getUserId() != null) {
             user = userService.getUser(socialUser.getUserId());
-        // 情况二：未绑定，注册用户 + 绑定用户
+            // 情况二：未绑定，注册用户 + 绑定用户
         } else {
-            user = userService.createUser(socialUser.getNickname(), socialUser.getAvatar(), getClientIP(), getTerminal());
+
+            //通过微信 + 手机号首次登录
+            if (!StringUtil.isEmpty(phone)) {
+                //如果会员表中有记录
+                user = userService.getUserByMobile(phone);
+                if (user == null) {
+                    user = userService.createUser(socialUser.getNickname(), socialUser.getAvatar(), getClientIP(), getTerminal());
+                }
+            } else {
+                user = userService.createUser(socialUser.getNickname(), socialUser.getAvatar(), getClientIP(), getTerminal());
+            }
+
             socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
                     reqVO.getType(), reqVO.getCode(), reqVO.getState()));
         }
@@ -127,6 +139,17 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         return createTokenAfterLoginSuccess(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL, socialUser.getOpenid());
     }
 
+    @Override
+    @Transactional
+    public AppAuthLoginRespVO firstSocialLogin(AppAuthSocialLoginReqVO reqVO, String phone) {
+        SocialUserRespDTO socialUser = socialUserApi.getFirstSocialUserByCode(UserTypeEnum.MEMBER.getValue(), reqVO.getType(),
+                reqVO.getCode(), reqVO.getState());
+        if (socialUser == null) {
+            throw exception(AUTH_SOCIAL_USER_NOT_FOUND);
+        }
+        return socialLogin(reqVO, phone);
+    }
+
     @Override
     public AppAuthLoginRespVO weixinMiniAppLogin(AppAuthWeixinMiniAppLoginReqVO reqVO) {
         // 获得对应的手机号信息

feifan-module-system/feifan-module-system-api/src/main/java/cn/newfeifan/mall/module/system/api/social/SocialUserApi.java

@@ -50,6 +50,6 @@ public interface SocialUserApi {
      * @param state state
      * @return 社交用户
      */
-    SocialUserRespDTO getSocialUserByCode(Integer userType, Integer socialType, String code, String state);
+    SocialUserRespDTO getFirstSocialUserByCode(Integer userType, Integer socialType, String code, String state);
 
 }

feifan-module-system/feifan-module-system-api/src/main/java/cn/newfeifan/mall/module/system/enums/ErrorCodeConstants.java

@@ -12,6 +12,7 @@ public interface ErrorCodeConstants {
     // ========== AUTH 模块 1-002-000-000 ==========
     ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_002_000_000, "登录失败，账号密码不正确");
     ErrorCode AUTH_LOGIN_USER_DISABLED = new ErrorCode(1_002_000_001, "登录失败，账号被禁用");
+    ErrorCode AUTH_LOGIN_USER_IS_FIRST = new ErrorCode(1_002_000_002, "登录失败，第一次登录");
     ErrorCode AUTH_LOGIN_CAPTCHA_CODE_ERROR = new ErrorCode(1_002_000_004, "验证码不正确，原因：{}");
     ErrorCode AUTH_THIRD_LOGIN_NOT_BIND = new ErrorCode(1_002_000_005, "未绑定账号，需要进行绑定");
     ErrorCode AUTH_TOKEN_EXPIRED = new ErrorCode(1_002_000_006, "Token 已经过期");

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/api/social/SocialUserApiImpl.java

@@ -38,8 +38,8 @@ public class SocialUserApiImpl implements SocialUserApi {
     }
 
     @Override
-    public SocialUserRespDTO getSocialUserByCode(Integer userType, Integer socialType, String code, String state) {
-       return socialUserService.getSocialUserByCode(userType, socialType, code, state);
+    public SocialUserRespDTO getFirstSocialUserByCode(Integer userType, Integer socialType, String code, String state) {
+       return socialUserService.getFirstSocialUserByCode(userType, socialType, code, state);
     }
 
 }

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/social/SocialUserService.java

@@ -68,6 +68,19 @@ public interface SocialUserService {
      */
     SocialUserRespDTO getSocialUserByCode(Integer userType, Integer socialType, String code, String state);
 
+    /**
+     * 获得社交用户
+     *
+     * 在认证信息不正确的情况下，也会抛出 {@link ServiceException} 业务异常
+     *
+     * @param userType 用户类型
+     * @param socialType 社交平台的类型
+     * @param code 授权码
+     * @param state state
+     * @return 社交用户
+     */
+    SocialUserRespDTO getFirstSocialUserByCode(Integer userType, Integer socialType, String code, String state);
+
     // ==================== 社交用户 CRUD ====================
 
     /**

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/social/SocialUserServiceImpl.java

@@ -26,6 +26,7 @@ import java.util.List;
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.newfeifan.mall.framework.common.util.json.JsonUtils.toJsonString;
+import static cn.newfeifan.mall.module.system.enums.ErrorCodeConstants.AUTH_LOGIN_USER_IS_FIRST;
 import static cn.newfeifan.mall.module.system.enums.ErrorCodeConstants.SOCIAL_USER_NOT_FOUND;
 
 /**
@@ -118,6 +119,18 @@ public class SocialUserServiceImpl implements SocialUserService {
         return new SocialUserRespDTO(socialUser.getOpenid(), socialUser.getNickname(), socialUser.getAvatar(),
                 socialUserBind != null ? socialUserBind.getUserId() : null);
     }
+    @Override
+    public SocialUserRespDTO getFirstSocialUserByCode(Integer userType, Integer socialType, String code, String state) {
+        // 获得社交用户
+        SocialUserDO socialUser = firstAuthSocialUser(socialType, userType, code, state);
+        Assert.notNull(socialUser, "社交用户不能为空");
+
+        // 获得绑定用户
+        SocialUserBindDO socialUserBind = socialUserBindMapper.selectByUserTypeAndSocialUserId(userType,
+                socialUser.getId());
+        return new SocialUserRespDTO(socialUser.getOpenid(), socialUser.getNickname(), socialUser.getAvatar(),
+                socialUserBind != null ? socialUserBind.getUserId() : null);
+    }
 
     /**
      * 授权获得对应的社交用户
@@ -158,6 +171,24 @@ public class SocialUserServiceImpl implements SocialUserService {
         return socialUser;
     }
 
+    /**
+     * 调用authSocialUser方法做一个中转判断
+     * @param socialType 社交平台的类型 {@link SocialTypeEnum}
+     * @param userType 用户类型
+     * @param code     授权码
+     * @param state    state
+     * @return 授权用户
+     */
+    public SocialUserDO firstAuthSocialUser(Integer socialType, Integer userType, String code, String state) {
+        // 优先从 DB 中获取，因为 code 有且可以使用一次。
+        SocialUserDO socialUser = socialUserMapper.selectByTypeAndCodeAnState(socialType, code, state);
+        if(socialUser == null){
+            throw exception(AUTH_LOGIN_USER_IS_FIRST);
+        }
+
+        return authSocialUser(socialType, userType, code, state);
+    }
+
     // ==================== 社交用户 CRUD ====================
 
     @Override