From f9e7f674ffdddce23aab0335f7430d75ec0c4482 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 17 四月 2026 14:10:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTradingStrategy.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTradingStrategy.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTradingStrategy.java
index fbdda76..71392da 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTradingStrategy.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTradingStrategy.java
@@ -11,6 +11,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Min;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -37,11 +38,22 @@
     @ApiModelProperty(value = "用户每日取消订单数")
     private Integer cancleCount;
 
+    @ApiModelProperty(value = "单个订单可修改目的地次数")
+    private Integer amendCountPerOrder;
+
+    @ApiModelProperty(value = "乘客端首页安全中心是否开启")
+    private Boolean showSecurityCenter;
+
+    //
+
     @ApiModelProperty(value = "豁免金额")
     private BigDecimal exemptionAmount;
 
     @ApiModelProperty(value = "是否长期有效 1=是 0=否")
     private Boolean isLongValid;
+
+    @ApiModelProperty(value = "豁免城市")
+    private String cityCode;
 
     @ApiModelProperty(value = "豁免开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -54,6 +66,8 @@
     @ApiModelProperty(value = "豁免角色 逗号分割 0=全部 1=新客 2=老客 3=流失召回 4=媒体")
     private String exemptionRole;
 
+    //
+
     @ApiModelProperty(value = "免密授权金额")
     private BigDecimal passwordFreeAmount;
 
@@ -61,27 +75,35 @@
     private BigDecimal prepaidLimit;
 
     @ApiModelProperty(value = "一轮推单距离")
+    @Min(0)
     private Double onePushDistance;
 
     @ApiModelProperty(value = "一轮推单时间")
+    @Min(0)
     private Integer onePushTime;
 
     @ApiModelProperty(value = "二轮推单距离")
+    @Min(0)
     private Double twoPushDistance;
 
     @ApiModelProperty(value = "二轮推单时间")
+    @Min(0)
     private Integer twoPushTime;
 
     @ApiModelProperty(value = "三轮推单距离")
+    @Min(0)
     private Double threePushDistance;
 
     @ApiModelProperty(value = "三轮推单时间")
+    @Min(0)
     private Integer threePushTime;
 
     @ApiModelProperty(value = "四轮推单距离")
+    @Min(0)
     private Double fourPushDistance;
 
     @ApiModelProperty(value = "四轮推单时间")
+    @Min(0)
     private Integer fourPushTime;
 
     @ApiModelProperty(value = "五轮推单距离")
@@ -123,4 +145,9 @@
     @ApiModelProperty(value = "电量权重")
     private Integer weightElectricity;
 
+    @ApiModelProperty(value = "路线时效,单位:秒")
+    private Integer MaxStandingTiming;
+
+    @ApiModelProperty(value = "触发步行导航的最小距离")
+    private Integer walkingGuideDistance;
 }

--
Gitblit v1.7.1