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-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPricingClient.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPricingClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPricingClient.java
index 622b285..723f877 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPricingClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPricingClient.java
@@ -17,18 +17,28 @@
     /**
      * 获取等待时间
      */
-    @PostMapping("/base/v1/mini-program/pricing/getWaitTime")
+    @PostMapping("/logan/inner/v1/pricing/getWaitTime")
     R<Integer> getWaitTime(@RequestBody LonLatDto dto);
 
     // 根据开通城市 获取定价
-    @GetMapping("/base/v1/mini-program/getPricingByCityId/{cityId}")
-     R<XpPricing> getPricingByCityId(@PathVariable("cityId")Long cityId);
+    @GetMapping("/logan/inner/v1/getPricingByCid")
+     R<XpPricing> getPricingByCid(@RequestParam Long cityId,@RequestParam(required = false) String vehicleModelId);
 
     /**
      * 保存XpGeoQueryEntity
      */
-    @PostMapping("/inner/saveXpGeoQueryEntity")
-    R<?> saveXpGeoQueryEntity(@RequestBody XpGeoQueryEntity xpGeoQueryEntity);
+    @PostMapping("/logan/inner/updateXpGeoQueryEntity")
+    R<?> updateXpGeoQueryEntity(@RequestParam String orderId);
+
+
+    /**
+     * 删除XpGeoQueryEntity
+     * @param orderId
+     * @return
+     */
+    @PostMapping("/logan/inner/deleteXpGeoQueryEntity")
+    R<?> deleteXpGeoQueryEntity(@RequestParam String orderId);
+
 
 
 }

--
Gitblit v1.7.1