From 847aa93dec5915b30aab7609561c050f2bfcc8ec Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 四月 2026 10:30:59 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java
index 65436a2..efa84de 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPricing.java
@@ -1,15 +1,20 @@
package com.xiaopeng.api.model.operation;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.xiaopeng.api.vo.operation.XpPricingDynamicPricesVo;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
/**
* <p>
@@ -67,11 +72,24 @@
@TableField("starting_fare_json")
private String startingFareJson;
+ /**
+ * 动态调价的配置
+ * {@link XpPricingDynamicPricesVo}
+ */
@ApiModelProperty(value = "动态价格json配置")
@TableField("dynamic_pricing_json")
private String dynamicPricingJson;
+// public XpPricingDynamicPricesVo getDynamicPricingJsonObj() {
+// if(StringUtils.isNotEmpty(dynamicPricingJson)){
+// return JSONObject.parseObject(dynamicPricingJson, XpPricingDynamicPricesVo.class);
+// }
+// return null;
+// }
+
+
+
@ApiModelProperty(value = "价格规则")
@TableField("price_rule")
private String priceRule;
--
Gitblit v1.7.1