From 1d46a3b6d412827d93f50ec5785090d8f7ac035c Mon Sep 17 00:00:00 2001 From: xupei Date: Thu, 27 Mar 2025 15:38:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=9A=84=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/utils/LocalCacheUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java b/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java index 82235e8c..99858827 100644 --- a/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java +++ b/src/main/java/com/ai/da/common/utils/LocalCacheUtils.java @@ -28,7 +28,7 @@ public final class LocalCacheUtils { private static LoadingCache loadTokenCache() { LoadingCache tokenCache = CacheBuilder.newBuilder() .concurrencyLevel(10) - .expireAfterWrite(24 * 100, TimeUnit.HOURS) + .expireAfterWrite(24 * (7 - 1), TimeUnit.HOURS) .initialCapacity(100) .maximumSize(10000) .recordStats() From 5612b5b1d4db07eceffc3f164c1a277447119edb Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 31 Mar 2025 09:48:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?AiDA=208=E6=8A=98=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/enums/ProductEnum.java | 4 ++-- src/main/java/com/ai/da/service/impl/AccountServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ai/da/common/enums/ProductEnum.java b/src/main/java/com/ai/da/common/enums/ProductEnum.java index 11237ffe..70ad57e6 100644 --- a/src/main/java/com/ai/da/common/enums/ProductEnum.java +++ b/src/main/java/com/ai/da/common/enums/ProductEnum.java @@ -9,9 +9,9 @@ public enum ProductEnum { // 积分购买 CreditsProduct("AiDA credits purchase", 6L), // 年度订阅 - AnnualSubscription("AiDA Annual Subscription", 5000L), + AnnualSubscription("AiDA Annual Subscription", 4000L), // 月度订阅 - MonthlySubscription("AiDA Monthly Subscription", 500L), + MonthlySubscription("AiDA Monthly Subscription", 400L), // 测试 DailySubscription("AiDA Daily Subscription", 5L), ; diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 85d73fc4..103af007 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1436,11 +1436,11 @@ public class AccountServiceImpl extends ServiceImpl impl // 不管是不是新用户 都要更新用户角色和积分 String credits = "0"; - if (totalSales == 5000.0){ + if (totalSales == 5000.0 || totalSales == 4000.0){ log.info("年付用户，初始积分6000"); credits = CreditsEventsEnum.INIT_MONTHLY.getValue(); systemUserType = 1; - }else if (totalSales == 500.0){ + }else if (totalSales == 500.0 || totalSales == 400.0){ log.info("月付用户，初始积分5000"); credits = CreditsEventsEnum.INIT_MONTHLY.getValue(); systemUserType = 2; From 6b4d82a67dbe4d1bfac5e6d6ad28f42d4f7fb4a0 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 31 Mar 2025 17:45:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?AiDA=208=E6=8A=98=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/enums/ProductEnum.java | 4 ++-- src/main/java/com/ai/da/service/impl/AccountServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ai/da/common/enums/ProductEnum.java b/src/main/java/com/ai/da/common/enums/ProductEnum.java index 70ad57e6..11237ffe 100644 --- a/src/main/java/com/ai/da/common/enums/ProductEnum.java +++ b/src/main/java/com/ai/da/common/enums/ProductEnum.java @@ -9,9 +9,9 @@ public enum ProductEnum { // 积分购买 CreditsProduct("AiDA credits purchase", 6L), // 年度订阅 - AnnualSubscription("AiDA Annual Subscription", 4000L), + AnnualSubscription("AiDA Annual Subscription", 5000L), // 月度订阅 - MonthlySubscription("AiDA Monthly Subscription", 400L), + MonthlySubscription("AiDA Monthly Subscription", 500L), // 测试 DailySubscription("AiDA Daily Subscription", 5L), ; diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 103af007..85d73fc4 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1436,11 +1436,11 @@ public class AccountServiceImpl extends ServiceImpl impl // 不管是不是新用户 都要更新用户角色和积分 String credits = "0"; - if (totalSales == 5000.0 || totalSales == 4000.0){ + if (totalSales == 5000.0){ log.info("年付用户，初始积分6000"); credits = CreditsEventsEnum.INIT_MONTHLY.getValue(); systemUserType = 1; - }else if (totalSales == 500.0 || totalSales == 400.0){ + }else if (totalSales == 500.0){ log.info("月付用户，初始积分5000"); credits = CreditsEventsEnum.INIT_MONTHLY.getValue(); systemUserType = 2;