From 80f6c17c34dae2c5f9f861e274f4e8d5e2394d5c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 二月 2026 18:00:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java
index 2b7e120..0bf296d 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java
@@ -20,9 +20,7 @@
import com.xiaopeng.operation.dto.PricingSetRuleDTO;
import com.xiaopeng.operation.dto.XpOrderDto;
import com.xiaopeng.operation.query.PricingPageListQuery;
-import com.xiaopeng.operation.service.IXpGeoQueryEntityService;
-import com.xiaopeng.operation.service.IXpWhitelistService;
-import com.xiaopeng.operation.service.XpPricingService;
+import com.xiaopeng.operation.service.*;
import com.xiaopeng.operation.vo.PricingPageListVO;
import com.xiaopeng.operation.vo.SaveOrderVo;
import com.xiaopeng.unifiedverification.interceptor.XpClientCheck;
@@ -54,13 +52,14 @@
private final IXpGeoQueryEntityService xpGeoQueryEntityService;
private final UserResourcesClient userResourcesClient;
private final IXpWhitelistService xpWhitelistService;
+ private final XpOpenCityService xpOpenCityService;
-
- public XpPricingController(XpPricingService xpPricingService, IXpGeoQueryEntityService xpGeoQueryEntityService, UserResourcesClient userResourcesClient, IXpWhitelistService xpWhitelistService) {
+ public XpPricingController(XpPricingService xpPricingService, IXpGeoQueryEntityService xpGeoQueryEntityService, UserResourcesClient userResourcesClient, IXpWhitelistService xpWhitelistService, XpRegionService xpRegionService, XpOpenCityService xpOpenCityService) {
this.xpPricingService = xpPricingService;
this.xpGeoQueryEntityService = xpGeoQueryEntityService;
this.userResourcesClient = userResourcesClient;
this.xpWhitelistService = xpWhitelistService;
+ this.xpOpenCityService = xpOpenCityService;
}
@@ -174,6 +173,9 @@
if (pricing == null) {
throw new ServiceException("定价不存在", I18nKeyConstant.PRICING_NOT_EXIST);
}
+ //获取城市信息
+ String cityName = xpOpenCityService.getNameWithCityName(pricing.getCityId());
+ pricing.setCityName(cityName);
return R.ok(pricing);
}
--
Gitblit v1.7.1