From 3715c959d4cf14593c5511a8d9ae13360a6b91bf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 二月 2026 19:46:07 +0800
Subject: [PATCH] bug修改
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 57b6459..1a07002 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
@@ -1178,16 +1178,19 @@
for (XpOrderDetail xpOrderDetail : xpOrderDetails) {
xpOrderDetailMapper.insert(xpOrderDetail);
}
- for (FareBreakdownDetailVo fareBreakdownDetailVo : duration) {
- order.setDurationType(fareBreakdownDetailVo.getType());
- order.setDurationMoney(fareBreakdownDetailVo.getMoney());
- order.setDuration(Double.parseDouble(fareBreakdownDetailVo.getDuration() + ""));
+ for (XpOrderDetail xpOrderDetail : xpOrderDetails) {
+ if (xpOrderDetail.getDetailType() == 1){
+ order.setDurationType(xpOrderDetail.getType());
+ order.setDurationMoney(xpOrderDetail.getMoney());
+ order.setDuration(Double.parseDouble(xpOrderDetail.getDuration() + ""));
+ }else{
+ order.setLongDistanceType(order.getDurationType());
+ order.setLongDistance(xpOrderDetail.getMileage().doubleValue());
+ order.setLongDistancemoney(xpOrderDetail.getMoney());
+ }
+
}
- for (FareBreakdownDetailVo fareBreakdownDetailVo : longDistance) {
- order.setLongDistanceType(fareBreakdownDetailVo.getType());
- order.setLongDistance(fareBreakdownDetailVo.getMileage().doubleValue());
- order.setLongDistancemoney(fareBreakdownDetailVo.getMoney());
- }
+
BigDecimal orderMoney = startMoney.add(mileageMoney).add(order.getDurationMoney() != null ? order.getDurationMoney() : BigDecimal.ZERO)
.add(order.getLongDistancemoney() != null ? order.getLongDistancemoney() : BigDecimal.ZERO)
.add(order.getWaitMoney()!=null?order.getWaitMoney():BigDecimal.ZERO);
@@ -1478,7 +1481,7 @@
detail.setTime(xpOrderDetail.getTime());
detail.setMileage(xpOrderDetail.getMileage());
detail.setDuration(xpOrderDetail.getDuration());
- if (xpOrderDetail.getType() == 1){
+ if (xpOrderDetail.getDetailType() == 1){
start.add(detail);
}else{
mileage.add(detail);
@@ -1490,6 +1493,7 @@
durationDetail.setType(order.getDurationType());
durationDetail.setDuration(order.getDuration());
durationDetail.setMoney(order.getDurationMoney());
+ duration.add(durationDetail);
}
List<FareBreakdownDetailVo> longDistance = new ArrayList<>();
@@ -1531,6 +1535,7 @@
// mvp版本不做支付 使用优惠券抵扣为0元订单处理 处理订单状态即可
XpOrder order = this.getById(dto.getOrderId());
order.setStatus(9);
+ order.setAppUserId(null);
baseMapper.updateById(order);
return R.ok();
}
--
Gitblit v1.7.1