From 4eef62727fe9ec08a26abe66f620ccdac26c1713 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 二月 2026 15:36:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 4751eb9..21f7c33 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
@@ -187,7 +187,7 @@
routeAndFareDto.setRoutePlanRule(xpRoutePlan.getRoutePlanRule());
}
-// XpPricing xpPricing = this.baseMapper.selectOne(new LambdaQueryWrapper<XpPricing>().eq(XpPricing::getCityId, routeAndFareDto.getOpenCityId()));
+ XpPricing xpPricing = this.baseMapper.selectOne(new LambdaQueryWrapper<XpPricing>().eq(XpPricing::getCityId, routeAndFareDto.getOpenCityId()));
// if (xpPricing == null) {
// throw new ServiceException("当前区域未开通服务", I18nKeyConstant.NO_CURRENT_REGION);
// }
@@ -217,8 +217,8 @@
() -> {
// 优惠券
return xpAppUserCouponClient.getUserCoupon(
-// new GetUserCouponDto(Long.valueOf(userId), xpPricingCardVo.getTotalPrice())
- new GetUserCouponDto(Long.valueOf(userId), 1d)
+// new GetUserCouponDto(Long.valueOf(userId), xpPricingCardVo.getTotalPrice(),routeAndFareDto.getOpenCityId())
+ new GetUserCouponDto(Long.valueOf(userId), 1d,routeAndFareDto.getOpenCityId())
);
},
executorService
--
Gitblit v1.7.1