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-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 de12c26..5ef65be 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
@@ -80,12 +80,19 @@
}
// 根据开通城市 获取定价
@GetMapping("/logan/inner/v1/getPricingByCid")
- public R<XpPricing> getPricingByCid(@RequestParam Long cityId) {
- XpPricing pricing = xpPricingService.lambdaQuery().eq(XpPricing::getCityId, cityId).last("limit 1").one();
+ public R<XpPricing> getPricingByCid(@RequestParam Long cityId,@RequestParam(required = false) String vehicleModelId) {
+ LambdaQueryWrapper<XpPricing> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(XpPricing::getCityId, cityId);
+ if(null != vehicleModelId){
+ queryWrapper.eq(XpPricing::getVehicleModel, vehicleModelId);
+ }
+ XpPricing pricing = xpPricingService.getOne(queryWrapper);
+
return R.ok(pricing);
}
+
@GetMapping("/base/v1/mini-program/pricing/rules/{openCityId}")
@XpClientCheck(checkToken = false, checkOtpToken = true)
@ApiOperation(value = "获取费用规则(弃用)", tags = {"小程序-根据开通城市获取费用规则(弃用)"}, response = String.class)
--
Gitblit v1.7.1