From 833c3e247e2e0ce5a5dbf50cb15b8df9612534e1 Mon Sep 17 00:00:00 2001
From: weicw1996 <weicw1996@qq.com>
Date: Thu, 22 Oct 2026 14:19:06 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E5=BE=85=E5=9B=9E=E5=8D=95=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=EF=BC=9A=E8=B0=83=E5=BA=A6=E7=AB=AF=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E6=80=81=E8=90=BD=E8=BF=9B=E8=A1=8C=E4=B8=AD=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E8=BF=94=E5=9B=9E=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transport/service/impl/ManageWaybillServiceImpl.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java
index 0e303dcc..0f692983 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java
@@ -996,7 +996,9 @@ public class ManageWaybillServiceImpl implements IManageWaybillService {
 		}
 		return switch (businessStatus) {
 			case STATUS_PENDING, "waiting_dispatch", "dispatching" -> 0;
-			case STATUS_RUNNING -> 1;
+			// 与司机端 toAppStatus 同一份数字枚举（0 待接单 / 1 运输中 / 2 已完成 / 3 已取消），待回单确认属进行中：
+			// 两处对同一状态必须给同一个数字，给 null 前端只能落到「未知」兜底
+			case STATUS_RUNNING, WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM -> 1;
 			case STATUS_COMPLETED -> 2;
 			case STATUS_CANCELLED -> 3;
 			default -> null;