From d2f7d6aed0009e94c5d1b57a393738b1a21a45aa Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Thu, 22 Oct 2026 14:15:33 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=BE=85=E5=9B=9E=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=EF=BC=9A=E5=8F=B8=E6=9C=BA=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E4=B8=8E=E8=B0=83=E5=BA=A6=E7=AB=AF=E8=AF=A6=E6=83=85/?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E4=B8=8B=E5=8F=91=E5=8E=9F=E5=A7=8B=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/transport/pojo/vo/AdminWaybillCardVO.java | 3 +++ .../springblade/transport/pojo/vo/AdminWaybillDetailVO.java | 3 +++ .../org/springblade/transport/pojo/vo/DriverWaybillCardVO.java | 3 +++ .../transport/service/impl/DriverWaybillServiceImpl.java | 1 + .../transport/service/impl/ManageWaybillServiceImpl.java | 2 ++ 5 files changed, 12 insertions(+) diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillCardVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillCardVO.java index b0dca1a4..aa0dbfb5 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillCardVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillCardVO.java @@ -65,6 +65,9 @@ public class AdminWaybillCardVO implements Serializable { @Schema(description = "状态：0待接单/1运输中/2已完成/3已取消") private Integer status; + @Schema(description = "原始业务状态：pending / running / pending_return_confirm / completed / cancelled") + private String businessStatus; + @Schema(description = "承运方") private String carrierName; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillDetailVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillDetailVO.java index ff601f14..e874df68 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillDetailVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillDetailVO.java @@ -48,6 +48,9 @@ public class AdminWaybillDetailVO implements Serializable { @Schema(description = "状态：0待接单/1运输中/2已完成/3已取消") private Integer status; + @Schema(description = "原始业务状态：pending / running / pending_return_confirm / completed / cancelled") + private String businessStatus; + @Schema(description = "起点名称") private String fromName; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java index 23432c6a..a4be3625 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java @@ -76,6 +76,9 @@ public class DriverWaybillCardVO implements Serializable { @Schema(description = "状态：0待接单/1运输中/2已完成/3已取消") private Integer status; + @Schema(description = "原始业务状态：pending / running / pending_return_confirm / completed / cancelled") + private String businessStatus; + @Schema(description = "创建时间") private String createTime; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java index d2369c3f..4348f65b 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java @@ -1011,6 +1011,7 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService { WaybillCargoSupport.Quantity weighing = WaybillCargoSupport.weighing(cargos); card.setWeight(weighing == null ? "" : formatWeight(weighing.value(), weighing.unit())); card.setStatus(toAppStatus(waybill.getBusinessStatus())); + card.setBusinessStatus(waybill.getBusinessStatus()); String createTime = formatDateTime(waybill.getCreateTime()); card.setCreateTime(createTime); card.setPublishTime(createTime); 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 4b1e5c93..0e303dcc 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 @@ -744,6 +744,7 @@ public class ManageWaybillServiceImpl implements IManageWaybillService { detail.setId(waybill.getId()); detail.setWaybillNo(waybill.getWaybillNo()); detail.setStatus(toAppStatus(waybill.getBusinessStatus())); + detail.setBusinessStatus(waybill.getBusinessStatus()); String mode = Func.toStr(waybill.getTransportType(), ""); detail.setTransportMode(mode); @@ -937,6 +938,7 @@ public class ManageWaybillServiceImpl implements IManageWaybillService { card.setPlanTime(formatLocalDate(waybill.getEstimatedStartTime())); card.setPlanTimeEnd(formatLocalDate(waybill.getEstimatedEndTime())); card.setStatus(toAppStatus(waybill.getBusinessStatus())); + card.setBusinessStatus(waybill.getBusinessStatus()); card.setCarrierName(Func.toStr(waybill.getCarrierName(), "")); card.setDriverName(Func.toStr(waybill.getDriverName(), "")); card.setVehicleNo(Func.toStr(waybill.getVehicleNo(), ""));