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);