From bbd837a72bb9ec1bcef044624960345f98969a49 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 三月 2026 16:53:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 38 ++------------------------------------
1 files changed, 2 insertions(+), 36 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 9855061..9ebc1b9 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
@@ -941,23 +941,6 @@
}
XpVehicle newVehicle = vehicleResult.getData().get(0);
- // 5. 校验新车辆的运营状态
- // 车辆状态：1=待完善 2=待运营 3=保险/年检过期
- // 运营状态：1=运营中 2=维修中 3=已收车 4=车辆异常
- // 当前模式：1=接单 2=测试
- // 模式状态：1=开始接单/开始测试 2=停止接单/停止测试
- if (Objects.isNull(newVehicle.getStatus()) || newVehicle.getStatus() == 3) {
- throw new ServiceException("新车辆保险或年检已过期，无法接单", I18nKeyConstant.ORDER_REASSIGN_NEW_VEHICLE_STATUS_INVALID);
- }
- if (Objects.isNull(newVehicle.getOperatingStatus()) || newVehicle.getOperatingStatus() != 1) {
- throw new ServiceException("新车辆运营状态异常，无法接单", I18nKeyConstant.ORDER_REASSIGN_NEW_VEHICLE_OPERATING_STATUS_INVALID);
- }
- if (Objects.isNull(newVehicle.getAcceptOrTest()) || newVehicle.getAcceptOrTest() != 1) {
- throw new ServiceException("新车辆当前不在接单模式", I18nKeyConstant.ORDER_REASSIGN_NEW_VEHICLE_NOT_IN_ACCEPT_MODE);
- }
- if (Objects.isNull(newVehicle.getAcceptOrTestStatus()) || newVehicle.getAcceptOrTestStatus() != 1) {
- throw new ServiceException("新车辆未开始接单", I18nKeyConstant.ORDER_REASSIGN_NEW_VEHICLE_NOT_START_ACCEPT);
- }
if (Objects.isNull(newVehicle.getState()) || newVehicle.getState() != 0) {
throw new ServiceException("新车辆已接单，请重新选择", I18nKeyConstant.ORDER_REASSIGN_NEW_VEHICLE_NOT_FREE);
}
@@ -1417,15 +1400,6 @@
xpOrderCancelService.save(xpOrderCancel);
- // 设置当天的取消次数缓存
- Object cacheObject = redisService.getCacheObject("CANCEL_ORDER_" + uid);
- if (cacheObject == null) {
- redisService.setCacheCancelOrder("CANCEL_ORDER_" + uid, 1);
- } else {
- Integer i = Integer.valueOf(cacheObject.toString());
- redisService.setCacheCancelOrder("CANCEL_ORDER_" + uid, i + 1);
- }
-
// 移除mongo数据
xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());
@@ -1531,14 +1505,6 @@
// 移除mongo数据
xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());
- // 设置当天的取消次数缓存
- Object cacheObject = redisService.getCacheObject("CANCEL_ORDER_" + appUserId);
- if (cacheObject == null) {
- redisService.setCacheCancelOrder("CANCEL_ORDER_" + appUserId, 1);
- } else {
- Integer i = Integer.valueOf(cacheObject.toString());
- redisService.setCacheCancelOrder("CANCEL_ORDER_" + appUserId, i + 1);
- }
return order;
}
@@ -2666,7 +2632,7 @@
public void saveVehicleLocation(OrderTrajectory orderTrajectory) {
// 查询订单信息
Integer status = redisService.getCacheObject("ORDER_STATUS:" + orderTrajectory.getOrderId());
- if(status < 6){
+ if(status < 6 || status > 8){
return;
}
@@ -3008,7 +2974,7 @@
xpVehicleClient.updateVehicleById(vehicle1);
log.info("推单成功后的处理逻辑，车辆状态修改1 {}", vehicle.getPlateNumber());
- xpTestOrder.setVehicleId(null);
+ xpTestOrder.setStartTestPointId(null);
xpTestOrderService.updateById(xpTestOrder);
redisService.setCacheObject("ORDER_STATUS:" + xpTestOrder.getId(), 2, 24L, TimeUnit.HOURS);
}
--
Gitblit v1.7.1