From 00b60600a83190fd0660a6ccb0cab015904189de Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期一, 20 四月 2026 19:39:28 +0800
Subject: [PATCH] 1.定价管理 2.车辆管理 3.免密支付策略 4.站点异常上报情况
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java
index c8c251b..83d4ec8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java
@@ -13,9 +13,10 @@
import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.feignClient.account.XpAppUserClient;
import com.xiaopeng.api.feignClient.account.XpAppUserCouponClient;
+import com.xiaopeng.api.feignClient.maintenance.XpVehicleModelClient;
import com.xiaopeng.api.feignClient.map.XpMapClient;
import com.xiaopeng.api.feignClient.order.XpOrderClient;
-import com.xiaopeng.api.model.account.XpAppUser;
+import com.xiaopeng.api.model.maintenance.XpVehicleModel;
import com.xiaopeng.api.model.operation.*;
import com.xiaopeng.api.model.order.XpOrder;
import com.xiaopeng.api.vo.account.UserCouponVo;
@@ -33,14 +34,14 @@
import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.operation.constant.I18nKeyConstant;
import com.xiaopeng.operation.dto.*;
+import com.xiaopeng.operation.job.base.QuartzManager;
+import com.xiaopeng.operation.job.base.TimeJobType;
+import com.xiaopeng.operation.job.jobs.DynamicPricingCheckJob;
import com.xiaopeng.operation.mapper.*;
import com.xiaopeng.operation.query.PricingPageListQuery;
import com.xiaopeng.operation.service.IXpGeoQueryEntityService;
import com.xiaopeng.operation.service.XpPointService;
import com.xiaopeng.operation.service.XpPricingService;
-import com.xiaopeng.operation.job.base.QuartzManager;
-import com.xiaopeng.operation.job.base.TimeJobType;
-import com.xiaopeng.operation.job.jobs.DynamicPricingCheckJob;
import com.xiaopeng.operation.utils.XpPricingUtil;
import com.xiaopeng.operation.utils.holiday.HolidayUtil;
import com.xiaopeng.operation.utils.map.FastDistanceCalculator;
@@ -103,6 +104,8 @@
private XpElectronicFenceAreaMapper xpElectronicFenceAreaMapper;
+ @Resource
+ private XpVehicleModelClient xpVehicleModelClient;
@Resource
private XpWhitelistMapper xpWhitelistMapper;
@@ -680,6 +683,23 @@
Page<PricingPageListVO> page = this.baseMapper.pageList(pageInfo, query);
pageInfo.setRecords(page.getRecords());
pageInfo.setTotal(page.getTotal());
+ if(page.getRecords() != null){
+ Set<String> vehicleModelIds = page.getRecords().stream().map(PricingPageListVO::getVehicleModel).collect(Collectors.toSet());
+ R<List<XpVehicleModel>> listR = xpVehicleModelClient.listByIds(vehicleModelIds);
+ if(listR != null && listR.getData() != null){
+ List<XpVehicleModel> vehicleModels = listR.getData();
+ Map<String, XpVehicleModel> vehicleModelMap = new HashMap<>();
+ for (XpVehicleModel vehicleModel : vehicleModels) {
+ vehicleModelMap.put(vehicleModel.getId().toString(), vehicleModel);
+ }
+ for (PricingPageListVO record : page.getRecords()) {
+ XpVehicleModel xpVehicleModel = vehicleModelMap.get(record.getVehicleModel());
+ if(xpVehicleModel != null){
+ record.setVehicleModelName(xpVehicleModel.getName());
+ }
+ }
+ }
+ }
return pageInfo;
}
--
Gitblit v1.7.1