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/XpWhitelist.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpWhitelist.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpWhitelist.java
index c01aa0c..08e0692 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpWhitelist.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpWhitelist.java
@@ -1,17 +1,18 @@
package com.xiaopeng.api.model.operation;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import javax.validation.constraints.Min;
+import java.time.LocalDate;
/**
* <p>
@@ -49,4 +50,18 @@
@ApiModelProperty(value = "来源 1=添加 2=邀请码")
private Integer whitelistSource;
+ @ApiModelProperty(value = "有限期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate expireTime;
+
+ @ApiModelProperty(value = "最大下单数量")
+ @Min(value = 0, message = "不能为负")
+ private Integer maxOrderNum;
+
+ public Boolean getStatus() {
+ if (LocalDate.now().isAfter(expireTime)) {
+ return false;
+ }
+ return status;
+ }
}
--
Gitblit v1.7.1