From c680680e6351e1160671d6cd69c3e6b568259bba Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 13 二月 2026 17:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 8 ++++++--
1 files changed, 6 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 4971207..fdfcc32 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
@@ -1687,12 +1687,16 @@
XpOrder order = this.getById(dto.getOrderId());
order.setAcceptanceTime(LocalDateTime.now());
- order.setVehicleId(dto.getXpVehicleId());
+
+ R<XpVehicle> byVehicleVin = xpVehicleClient.findByVehicleVin(dto.getXpVehicleVin());
+ if (byVehicleVin.getCode()==200){
+ order.setVehicleId(byVehicleVin.getData().getId());
+ }
order.setStatus(2);
// Redis弹出这个队列元素
// value 订单Id_经纬度_状态_用户id_订单编号_距离_时间
- String popFirstElement = redisService.popFirstElement(dto.getQueueName());
+ String popFirstElement = redisService.popFirstElement(order.getQueueName());
XpGeoQueryEntity xpGeoQueryEntity = new XpGeoQueryEntity();
String[] split = popFirstElement.split("_");
xpGeoQueryEntity.setOrderId(split[0]);
--
Gitblit v1.7.1