From c98d3f2fc620b3f5d699e2be34eaabc1033b42b2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 三月 2026 16:17:32 +0800
Subject: [PATCH] 修改巡游订单部分逻辑
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
index 240a5bd..3539e74 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
@@ -46,8 +46,8 @@
* @param
*/
@PostMapping("/inner/cruiseOrder/updateCruiseOrder")
- public R<String> updateCruiseOrder(@RequestParam String vin) {
- String id = xpCruiseOrderService.updateCruiseOrder(vin);
+ public R<Long> updateCruiseOrder(@RequestParam String vin) {
+ Long id = xpCruiseOrderService.updateCruiseOrder(vin);
return R.ok(id);
}
/**
@@ -56,9 +56,20 @@
* @param
*/
@PostMapping("/inner/cruiseOrder/closeCruiseOrder")
- public R<String> closeCruiseOrder(@RequestParam String vin) {
- String id = xpCruiseOrderService.closeCruiseOrder(vin);
+ public R<Long> closeCruiseOrder(@RequestParam String vin) {
+ Long id = xpCruiseOrderService.closeCruiseOrder(vin);
return R.ok(id);
+ }
+
+
+ /**
+ * 根据订单ID查询取消订单
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/inner/cruiseOrder/updateCruiseOrderId")
+ public R<Long> updateCruiseOrderId(@RequestParam Long orderId){
+ return xpCruiseOrderService.updateCruiseOrderId(orderId);
}
@@ -68,7 +79,7 @@
* @return
*/
@PostMapping("/inner/cruiseOrder/getCruiseOrder")
- public R<XpCruiseOrder> getCruiseOrder(@RequestParam String orderId){
+ public R<XpCruiseOrder> getCruiseOrder(@RequestParam Long orderId){
return R.ok(xpCruiseOrderService.getById(orderId));
}
@@ -80,8 +91,7 @@
* @return 订单ID
*/
@PostMapping("/inner/cruiseOrder/addCruiseOrder")
- public R<String> addCruiseOrder(@RequestBody XpCruiseOrder order) {
- order.setId("XU"+ IdUtil.fastUUID());
+ public R<Long> addCruiseOrder(@RequestBody XpCruiseOrder order) {
boolean save = xpCruiseOrderService.save(order);
if (!save) {
return R.fail("新增失败");
@@ -90,7 +100,7 @@
// 下发命令
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(order.getVehicleVin());
- pushOrderDto.setOrderId(order.getId());
+ pushOrderDto.setOrderId("XU" + order.getId());
pushOrderDto.setStartLatitude(order.getStartLat());
pushOrderDto.setStartLongitude(order.getStartLon());
pushOrderDto.setEndLatitude(order.getEndLat());
--
Gitblit v1.7.1