From 80fd77e1bcb47726e440b8a728838189cd39a56a Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 30 六月 2026 21:25:35 +0800
Subject: [PATCH] 跨城改派fix
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
index dba1b0e..6d87525 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
@@ -165,11 +165,20 @@
})
public ResultUtil respondReassign(String reassignIds, Integer responseType, HttpServletRequest request) {
try {
- Integer driverId = ShiroKit.getUser().getId();
+ Integer driverId = driverService.getUserIdFormRedis(request);
+ if (null == driverId) {
+ return ResultUtil.tokenErr();
+ }
+ if (ToolUtil.isEmpty(reassignIds)) {
+ return ResultUtil.success("改派ID不能为空", false);
+ }
+ if (responseType == null) {
+ return ResultUtil.success("响应类型不能为空", false);
+ }
return reassignService.respondReassignBatch(reassignIds, driverId, responseType);
} catch (Exception e) {
e.printStackTrace();
- return ResultUtil.error("操作失败");
+ return ResultUtil.success("操作失败", false);
}
}
@@ -186,7 +195,10 @@
})
public ResultUtil queryPendingReassigns(HttpServletRequest request) {
try {
- Integer driverId = ShiroKit.getUser().getId();
+ Integer driverId = driverService.getUserIdFormRedis(request);
+ if (null == driverId) {
+ return ResultUtil.tokenErr();
+ }
List<Map<String, Object>> list = reassignService.queryPendingReassigns(driverId);
return ResultUtil.success(list);
} catch (Exception e) {
--
Gitblit v1.7.1