| | |
|---|
| | | 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()); |
|---|
| | |
|---|
| | | 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(); |
|---|
