From d34f7d100d6b7036a7a1c44757bf5df0f4b0ca1f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 01 三月 2026 02:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 5a7e231..f2c65df 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
@@ -1033,6 +1033,7 @@
throw new ServiceException("订单不存在",I18nKeyConstant.ORDER_NOT_EXISTS);
}
order.setStatus(0);
+ order.setAppUserId(null);
baseMapper.updateById(order);
XpOrderCancel xpOrderCancel = new XpOrderCancel();
xpOrderCancel.setOrderId(Long.valueOf(orderId));
@@ -2009,7 +2010,7 @@
// 存mongo数据
xpPricingClient.updateXpGeoQueryEntity(split[0]);
order.setAppUserId(null);
- this.updateById(order);
+
// 修改车辆信息
vehicle.setState(1);
@@ -2017,6 +2018,8 @@
//绑定用户和车辆关系
addTaxiPassengerVo.setUid(order.getAppUserId().toString());
+
+ this.updateById(order);
addTaxiPassengerVo.setOrderNo(order.getOrderNumber());
// TODO appid
addTaxiPassengerVo.setAppId("");
--
Gitblit v1.7.1