From 76660dd82cc2a5c090391680a38022c82140fad6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 二月 2026 18:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 2b7e120..a66eae5 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
@@ -15,14 +15,9 @@
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.constant.I18nKeyConstant;
-import com.xiaopeng.operation.dto.PricingAddDTO;
-import com.xiaopeng.operation.dto.PricingSetPriceDTO;
-import com.xiaopeng.operation.dto.PricingSetRuleDTO;
-import com.xiaopeng.operation.dto.XpOrderDto;
+import com.xiaopeng.operation.dto.*;
import com.xiaopeng.operation.query.PricingPageListQuery;
-import com.xiaopeng.operation.service.IXpGeoQueryEntityService;
-import com.xiaopeng.operation.service.IXpWhitelistService;
-import com.xiaopeng.operation.service.XpPricingService;
+import com.xiaopeng.operation.service.*;
import com.xiaopeng.operation.vo.PricingPageListVO;
import com.xiaopeng.operation.vo.SaveOrderVo;
import com.xiaopeng.unifiedverification.interceptor.XpClientCheck;
@@ -54,13 +49,14 @@
private final IXpGeoQueryEntityService xpGeoQueryEntityService;
private final UserResourcesClient userResourcesClient;
private final IXpWhitelistService xpWhitelistService;
+ private final XpOpenCityService xpOpenCityService;
-
- public XpPricingController(XpPricingService xpPricingService, IXpGeoQueryEntityService xpGeoQueryEntityService, UserResourcesClient userResourcesClient, IXpWhitelistService xpWhitelistService) {
+ public XpPricingController(XpPricingService xpPricingService, IXpGeoQueryEntityService xpGeoQueryEntityService, UserResourcesClient userResourcesClient, IXpWhitelistService xpWhitelistService, XpRegionService xpRegionService, XpOpenCityService xpOpenCityService) {
this.xpPricingService = xpPricingService;
this.xpGeoQueryEntityService = xpGeoQueryEntityService;
this.userResourcesClient = userResourcesClient;
this.xpWhitelistService = xpWhitelistService;
+ this.xpOpenCityService = xpOpenCityService;
}
@@ -174,14 +170,22 @@
if (pricing == null) {
throw new ServiceException("定价不存在", I18nKeyConstant.PRICING_NOT_EXIST);
}
+ //获取城市信息
+ String cityName = xpOpenCityService.getNameWithCityName(pricing.getCityId());
+ pricing.setCityName(cityName);
return R.ok(pricing);
}
@PostMapping("/api/v1/pricing/add")
@ApiOperation(value = "管理后台-新增定价", tags = {"管理后台-定价管理"})
- public R<?> add(@Valid @RequestBody PricingAddDTO dto) {
- xpPricingService.add(dto);
- return R.ok();
+ public R<Long> add(@Valid @RequestBody PricingAddDTO dto) {
+ return R.ok(xpPricingService.add(dto));
+ }
+
+ @PostMapping("/api/v1/pricing/edit")
+ @ApiOperation(value = "管理后台-编辑定价", tags = {"管理后台-定价管理"})
+ public R<?> edit(@Valid @RequestBody PricingEditDTO dto) {
+ return R.ok(xpPricingService.edit(dto));
}
@PostMapping("/api/v1/pricing/setPrice")
--
Gitblit v1.7.1