From c3a64bc05db01c673274ced3f9879717f19b1ab2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 三月 2026 23:41:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 8aeb326..cf6c106 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -530,7 +530,7 @@
//取消订单：在未接到乘客前都可以，关闭订单，在送达目的地可以操作关闭
if (type == 1) {
// 取消订单：只有待接单(1)、待出发(2)、接驾中(3)状态可以取消
- if (currentStatus != 1 && currentStatus != 2 && currentStatus != 3) {
+ if (currentStatus != 1 && currentStatus != 2 && currentStatus != 3 && currentStatus != 4) {
throw new ServiceException("当前订单状态不允许取消，只有待接单、待出发、接驾中状态的订单可以取消", I18nKeyConstant.ORDER_CANCEL_FAILED);
}
} else {
@@ -1017,6 +1017,14 @@
List<XpHistoryStartPointsVo> data = r.getData();
for (XpHistoryStartPointsVo datum : data) {
+
+ if(datum.getOperationStatus()==2){
+ datum.setOperationStatus(1);
+ }
+
+
+
+
// 保留2位数小数
Double distance = datum.getDistance();
datum.setDistance(BigDecimal.valueOf(distance).setScale(2, RoundingMode.HALF_UP).doubleValue());
--
Gitblit v1.7.1