From d09e1c104aed44b4c2cc3c620ef28f4f5a2ec13a Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 12 二月 2026 21:47:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/FareBreakdownVo.java | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/FareBreakdownVo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/FareBreakdownVo.java
index 8f43283..73b6d64 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/FareBreakdownVo.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/FareBreakdownVo.java
@@ -5,38 +5,27 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel("订单费用明细VO")
public class FareBreakdownVo {
- @ApiModelProperty("起步里程")
- private Double startMileage;
- @ApiModelProperty(value = "起步价")
- private BigDecimal startMoney;
- @ApiModelProperty(value = "里程公里")
- private Double mileageKilometers;
- @ApiModelProperty(value = "里程费")
- private BigDecimal mileageMoney;
- @ApiModelProperty(value = "时长分钟")
- private Double duration;
- @ApiModelProperty(value = "时长费")
- private BigDecimal durationMoney;
- @ApiModelProperty(value = "等待分钟")
- private Double wait;
- @ApiModelProperty(value = "等待费")
- private BigDecimal waitMoney;
- @ApiModelProperty(value = "远途公里")
- private Double longDistance;
- @ApiModelProperty(value = "远途费")
- private BigDecimal longDistancemoney;
+ @ApiModelProperty("起步价格明细")
+ private List<FareBreakdownDetailVo> start;
+ @ApiModelProperty("里程费价格明细")
+ private List<FareBreakdownDetailVo> mileage;
+ @ApiModelProperty("时长费价格明细")
+ private List<FareBreakdownDetailVo> duration;
+ @ApiModelProperty("远途费价格明细")
+ private List<FareBreakdownDetailVo> longDistance;
@ApiModelProperty(value = "红包抵扣金额")
private BigDecimal redPacketMoney;
@ApiModelProperty(value = "优惠券抵扣金额")
private BigDecimal couponMoney;
@ApiModelProperty(value = "订单金额")
private BigDecimal orderMoney;
- @ApiModelProperty(value = "订单全程公里数")
- private BigDecimal totalKilometers;
- @ApiModelProperty(value = "订单全程时间（单位分钟）")
- private BigDecimal totalTime;
+ @ApiModelProperty(value = "订单行驶里程")
+ private BigDecimal kilometer;
+ @ApiModelProperty(value = "订单行驶时间")
+ private BigDecimal time;
}
--
Gitblit v1.7.1