From d09e1c104aed44b4c2cc3c620ef28f4f5a2ec13a Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 12 二月 2026 21:47:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
index 781dea9..d0db54c 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -16,6 +16,7 @@
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.WebUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.order.mangodb.model.OrderTrajectory;
import com.xiaopeng.order.model.dto.XpOrderCommentDto;
import com.xiaopeng.order.model.dto.XpOrderPayDto;
import com.xiaopeng.order.model.exportExcel.XpOrderExportExcel;
@@ -366,6 +367,7 @@
String uid = request.getHeader("XP-Uid");
return xpOrderService.payment(dto,uid);
}
+
/**
* 订单评价
*/
@@ -382,8 +384,8 @@
/**
* 订单状态修改-车控消息推送我方调用（内部接口）
*/
- @PostMapping("/inner/v1/order/updateOrderStatus")
@ApiOperation(value = "订单状态推送修改")
+ @PostMapping("/inner/v1/order/updateOrderStatus")
public R<String> updateOrderStatus(@RequestParam Long orderId,
@RequestParam Integer status) {
return xpOrderService.updateOrderStatus(orderId,status);
@@ -393,10 +395,21 @@
* 业务流程-通过订单id查询车辆信息
*/
@ApiOperation(value = "通过订单id查询车辆信息", tags = {"小程序-业务流程"})
- @GetMapping("/api/v1/order/queryVehicleByOrderId")
+ @XpClientCheck(checkToken = false, checkOtpToken = true)
+ @GetMapping("/api/v1/mini-program/order/queryVehicleByOrderId")
public R<XpVehicle> queryVehicleByOrderId(@RequestParam Long orderId, HttpServletRequest request) {
String uid = request.getHeader("XP-Uid");
return R.ok(xpOrderService.queryVehicleByOrderId(orderId,uid));
}
+ /**
+ * 订单车辆定位实时存储-订单车辆定位实时存储（内部接口）
+ */
+ @ApiOperation(value = "订单车辆定位实时存储")
+ @PostMapping("/inner/v1/order/saveVehicleLocation")
+ public R<String> saveVehicleLocation(@RequestBody OrderTrajectory orderTrajectory) {
+ xpOrderService.saveVehicleLocation(orderTrajectory);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1