From 3896cbb9ed6fa03d90a4032238dad7b2f39c607c Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 24 三月 2026 20:23:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 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 9a311bb..ea3d41d 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
@@ -85,10 +85,7 @@
import com.xiaopeng.order.model.query.XpOrderExcelQuery;
import com.xiaopeng.order.model.query.XpOrderPageQuery;
import com.xiaopeng.order.model.vo.*;
-import com.xiaopeng.order.service.IXpOrderCancelService;
-import com.xiaopeng.order.service.IXpOrderEvaluateService;
-import com.xiaopeng.order.service.IXpOrderReassignService;
-import com.xiaopeng.order.service.IXpOrderService;
+import com.xiaopeng.order.service.*;
import com.xiaopeng.order.utils.GDMapGeocodingUtil;
import com.xiaopeng.order.utils.TaxiPricingDemoService;
import com.xiaopeng.order.utils.RegionCodeFilterUtil;
@@ -159,6 +156,7 @@
private final XpPricingUtil xpPricingUtil;
private final GDMapGeocodingUtil gdMapGeocodingUtil;
private final VehicleBuriedPointClient vehicleBuriedPointClient;
+ private final IXpTestOrderService xpTestOrderService;
@Autowired
@@ -2199,9 +2197,11 @@
xpVehicleClient.updateVehicleById(vehicle1);
//找到车辆的收车点位 更新终点点位
R<XpCruiseOrder> returnCruisePoint = xpCruisePlanClient.findReturnCruisePoint(xpCruiseOrder);
- xpCruiseOrder = returnCruisePoint.getData();
- xpCruiseOrder.setOrderType(2);
- xpCruiseOrder.setOrderReverse(1);
+ if(200 != returnCruisePoint.getCode()){
+ xpCruiseOrder = returnCruisePoint.getData();
+ xpCruiseOrder.setOrderType(2);
+ xpCruiseOrder.setOrderReverse(1);
+ }
}
}
xpCruiseOrderMapper.insert(xpCruiseOrder);
@@ -2311,9 +2311,11 @@
xpVehicleClient.updateVehicleById(vehicle1);
//找到车辆的收车点位 更新终点点位
R<XpCruiseOrder> returnCruisePoint = xpCruisePlanClient.findReturnCruisePoint(xpCruiseOrder);
- xpCruiseOrder = returnCruisePoint.getData();
- xpCruiseOrder.setOrderType(2);
- xpCruiseOrder.setOrderReverse(1);
+ if(200 != returnCruisePoint.getCode()){
+ xpCruiseOrder = returnCruisePoint.getData();
+ xpCruiseOrder.setOrderType(2);
+ xpCruiseOrder.setOrderReverse(1);
+ }
}
}
@@ -2974,6 +2976,32 @@
}
}
+ //测试订单
+ if (OrderType.TEST_ORDER.equals(orderType)) {
+ XpTestOrder xpTestOrder = xpTestOrderService.getById(orderId);
+ //订单为待接单状态
+ if (xpTestOrder.getStatus() < 4) {
+ xpTestOrder.setAcceptanceTime(LocalDateTime.now());
+ R<XpVehicle> byVehicleVin = xpVehicleClient.findByVehicleVin(dto.getXpVehicleVin());
+ XpVehicle vehicle = null;
+ if (byVehicleVin.getCode() == 200) {
+ vehicle = byVehicleVin.getData();
+ xpTestOrder.setVehicleId(vehicle.getId());
+ xpTestOrder.setFleetId(vehicle.getFleetId());
+ }
+ xpTestOrder.setStatus(2);
+
+ // 修改车辆信息
+ XpVehicle vehicle1 = new XpVehicle();
+ vehicle1.setId(vehicle.getId());
+ vehicle1.setState(1);
+ xpVehicleClient.updateVehicleById(vehicle1);
+
+ xpTestOrder.setVehicleId(null);
+ xpTestOrderService.updateById(xpTestOrder);
+ redisService.setCacheObject("ORDER_STATUS:" + xpTestOrder.getId(), 2, 24L, TimeUnit.HOURS);
+ }
+ }
}
--
Gitblit v1.7.1