From 251bb514612312ab8f5de405fcad2c7889d5d43b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 二月 2026 18:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 a9422c2..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
@@ -736,8 +736,9 @@
cancelTaxiPassengerVo.setAppId("");
BaseVehicleUserDto baseVehicleUserDto = userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
- if (baseVehicleUserDto.getCode() != 200) {
- throw new RuntimeException("取消订单失败");
+ if (baseVehicleUserDto==null) {
+ // TODO 本地无法调通
+// throw new RuntimeException("取消订单失败");
}
baseMapper.updateById(order);
@@ -1439,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);
@@ -1639,7 +1645,7 @@
XpOrderDetailVO xpOrderDetailVO = new XpOrderDetailVO();
XpOrder xpOrder = this.baseMapper.selectOne(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getAppUserId, uid).in(XpOrder::getStatus, Arrays.asList(1,2,3, 4, 5, 6, 7, 8)).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1"));
if (xpOrder == null) {
- return xpOrderDetailVO;
+ return null;
}
BeanUtils.copyProperties(xpOrder, xpOrderDetailVO);
// 算时间
--
Gitblit v1.7.1