From 0052bdb801a73b91770f6352f1a12ec5b101a8f1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 24 二月 2026 18:18:08 +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 |    5 +++++
 1 files changed, 5 insertions(+), 0 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 7195162..656f09a 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
@@ -1440,6 +1440,11 @@
         res.setKilometer(BigDecimal.valueOf(order.getMileageKilometers()));
         LocalDateTime createTime = order.getCreateTime();
         LocalDateTime tripEnd = order.getTripEnd();
+        if (tripEnd==null){
+            tripEnd = LocalDateTime.now();
+            order.setTripEnd(tripEnd);
+            this.updateById(order);
+        }
         // 计算行程时间 单位分钟
         // 计算时间差
         Duration durationBetween = Duration.between(createTime, tripEnd);

--
Gitblit v1.7.1