feat(server/devices): users.max_devices_override 单用户设备上限覆盖(NULL走套餐默认)+ 迁移000025

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01P9G7E3wmAYL9KeYCVZVsqu
2026-07-13 10:15:07 +08:00
parent 3d24451835
commit 07c339c18e
9 changed files with 260 additions and 7 deletions
@@ -450,7 +450,21 @@ func (svc *Service) ResolvePlan(ctx context.Context, userID int64) (Plan, *apier
 	if err != nil {
 		return Plan{}, apierr.ErrInternal
 	}
-	return resolveEffectivePlan(time.Now().UTC(), status, subs, free)
+	plan, apiErr := resolveEffectivePlan(time.Now().UTC(), status, subs, free)
+	if apiErr != nil {
+		return Plan{}, apiErr
+	}
+	// Per-user device-cap override (migration 000025, users.max_devices_override):
+	// NULL/0 = no override, keep the plan-derived cap resolved above. Applied
+	// once here — the single funnel both the subscription path and the free
+	// fallback flow through — so every consumer (subscription middleware,
+	// /v1/me, CheckDeviceLimit) sees it uniformly.
+	if override, ok, err := svc.store.GetMaxDevicesOverride(ctx, userID); err != nil {
+		return Plan{}, apierr.ErrInternal
+	} else if ok {
+		plan.MaxDevices = override
+	}
+	return plan, nil
 }

 // CheckDeviceLimit prunes stale devices (best-effort churn cleanup), resolves the