From 2d0312de30b3783ecf254d146dc6322d74690762 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 19 五月 2026 09:28:57 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 84dfef8..6a93b3c 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
@@ -115,7 +115,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime getoffTime;
- @ApiModelProperty(value = "支付方式(1=微信，2=其他)")
+ @ApiModelProperty(value = "支付方式(1=微信，2=其他 3免密)")
private Integer payType;
@ApiModelProperty(value = "订单金额")
@@ -282,4 +282,24 @@
@ApiModelProperty(value = "信用下单接口获取的支付中心授权单号（商户订单号）")
@TableField("auth_order_id")
private String authOrderId;
+
+
+ @ApiModelProperty(value = "信用下单接口获取的业务id")
+ @TableField("business_order_id")
+ private String businessOrderId;
+
+
+ @ApiModelProperty(value = "业务主单号")
+ @TableField("main_order_id")
+ private String mainOrderId;
+
+
+ @ApiModelProperty(value = "推送财务状态 1成功 0未推送 2失败")
+ @TableField("frd_xfip_evenet_status")
+ private Integer frdXfipEvenetStatus;
+
+
+ @ApiModelProperty(value = "推送事件id")
+ @TableField("frd_xfip_evenet_id")
+ private String frdXfipEvenetId;
}
--
Gitblit v1.7.1