diff --git a/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java b/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
index 892a75a7..66080460 100644
--- a/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
@@ -74,6 +74,10 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
         }
 
         baseMapper.insert(subscriptionPlan);
+        if (subscriptionPlanDTO.getStatus().equals(SubscriptionPlan.SubscriptionStatus.ACTIVE.name())) {
+            // 执行一次激活扫描器
+            activeSubscriptionPlan();
+        }
     }
 
     private void validateCreatePlanParams(SubscriptionPlanDTO subscriptionPlanDTO) {
@@ -487,7 +491,7 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
      */
     private void updateAccount(Account account, SubscriptionPlan plan, boolean isAdmin) {
         // 如果是管理员的切换，先再次记录一下已使用的积分
-        if (isAdmin) {
+        if (isAdmin && Objects.nonNull(account.getSubscriptionPlanId())) {
             SubscriptionPlan currentPlan = baseMapper.selectById(account.getSubscriptionPlanId());
             if (currentPlan.getCreditUsage().compareTo(account.getCreditsUsage()) < 0) {
                 updateSubscriptionPlanUsage(currentPlan, account.getCreditsUsage());