From f5560820431163db68ccea4c850fb90a0eebf467 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 21:42:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 2dacc56..5e6e8fe 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
@@ -6,6 +6,8 @@
import com.xiaopeng.api.dto.map.RouteAndFareDto;
import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.feignClient.account.UserResourcesClient;
+import com.xiaopeng.api.feignClient.maintenance.XpVehicleModelClient;
+import com.xiaopeng.api.model.maintenance.XpVehicleModel;
import com.xiaopeng.api.model.operation.XpPricing;
import com.xiaopeng.api.model.operation.XpWhitelist;
import com.xiaopeng.api.vo.operation.RouteAndFareVo;
@@ -27,8 +29,11 @@
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.ArrayList;
+import java.util.List;
/**
* <p>
@@ -51,6 +56,9 @@
private final IXpWhitelistService xpWhitelistService;
private final XpOpenCityService xpOpenCityService;
private final ImageTagProcessor imageTagProcessor;
+
+ @Resource
+ private XpVehicleModelClient xpVehicleModelClient;
public XpPricingController(XpPricingService xpPricingService, IXpGeoQueryEntityService xpGeoQueryEntityService, UserResourcesClient userResourcesClient, IXpWhitelistService xpWhitelistService, XpRegionService xpRegionService, XpOpenCityService xpOpenCityService, ImageTagProcessor imageTagProcessor) {
this.xpPricingService = xpPricingService;
@@ -206,6 +214,11 @@
String cityName = xpOpenCityService.getNameWithCityName(pricing.getCityId());
pricing.setCityName(cityName);
+ R<List<XpVehicleModel>> listR = xpVehicleModelClient.listByIds(new ArrayList<String>(){{add(pricing.getVehicleModel());}});
+ if(listR != null && listR.getData() != null) {
+ XpVehicleModel xpVehicleModel = listR.getData().get(0);
+ pricing.setVehicleModelName(xpVehicleModel.getName());
+ }
String priceRule = pricing.getPriceRule();
if (priceRule != null && priceRule.contains("<img")) {
--
Gitblit v1.7.1