From 55ac5e29404dd2e74c77a604a63e4dd991a38bb0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 二月 2026 16:43:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java
index 18937d2..c61391c 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java
@@ -385,10 +385,12 @@
// 判断当天取消的次数 后台配置 redis 查询
Object cancelOrder = redisService.getCacheObject("CANCEL_ORDER_" + uid);
+ // 静默处理
+ boolean isSilent = false;
if (cancelOrder != null) {
Integer num = Integer.valueOf(cancelOrder.toString());
if (num >= cancelCount) {
- return 0l;
+ isSilent =true;
}
}
@@ -471,8 +473,7 @@
Integer distance = 0;
Integer duration = 0;
if (distanceAndDuration.getCode() != 200) {
- //静默处理
- return 0l;
+ throw new ServiceException("订单生成失败", I18nKeyConstant.ORDER_CREATE_FAIL);
}
distance = distanceAndDuration.getData().getDistance();
duration = distanceAndDuration.getData().getDuration();
@@ -484,6 +485,12 @@
throw new ServiceException("订单生成失败", I18nKeyConstant.ORDER_CREATE_FAIL);
}
Long orderId = addOrderR.getData();
+
+ // 静默处理 不推单
+ if(isSilent){
+ return orderId;
+ }
+
// 最大距离
Object maxPushDistanceObj = redisService.getCacheObject(CacheConstants.MAX_PUSH_DISTANCE);
Double maxPushDistance = 0.0;
--
Gitblit v1.7.1