From 15eb7bf63cc857f77329f00798277514d8bb6ee0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 20 三月 2026 11:56:57 +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 | 9 +++------
1 files changed, 3 insertions(+), 6 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 af181eb..3bfca24 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
@@ -716,7 +716,8 @@
this.lambdaUpdate().set(XpOrder::getStatus, 7)
.eq(XpOrder::getId, order.getId()).update();
-
+ //结束行程
+ endTrip(order.getId(), order.getAppUserId().toString());
// 消息推送
Map<String, Object> params = new HashMap<>();
Map<String, Object> content = new HashMap<>();
@@ -730,8 +731,6 @@
sendMessageDTO.setMessage(message);
sendMessageDTO.setAppUserId(String.valueOf(order.getAppUserId()));
xpPushMessageClient.sendStatus(sendMessageDTO);
- //结束行程
- endTrip(order.getId(), order.getAppUserId().toString());
log.info("运营人员取消订单成功，推送乘客消息完成");
log.info("订单关闭成功，订单ID: {}, 操作人: {}", order.getId(), SecurityUtils.getUsername());
}
@@ -1488,7 +1487,6 @@
// 远途费价格明细
List<FareBreakdownDetailVo> longDistance = new ArrayList<>();
XpOrder order = this.getById(orderId);
-
if (order == null) {
throw new RuntimeException("订单不存在");
}
@@ -1564,7 +1562,6 @@
xpOrderDetail.setOrderId(orderId);
xpOrderDetail.setType(1);
xpOrderDetail.setMoney(new BigDecimal(xpPricingCardVo.getDurationPrice()).setScale(2, RoundingMode.HALF_UP));
- xpOrderDetail.setDuration(duration1);
xpOrderDetails.add(xpOrderDetail);
BigDecimal totalPrice =BigDecimal.ZERO;
@@ -2320,7 +2317,7 @@
detail.setType(xpOrderDetail.getType());
detail.setTime(xpOrderDetail.getTime());
detail.setMileage(xpOrderDetail.getMileage());
- detail.setDuration(xpOrderDetail.getDuration()*60);
+ detail.setDuration((xpOrderDetail.getDuration() == null ? 0 : xpOrderDetail.getDuration())*60);
detail.setMoney(xpOrderDetail.getMoney());
if (xpOrderDetail.getDetailType() == 1) {
start.add(detail);
--
Gitblit v1.7.1