From 46342ddcf5d52ccbf2ae8d8a9a0b14cc0d29b250 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 四月 2026 22:14:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 b399139..5d2f7e6 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
@@ -51,6 +51,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -79,7 +80,7 @@
private final RedisService redisService;
@Autowired
private MongoTemplate mongoTemplate;
- @Autowired
+ @Resource
private XpVehicleClient xpVehicleClient;
/**
@@ -106,7 +107,7 @@
if (!list.isEmpty()) {
return R.ok(list.get(0).getId());
}
- return R.ok(0l);
+ return R.ok(0L);
}
@@ -391,6 +392,17 @@
return R.ok(xpOrderService.getActiveOrder(uid));
}
+ /**
+ * 获取正在进行中的订单_行程管理
+ */
+ @ApiOperation(value = "获取正在进行中的订单_行程管理", tags = {"小程序-获取正在进行中的订单_行程管理"})
+ @GetMapping("/api/v1/mini-program/order/active_itineraryManage")
+ @XpClientCheck(checkToken = false, checkOtpToken = true)
+ public R<XpOrderDetailVO> getActiveOrder_itineraryManage(HttpServletRequest request) {
+ // uid已通过拦截器otp校验，可以直接使用
+ String uid = request.getHeader("XP-Uid");
+ return R.ok(xpOrderService.getActiveOrder_itineraryManage(uid));
+ }
/**
* 查询历史订单列表
@@ -421,7 +433,6 @@
* +
* 取消订单
*/
-
@PutMapping("/api/v1/mini-program/order/cancel/{orderId}")
@ApiOperation(value = "取消订单", tags = {"小程序-取消订单"})
@XpClientCheck(checkToken = false, checkOtpToken = true)
@@ -555,6 +566,9 @@
@PostMapping("/api/v1/mini-program/order/queryOrderRoute")
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R<RouteVo> queryOrderRoute(@Validated @RequestBody QueryOrderRouteDTO dto, HttpServletRequest request) {
+ if(dto.getOrderId() == null){
+ return R.fail("参数不能为空");
+ }
String uid = request.getHeader("XP-Uid");
// 查询订单信息
XpOrder xpOrder = xpOrderService.getById(dto.getOrderId());
@@ -584,7 +598,9 @@
@GetMapping("/api/v1/mini-program/order/queryOrderTrajectory")
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R<RouteVo> queryOrderTrajectory(@RequestParam String orderId, HttpServletRequest request) {
- String uid = request.getHeader("XP-Uid");
+ if(orderId == null){
+ return R.fail("参数不能为空");
+ }
List<OrderTrajectory> trajectories = mongoTemplate.find(
new Query(Criteria.where("orderId").is(Long.valueOf(orderId)))
.with(Sort.by(Sort.Direction.ASC, "locatetime")),
@@ -621,4 +637,7 @@
return R.ok((int)count);
}
+
+
+
}
--
Gitblit v1.7.1