From 09e0146b9379e06351e7bd5b9bdc5b1700ab133b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 四月 2026 18:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderReassign.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderReassign.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderReassign.java
index 9066638..438ee17 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderReassign.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrderReassign.java
@@ -1,8 +1,6 @@
package com.xiaopeng.api.model.order;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +34,9 @@
@ApiModelProperty(value = "订单id")
private Long orderId;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "订单号")
+ private String orderNumber;
@ApiModelProperty(value = "操作人员id")
private Long userId;
@@ -58,4 +59,31 @@
@ApiModelProperty(value = "改派原因")
private String reassignReason;
+
+ @ApiModelProperty(value = "改派次数默认为0 改派多次后 还未找到车则标记订单取消")
+ private Integer reassignNum;
+
+ @ApiModelProperty(value = "是否完成 0=未完成 1=已完成")
+ private Boolean isComplete;
+ @ApiModelProperty(value = "经度")
+ private Double longitude;
+ @ApiModelProperty(value = "纬度")
+ private Double latitude;
+ @ApiModelProperty(value = "用户id")
+ @TableField(updateStrategy = FieldStrategy.NEVER)
+ private Long appUserId;
+ @ApiModelProperty(value = "备注")
+ private String remarks;
+
+
+ public XpOrderReassign() {
+ }
+
+ public XpOrderReassign(Long orderId, Long oldVehicleId, Long oldFleetId,Double longitude,Double latitude, String reassignReason) {
+ this.reassignNum = 1;
+ this.orderId = orderId;
+ this.oldVehicleId = oldVehicleId;
+ this.oldFleetId = oldFleetId;
+ this.reassignReason = reassignReason;
+ }
}
--
Gitblit v1.7.1