From 88657ea3ce9ff5f478d04263ba295c965dff4a85 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Thu, 31 Jul 2025 16:51:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20license=E5=88=B0=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=96=E4=B8=80=E5=A4=A9=E7=9A=84=E6=9C=80=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../license/service/license/LicenseServiceImpl.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java
index 2d23a37..a507245 100644
--- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java
+++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java
@@ -38,6 +38,7 @@ import org.springframework.validation.annotation.Validated;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -89,6 +90,10 @@ public class LicenseServiceImpl implements LicenseService {
         if (!validateLicenseSnUnique(createReqVO.getSerialNo(), createReqVO.getId())) {
             throw exception(LICENSE_SN_DUPLICATE, createReqVO.getSerialNo());
         }
+
+        if (createReqVO.getExpiryDate() != null) {
+            createReqVO.setExpiryDate(LocalDateTime.of(createReqVO.getExpiryDate().toLocalDate(), LocalTime.of(23, 59, 59)));
+        }
         // 插入
         LicenseDO license = BeanUtils.toBean(createReqVO, LicenseDO.class);
         license.setStatus(LicenseStatusEnum.NOT_APPLIED.getCode());
@@ -116,6 +121,9 @@ public class LicenseServiceImpl implements LicenseService {
         }
         // 校验存在
         validateLicenseExists(updateReqVO.getId());
+        if (updateReqVO.getExpiryDate() != null) {
+            updateReqVO.setExpiryDate(LocalDateTime.of(updateReqVO.getExpiryDate().toLocalDate(), LocalTime.of(23, 59, 59)));
+        }
         // 更新
         LicenseDO updateObj = BeanUtils.toBean(updateReqVO, LicenseDO.class);
         licenseMapper.updateById(updateObj);