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-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
index d974fc8..3ca4d8a 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -73,6 +74,10 @@
return R.fail("所有帐号添加失败，请检查帐号格式或唯一性");
}
+ if (dto.getExpireTime() != null && dto.getExpireTime().isBefore(LocalDate.now())) {
+ return R.fail("有效期不能早于当前日期");
+ }
+
int sampleLimitPerReason = 20;
int totalCount = accounts.size();
Map<String, Long> reasonCountMap = new HashMap<>();
@@ -116,6 +121,8 @@
xpWhitelist.setIsPriorityDispatch(dto.getIsPriorityDispatch());
xpWhitelist.setWhitelistSource(1);
xpWhitelist.setCreateBy(sysUser.getNickName());
+ xpWhitelist.setExpireTime(dto.getExpireTime());
+ xpWhitelist.setMaxOrderNum(dto.getMaxOrderNum());
addList.add(xpWhitelist);
}
--
Gitblit v1.7.1