From ceb3960eb6c4975265b8c51368f7afe224129e75 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 二月 2026 21:23:48 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java
index 45798e0..0bcc854 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java
@@ -10,6 +10,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -55,6 +56,7 @@
@ApiModelProperty(value = "乘车时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime rideTime;
@ApiModelProperty(value = "下单地点经度")
@@ -94,6 +96,7 @@
private String boardingAddress;
@ApiModelProperty(value = "上车时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime boardingTime;
@ApiModelProperty(value = "下车点经度")
@@ -106,6 +109,7 @@
private String getoffAddress;
@ApiModelProperty(value = "下车时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime getoffTime;
@ApiModelProperty(value = "支付方式(1=微信，2=其他)")
@@ -191,6 +195,7 @@
@ApiModelProperty(value = "订单预估时间 状态为1使用")
@TableField("estimated_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime estimatedTime;
@@ -202,12 +207,16 @@
@TableField("time_slot")
private String timeSlot;
@ApiModelProperty(value = "车辆到达上车点时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime arrivalTime;
@ApiModelProperty(value = "接单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime acceptanceTime;
@ApiModelProperty(value = "行程开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime tripBegin;
@ApiModelProperty(value = "行程结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime tripEnd;
--
Gitblit v1.7.1