Merge branch 'dev/2024/0529/update-app-Y' of feifan/mall-backend-app into master

修改登录系统

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

@@ -124,6 +124,13 @@ public class AppAuthController {
         return success(authService.socialLogin(reqVO));
     }
 
+    @PostMapping("/social-register")
+    @Operation(summary = "社交快捷注册,使用code授权码",description = "同一个微信账号注册多个消费者账号")
+    public CommonResult<AppAuthLoginRespVO> socialRegister(@RequestBody @Valid AppAuthSocialRegisterReqVO requestVO){
+
+        return success(authService.socialRegister(requestVO, null, true, true));
+    }
+
     @PostMapping("/select-username-login")
     @Operation(summary = "选择用户名登录")
     public CommonResult<AppAuthLoginRespVO> selectUsernameLogin(@RequestBody @Valid AppAuthSelectUsernameLoginReqVO reqVO) {

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

@@ -11,6 +11,10 @@ public class AppAuthSocialRegisterReqVO  extends AppAuthSocialLoginReqVO{
     @NotNull(message = "只能通过分享注册")
     private String linkId;
 
+    @Schema(description = "用户名")
+    @NotNull(message = "用户名不能为空")
+    private String username;
+
     public Long getLinkId() {
         if (linkId == null) {
             return null;

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

@@ -163,7 +163,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
                     .avatar(user.getAvatar())
                     .build())
                     .collect(Collectors.toList());
-            return AppAuthLoginRespVO.builder().socialUsers(memberUserRespVOS).build();
+            return AppAuthLoginRespVO.builder().openid(socialUser.getOpenid()).socialUsers(memberUserRespVOS).build();
         }else{
             //如果只有一个账号那就直接登录
             socialUser.setUserId(socialUser.getUserIds().get(0));