From 799a3e13d61628b6a3b4b68e654efcc52ce2b897 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 13 三月 2026 14:32:57 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 1932c95..f913d8c 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
@@ -316,7 +316,7 @@
// 6. 获取评价信息
LambdaQueryWrapper<XpOrderEvaluate> evaluateWrapper = new LambdaQueryWrapper<>();
evaluateWrapper.eq(XpOrderEvaluate::getOrderId, id);
- XpOrderEvaluate evaluate = xpOrderEvaluateService.getOne(evaluateWrapper);
+ XpOrderEvaluate evaluate = xpOrderEvaluateService.getOne(evaluateWrapper.orderByDesc(XpOrderEvaluate::getCreateTime).last(" limit 0,1"));
if (Objects.nonNull(evaluate)) {
vo.setOrderRating(evaluate.getOrderRating());
}
@@ -642,7 +642,7 @@
orderCancel.setCancelReason("运营人员取消订单");
xpOrderCancelService.save(orderCancel);
//查询车辆信息
- R<XpVehicle> xpVehicleR = xpVehicleClient.queryById(order.getId());
+ R<XpVehicle> xpVehicleR = xpVehicleClient.queryById(order.getVehicleId());
if (xpVehicleR.getCode() == HttpStatus.SUCCESS && Objects.nonNull(xpVehicleR.getData())) {
XpVehicle xpVehicle = xpVehicleR.getData();
// 组装调用车机参数
--
Gitblit v1.7.1