From 1cf78d7b0e01a2d960ade3033658c0ab7fac8cd3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 二月 2026 11:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
index 6372ad1..3fb57aa 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
@@ -1,6 +1,7 @@
package com.xiaopeng.api.feignClient.order;
import com.xiaopeng.api.dto.order.GetOrderNumDto;
+import com.xiaopeng.api.dto.order.PopOrderDto;
import com.xiaopeng.api.dto.statistics.OrderStatisticsDTO;
import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
import com.xiaopeng.api.factory.order.XpOrderClientFallbackFactory;
@@ -34,7 +35,7 @@
* 查询是否有未支付订单 或 正在进行的订单
*/
@PostMapping("/inner/order/has-unpaid-order")
- R<Long> hasUnPaodOrder(String uid);
+ R<Long> hasUnPaodOrder(@RequestParam String uid);
/**
@@ -61,7 +62,7 @@
* @param orderId 订单id
*/
@PostMapping("/inner/order/cancelOrder")
- R<?> cancelOrder(String orderId);
+ R<?> cancelOrder(@RequestParam("orderId") String orderId);
/**
@@ -84,4 +85,29 @@
R<Integer> getOrderNum(@RequestBody GetOrderNumDto dto);
+ /**
+ * 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据
+ */
+ @PostMapping("/inner/order/popOrder")
+ R<?> popOrder(@RequestBody PopOrderDto dto);
+
+ /**
+ * 修改订单信息
+ *
+ * @param xpOrder 订单信息
+ */
+ @PostMapping("/inner/order/updateOrder")
+ R<?> updateOrder(@RequestBody XpOrder xpOrder);
+
+
+ /**
+ * 修改订单状态
+ * @param orderId
+ * @param status
+ * @return
+ */
+ @PostMapping("/inner/v1/order/updateOrderStatus")
+ R<String> updateOrderStatus(@RequestParam Long orderId,
+ @RequestParam Integer status);
+
}
--
Gitblit v1.7.1