From 1339039a6fdb3794c57914192f1c3a4132b8e3df Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 10:50:28 +0800
Subject: [PATCH] 修改注册逻辑
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index d6e9283..89f8b03 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -217,10 +217,18 @@
return R.fail("此微信号已注册，请直接登录！");
}
AppUser appUser1 = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, registerAccount.getPhone()).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
- if(null != appUser1){
+ if(null != appUser1 && StringUtils.isNotEmpty(appUser1.getWxOpenid())){
return R.fail("手机号已注册，请直接登录！");
}
- if(null == appUser){
+ if(null != appUser1 && appUser1.getStatus() == 2){
+ return R.fail("手机号已注册，请直接登录！");
+ }
+ //如果手机号已注册，但是没有微信号，则将微信号添加到已有账户上
+ if(null != appUser1 && StringUtils.isEmpty(appUser1.getWxOpenid())){
+ appUser1.setWxOpenid(openid);
+ this.updateById(appUser1);
+ appUser = appUser1;
+ }else if(null == appUser){
appUser = new AppUser();
appUser.setName(registerAccount.getName());
appUser.setPhone(registerAccount.getPhone());
@@ -289,11 +297,10 @@
sysUserClient.saveShopUser(user);
}
}
-
}
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(1);
- loginVo.setFirstTime(false);
+ loginVo.setFirstTime(null == appUser1 ? true : false);
loginVo.setPhone(appUser.getPhone());
//构建token
LoginUser loginUser = new LoginUser();
--
Gitblit v1.7.1