From 1e139141c1ca4124f40383f9c426da9c2c23342b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 二月 2026 16:16:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 9eff39c..781dea9 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
@@ -4,9 +4,11 @@
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.model.order.XpOrder;
+import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
import com.xiaopeng.api.vo.order.FareBreakdownVo;
import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo;
import com.xiaopeng.api.vo.order.XpHistoryStartPointsVo;
@@ -100,6 +102,16 @@
@PostMapping("/inner/order/queryOrderByOrderNo")
public R<XpOrder> queryOrderByOrderNo(@RequestParam String orderNo){
return R.ok(xpOrderService.getOne(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getOrderNumber, orderNo)));
+ }
+
+ /**
+ * 获取订单数量
+ *
+ * @return 订单数量
+ */
+ @PostMapping("/inner/order/getOrderNum")
+ public R<Integer> getOrderNum(@RequestBody GetOrderNumDto dto){
+ return R.ok(xpOrderService.getOrderNum(dto));
}
/**
@@ -377,5 +389,14 @@
return xpOrderService.updateOrderStatus(orderId,status);
}
+ /**
+ * 业务流程-通过订单id查询车辆信息
+ */
+ @ApiOperation(value = "通过订单id查询车辆信息", tags = {"小程序-业务流程"})
+ @GetMapping("/api/v1/order/queryVehicleByOrderId")
+ public R<XpVehicle> queryVehicleByOrderId(@RequestParam Long orderId, HttpServletRequest request) {
+ String uid = request.getHeader("XP-Uid");
+ return R.ok(xpOrderService.queryVehicleByOrderId(orderId,uid));
+ }
}
--
Gitblit v1.7.1