From 4eef62727fe9ec08a26abe66f620ccdac26c1713 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 二月 2026 15:36:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index 7053f03..22acf2e 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -130,7 +130,7 @@
Integer onePushTime = xpTradingStrategy.getOnePushTime();
int count = onePushTime / 3;
// 第一轮推单
- processOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
+ processPushOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
//
// for (int i = 0; i < count; i++) {
@@ -172,22 +172,22 @@
// 第二轮推单
Integer twoPushTime = xpTradingStrategy.getTwoPushTime();
count = twoPushTime / 3;
- processOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
+ processPushOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
// 第三轮推单
Integer threePushTime = xpTradingStrategy.getThreePushTime();
count = threePushTime / 3;
- processOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
+ processPushOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
// 第四轮推单
Integer fourPushTime = xpTradingStrategy.getFourPushTime();
count = fourPushTime / 3;
- processOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
+ processPushOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
// 第五轮推单
Integer fivePushTime = xpTradingStrategy.getFivePushTime();
count = fivePushTime / 3;
- processOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
+ processPushOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
// 最终没找到车
redisService.popFirstElement(quoteName);
@@ -206,7 +206,7 @@
* @param orderNo 订单号
* @param xpTradingStrategy 规则
*/
- private void processOrder(String quoteName, int count, String uid, String[] split, String orderNo, XpTradingStrategy xpTradingStrategy, String distance, String duration, String planRule) {
+ private void processPushOrder(String quoteName, int count, String uid, String[] split, String orderNo, XpTradingStrategy xpTradingStrategy, String distance, String duration, String planRule) {
// 订单状态
R<XpOrder> xpOrderR = xpOrderClient.queryOrderByOrderNo(orderNo);
if (xpOrderR.getCode() != 200) {
@@ -586,6 +586,8 @@
addTaxiPassengerVo.setAppId("");
BaseVehicleUserDto baseVehicleUserDto = userVehicleClient.addTaxiPassenger(addTaxiPassengerVo);
if (baseVehicleUserDto.getCode() == 200) {
+
+ // TODO 下单
// 绑定成功 弹出这个队列第一个订单
redisService.popFirstElement(quoteName);
return;
--
Gitblit v1.7.1