From 7487034d93586e722e414fb29eb58febe57eb6fc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 12 二月 2026 16:39:24 +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 |    8 +++++++-
 1 files changed, 7 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 beba603..14e57ae 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
@@ -797,10 +797,16 @@
                         DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(5)),
                         cancelJobMaps
                 );
+                // 车辆到达上车点时间
+                xpOrder.setArrivalTime(LocalDateTime.now());
                 break;
             case 5:
                 // 删除定时任务job
                 QuartzManager.removeJob((OrderCancelJob.name + xpOrder.getId()).toUpperCase(), TimeJobType.ORDER_CANCEL);
+                break;
+            case 6:
+                // 行程开始时间
+                xpOrder.setTripBegin(LocalDateTime.now());
                 break;
             case 7:
                 // 查询自动结束行程时间
@@ -819,7 +825,7 @@
                 );
                 break;
         }
-        baseMapper.updateById(xpOrder);
+        this.updateById(xpOrder);
         return R.ok();
     }
 

--
Gitblit v1.7.1