From 8832646742aff7d8ad37471f41350cd8950caf67 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 20 十二月 2025 17:22:03 +0800
Subject: [PATCH] 小程序订单我的订单
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 638e95d..ee93cd1 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TAppUserResp;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.core.redis.RedisCache;
@@ -23,6 +24,7 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TAppUserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.AuthenticationManager;
@@ -199,13 +201,19 @@
throw new UserNotExistsException();
}
// 用户验证
- TAppUser user = tAppUserService.getOne(Wrappers.<TAppUser>lambdaQuery().eq(TAppUser::getPhone,username));
+ TAppUser user = tAppUserService.getOne(Wrappers.<TAppUser>lambdaQuery().eq(TAppUser::getPhone,username).ne(TAppUser::getStatus,3));
if (StringUtils.isNull(user)){
- log.info("登录用户：{} 不存在.", username);
- throw new ServiceException(MessageUtils.message("user.not.exists"));
- } else if (user.getStatus().equals(3)) {
- log.info("登录用户：{} 已被删除.", username);
- throw new ServiceException(MessageUtils.message("user.password.delete"));
+ log.info("登录用户：{} 不存在.创建一个新用户", username);
+ user = new TAppUser();
+ user.setPhone(username);
+ user.setStatus(1);
+ tAppUserService.save(user);
+ // throw new ServiceException(MessageUtils.message("user.not.exists"));
+ } else {
+ if (user.getStatus().equals(2)) {
+ log.info("登录用户：{} 已被停用.", username);
+ throw new ServiceException(MessageUtils.message("user.blocked"));
+ }
}
if ("test".equals(env) || "dev".equals(env)) {
if (!code.equals("111111")) {
@@ -224,6 +232,9 @@
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUserApplet loginUser = new LoginUserApplet(user.getId(), null, null, null);
recordAppLoginInfo(loginUser.getUserId().toString());
+ TAppUserResp sysUserResp = new TAppUserResp();
+ BeanUtils.copyProperties(user, sysUserResp);
+ loginUser.setUser(sysUserResp);
// 生成token
return loginUser;
}
--
Gitblit v1.7.1