From 002dad83de409449f2c356f33f54f13dbed28527 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 18:30:59 +0800
Subject: [PATCH] 骑手完成订单配送

---
 oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
index c35e3d6..5ce08d2 100644
--- a/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
+++ b/oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
@@ -2,6 +2,8 @@
 
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson2.JSONObject;
+import com.oying.modules.rider.domain.RiderInfo;
+import com.oying.modules.rider.service.RiderInfoService;
 import com.oying.modules.security.config.CaptchaConfig;
 import com.oying.modules.security.config.LoginProperties;
 import com.oying.modules.security.config.SecurityProperties;
@@ -67,6 +69,7 @@
     private final WeiXinService weiXinService;
     private final UserService userService;
     private final DictDetailService dictDetailService;
+    private final RiderInfoService riderInfoService;
 
     @Log("账号密码登录")
     @ApiOperation("账号密码登录")
@@ -274,6 +277,8 @@
         }
         // 获取用户信息
         JwtUserDto jwtUser = userDetailsService.loadUserByUsername(authUser.getUsername());
+        // 查询骑手信息
+        RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(jwtUser.getUser().getId());
         Authentication authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities());
         SecurityContextHolder.getContext().setAuthentication(authentication);
         // 生成令牌
@@ -282,6 +287,7 @@
         Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
             put("token", properties.getTokenStartWith() + token);
             put("user", jwtUser);
+            put("rider", riderInfo);
         }};
         if (loginProperties.isSingleLogin()) {
             // 踢掉之前已经登录的token

--
Gitblit v1.9.3