From 3858fa1d34d269865551465dc6667b3bcd86fd6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 17 四月 2026 11:48:49 +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 | 3 ++-
1 files changed, 2 insertions(+), 1 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 5ef65be..2e4f9ff 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,8 +80,9 @@
}
// 根据开通城市 获取定价
@GetMapping("/logan/inner/v1/getPricingByCid")
- public R<XpPricing> getPricingByCid(@RequestParam Long cityId,@RequestParam(required = false) String vehicleModelId) {
+ public R<XpPricing> getPricingByCid(@RequestParam("cityId") Long cityId,@RequestParam(value = "vehicleModelId", required = false) String vehicleModelId) {
LambdaQueryWrapper<XpPricing> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(XpPricing::getDeleted, 0);
queryWrapper.eq(XpPricing::getCityId, cityId);
if(null != vehicleModelId){
queryWrapper.eq(XpPricing::getVehicleModel, vehicleModelId);
--
Gitblit v1.7.1