From 993674b46d92e209742cae603f7ea01620299d02 Mon Sep 17 00:00:00 2001
From: wangli <liwang648438@gmail.com>
Date: Tue, 6 Jan 2026 22:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=8B=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E5=88=B0=E6=9C=9F=E7=9A=84=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/eu/org/biwin/screen/service/NotificationService.java | 4 ++--
 src/main/resources/templates/admin_google_accounts.html       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/org/biwin/screen/service/NotificationService.java b/src/main/java/eu/org/biwin/screen/service/NotificationService.java
index eb28782..6cf9e18 100644
--- a/src/main/java/eu/org/biwin/screen/service/NotificationService.java
+++ b/src/main/java/eu/org/biwin/screen/service/NotificationService.java
@@ -163,7 +163,7 @@ public class NotificationService {
                 LocalDate expireDate = expireAt.toLocalDate();
                 LocalDate today = now.toLocalDate();
 
-                if (!expireDate.isBefore(today) && !expireDate.isAfter(today.plusDays(daysBefore))) {
+                if (expireDate.isBefore(today) || !expireDate.isAfter(today.plusDays(daysBefore))) {
                     String message = String.format("Google 主账号 Gemini Pro 即将到期\n邮箱: %s\n到期时间: %s",
                             account.get("email"), expireStr);
                     sendNotification(message);
@@ -190,7 +190,7 @@ public class NotificationService {
                 LocalDate expireDate = expireAt.toLocalDate();
                 LocalDate today = now.toLocalDate();
 
-                if (!expireDate.isBefore(today) && !expireDate.isAfter(today.plusDays(daysBefore))) {
+                if (expireDate.isBefore(today) || !expireDate.isAfter(today.plusDays(daysBefore))) {
                     String message = String.format("Google 家庭成员账号即将到期\n主账号: %s\n成员邮箱: %s\n购买人: %s\n到期时间: %s",
                             account.get("parent_email"), account.get("email"), account.get("purchaser"), expireStr);
                     sendNotification(message);
diff --git a/src/main/resources/templates/admin_google_accounts.html b/src/main/resources/templates/admin_google_accounts.html
index 50966cf..66d4c97 100644
--- a/src/main/resources/templates/admin_google_accounts.html
+++ b/src/main/resources/templates/admin_google_accounts.html
@@ -200,7 +200,7 @@
                 <label for="check-enabled">开启到期检查</label>
             </div>
             <div class="form-group">
-                <label for="cron-expression">Cron 表达式</label>
+                <label for="cron-expression">Cron 表达式(Spring)</label>
                 <input type="text" id="cron-expression" placeholder="例如: 0 0 10 * * ?">
             </div>
             <div class="form-group">