From 3086b140a8b34aecbda77dea75294025f6db2fd2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 01 三月 2026 04:20:25 +0800
Subject: [PATCH] 修改bug
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 14 ++++++++------
1 files changed, 8 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 c4df5b2..4e1e3fd 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
@@ -1988,8 +1988,9 @@
//乘客单处理逻辑
if(OrderType.USER_ORDER.equals(orderType)){
XpOrder order = this.getById(orderId);
+ Long appUserId = order.getAppUserId();
//订单为待接单状态
- if(order.getStatus() == 1){
+ if(order.getStatus() < 4){
AddTaxiPassengerVo addTaxiPassengerVo = new AddTaxiPassengerVo();
order.setAcceptanceTime(LocalDateTime.now());
R<XpVehicle> byVehicleVin = xpVehicleClient.findByVehicleVin(dto.getXpVehicleVin());
@@ -2010,7 +2011,6 @@
xpGeoQueryEntity.setOrderId(split[0]);
// 存mongo数据
xpPricingClient.updateXpGeoQueryEntity(split[0]);
- order.setAppUserId(null);
// 修改车辆信息
@@ -2018,18 +2018,19 @@
xpVehicleClient.updateVehicleById(vehicle);
//绑定用户和车辆关系
- addTaxiPassengerVo.setUid(order.getAppUserId().toString());
+ addTaxiPassengerVo.setUid(appUserId.toString());
+ order.setAppUserId(null);
this.updateById(order);
addTaxiPassengerVo.setOrderNo(order.getOrderNumber());
// TODO appid
addTaxiPassengerVo.setAppId("");
userVehicleClient.addTaxiPassenger(addTaxiPassengerVo);
//推送乘客车辆到达预约点的导航数据
- sendRoute(order.getAppUserId().toString(), orderId, "ORDER_NAVIGATION_START_DATA", dto.getXpVehicleVin());
+ sendRoute(appUserId.toString(), orderId, "ORDER_NAVIGATION_START_DATA", dto.getXpVehicleVin());
}else{
//推送行起点到终点的驶轨迹给乘客端
- sendRoute(order.getAppUserId().toString(), orderId, "ORDER_NAVIGATION_END_DATA", dto.getXpVehicleVin());
+ sendRoute(appUserId.toString(), orderId, "ORDER_NAVIGATION_END_DATA", dto.getXpVehicleVin());
}
}
}
@@ -2049,7 +2050,7 @@
jsonObject.put("type", "ORDER_ROUTE");
jsonObject.put("timestamp", System.currentTimeMillis());
JSONObject content = new JSONObject();
- content.put("orderId", orderId);
+ content.put("orderId", orderId.toString());
content.put("routeType", "ORDER_NAVIGATION_START_DATA".equals(keyStr) ? 1 : 2);
content.put("direction", null != vehiclePosition ? vehiclePosition.getCourse() : 90);
JSONObject route = new JSONObject();
@@ -2070,6 +2071,7 @@
SendMessageDTO messageDTO = new SendMessageDTO();
messageDTO.setAppUserId(appUserId);
messageDTO.setMessage(jsonObject.toJSONString());
+ System.err.println(messageDTO);
xpPushMessageClient.sendRoute(messageDTO);
}
}
--
Gitblit v1.7.1