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-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java
index 26e0921..0c129bd 100644
--- a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java
+++ b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java
@@ -7,6 +7,7 @@
 import com.xiaopeng.api.dto.map.RoutePreferenceSaveDto;
 import com.xiaopeng.api.dto.map.RouteStaleCheckDto;
 import com.xiaopeng.api.dto.map.SelectNavigationRouteDto;
+import com.xiaopeng.api.dto.order.OrderChangeDto;
 import com.xiaopeng.api.model.order.XpOrder;
 import com.xiaopeng.api.vo.operation.MultiRouteAndFareVo;
 import com.xiaopeng.api.vo.operation.RoutePreferenceItemVo;
@@ -18,6 +19,7 @@
 import com.xiaopeng.common.core.web.controller.BaseController;
 import com.xiaopeng.common.redis.service.RedisService;
 import com.xiaopeng.itinerary.dto.XpOrderDto;
+import com.xiaopeng.itinerary.service.ActiveOrderService;
 import com.xiaopeng.itinerary.service.IXpGeoQueryEntityService;
 import com.xiaopeng.itinerary.service.XpPricingService;
 import com.xiaopeng.api.vo.HotFixInfoVo;
@@ -31,6 +33,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.List;
@@ -137,6 +140,10 @@
         return R.ok(saveOrderVo);
     }
 
+
+
+
+
     /**
      * 获取热修复信息
      * @param

--
Gitblit v1.7.1