From 4dea55eb19d921eb61ae3953364d5a77ce31609b Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 17 四月 2025 16:03:00 +0800
Subject: [PATCH] add 登录
---
src/main/java/com/mzl/flower/web/login/CustomerLoginController.java | 9 +++++++--
src/main/java/com/mzl/flower/service/system/UserService.java | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/system/UserService.java b/src/main/java/com/mzl/flower/service/system/UserService.java
index 502000a..4ee1b65 100644
--- a/src/main/java/com/mzl/flower/service/system/UserService.java
+++ b/src/main/java/com/mzl/flower/service/system/UserService.java
@@ -637,6 +637,7 @@
updateCustomerDTO.setUserId(user.getId());
updateCustomerDTO.setRegesterCode(dto.getIntevailCode());
//有效邀请码注册成功后赠送1天会员
+ updateCustomerDTO.setIsMember(false);
if (!customerService.checkCode(dto.getIntevailCode())) {
updateCustomerDTO.setIsMember(true);
updateCustomerDTO.setMemberOvertime(LocalDateTime.now().plusDays(1));
diff --git a/src/main/java/com/mzl/flower/web/login/CustomerLoginController.java b/src/main/java/com/mzl/flower/web/login/CustomerLoginController.java
index 7bf98ed..1894dd6 100644
--- a/src/main/java/com/mzl/flower/web/login/CustomerLoginController.java
+++ b/src/main/java/com/mzl/flower/web/login/CustomerLoginController.java
@@ -287,10 +287,11 @@
}
User user = userService.findByTel(tel, Constants.USER_TYPE.customer.name());
+ User user1 = null;
String tokenCache ="";
if(user == null){
loginDTO.setUserType(Constants.USER_TYPE.customer.name());
- User user1 = userService.registPhoneUser(loginDTO);
+ user1 = userService.registPhoneUser(loginDTO);
if(org.springframework.util.StringUtils.isEmpty(user1)){
throw new ValidationException("注册用户信息报错");
}
@@ -330,7 +331,11 @@
OAuth2AccessToken token = loginService.getAccessToken(authentication, Constants.USER_TYPE.customer.name());
//删除缓存中的验证码
stringCacheClient.delete(SMS_CODE_KEY + SEPARATOR + Constants.USER_TYPE.customer.name() + SEPARATOR + tel);
- stringCacheClient.set(TOKEN_KEY + SEPARATOR + user.getId(),token.getValue());
+ if(user == null){
+ stringCacheClient.set(TOKEN_KEY + SEPARATOR + user1.getId(),token.getValue());
+ }else {
+ stringCacheClient.set(TOKEN_KEY + SEPARATOR + user.getId(), token.getValue());
+ }
return returnData(R.SUCCESS.getCode(),token);
}catch (UsernameNotFoundException e){
throw new ValidationException("用户不存在");
--
Gitblit v1.9.3