From da5cf3d82ea1044c338513147b0078be031465a0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 20 五月 2026 14:54:10 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java |    7 +------
 1 files changed, 1 insertions(+), 6 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 201b275..39375a7 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
@@ -1007,13 +1007,8 @@
     @GetMapping("/api/v1/mini-program/order/queryOrderStatusFromOrderId")
     @XpClientCheck(checkToken = false, checkOtpToken = true)
     public R<OrderStatusFromOrderIdVo> queryOrderStatusFromOrderId(Long orderId) {
-        XpOrder order = xpOrderService.getById(orderId);
-        OrderStatusFromOrderIdVo orderStatusFromOrderIdVo = new OrderStatusFromOrderIdVo();
-        orderStatusFromOrderIdVo.setOrderId(order.getId());
-        orderStatusFromOrderIdVo.setStatus(order.getStatus());
-        return R.ok(orderStatusFromOrderIdVo);
 
-    }
+        return R.ok( xpOrderService.queryOrderStatusFromOrderId(orderId));
 
 
     /**

--
Gitblit v1.7.1