From 13978ae9ed56ec816823c74589e4c6745f184dff Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 二月 2026 17:18:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 bcf439c..3e73cdc 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
@@ -26,6 +26,7 @@
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.DateUtils;
+import com.xiaopeng.common.core.utils.StringUtils;
import com.xiaopeng.common.core.utils.uuid.UUID;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.redis.service.RedisService;
@@ -718,11 +719,16 @@
if (pricing == null) {
throw new ServiceException("定价不存在", I18nKeyConstant.PRICING_NOT_EXIST);
}
-
try {
- JSONObject.parseObject(dto.getBasicPricingJson());
- JSONArray.parseArray(dto.getStartingFareJson());
- JSONObject.parseObject(dto.getDynamicPricingJson());
+ if (StringUtils.isNotBlank(dto.getBasicPricingJson())) {
+ JSONObject.parseObject(dto.getBasicPricingJson());
+ }
+ if (StringUtils.isNotBlank(dto.getStartingFareJson())) {
+ JSONArray.parseArray(dto.getStartingFareJson());
+ }
+ if (StringUtils.isNotBlank(dto.getDynamicPricingJson())) {
+ JSONObject.parseObject(dto.getDynamicPricingJson());
+ }
} catch (Exception e) {
throw new ServiceException("价格配置JSON格式不正确", I18nKeyConstant.PRICING_JSON_INVALID);
}
@@ -730,8 +736,9 @@
XpPricing update = new XpPricing();
update.setId(dto.getId());
update.setBasicPricingJson(dto.getBasicPricingJson());
- update.setStartingFareJson(dto.getStartingFareJson());
+ update.setStartingFareJson(StringUtils.isNotBlank(dto.getStartingFareJson()) ? dto.getStartingFareJson() : null);
update.setDynamicPricingJson(dto.getDynamicPricingJson());
+ update.setIsDynamicPrice(dto.getIsDynamicPrice());
this.updateById(update);
}
--
Gitblit v1.7.1