From d3ad9cf606f8719a9e7ea1cd580fbd38c5441ae6 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 12 二月 2026 16:39:49 +0800
Subject: [PATCH] fix:代码合并报错
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpOrderClientFallbackFactory.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpOrderClientFallbackFactory.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpOrderClientFallbackFactory.java
index 54580f1..bda321b 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpOrderClientFallbackFactory.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpOrderClientFallbackFactory.java
@@ -1,5 +1,6 @@
package com.xiaopeng.api.factory.order;
+import com.xiaopeng.api.dto.order.GetOrderNumDto;
import com.xiaopeng.api.dto.statistics.OrderStatisticsDTO;
import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
import com.xiaopeng.api.feignClient.order.XpOrderClient;
@@ -69,9 +70,8 @@
}
@Override
- public R<Integer> getOrderNum(String timeStr) {
- log.error("获取订单数量失败，原因: {}", cause.getMessage());
- return R.fail();
+ public R<Integer> getOrderNum(GetOrderNumDto dto) {
+ return null;
}
};
}
--
Gitblit v1.7.1