mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-04-21 22:18:37 +00:00
✨ feat: add subscription billing system (#2808)
* ci: create docker automation * ✨ feat: add subscription billing system with admin management and user purchase flow Implement a new subscription-based billing model alongside existing metered/per-request billing: Backend: - Add subscription plan models (SubscriptionPlan, SubscriptionPlanItem, UserSubscription, etc.) - Implement CRUD APIs for subscription plan management (admin only) - Add user subscription queries with support for multiple active/expired subscriptions - Integrate payment gateways (Stripe, Creem, Epay) for subscription purchases - Implement pre-consume and post-consume billing logic for subscription quota tracking - Add billing preference settings (subscription_first, wallet_first, etc.) - Enhance usage logs with subscription deduction details Frontend - Admin: - Add subscription management page with table view and drawer-based edit form - Match UI/UX style with existing admin pages (redemption codes, users) - Support enabling/disabling plans, configuring payment IDs, and model quotas - Add user subscription binding modal in user management Frontend - Wallet: - Add subscription plans card with current subscription status display - Show all subscriptions (active and expired) with remaining days/usage percentage - Display purchasable plans with pricing cards following SaaS best practices - Extract purchase modal to separate component matching payment confirm modal style - Add skeleton loading states with active animation - Implement billing preference selector in card header - Handle payment gateway availability based on admin configuration Frontend - Usage Logs: - Display subscription deduction details in log entries - Show step-by-step breakdown of subscription usage (pre-consumed, delta, final, remaining) - Add subscription deduction tag for subscription-covered requests * ✨ feat(admin): add user subscription management and refine UI/pagination Add admin APIs to list/create/invalidate/delete user subscriptions Add model helpers to fetch all user subscriptions (incl. expired) and support cancel/hard-delete Wire new admin routes for user subscription operations Replace “Bind subscription plan” entry with a dedicated User Subscriptions SideSheet in Users table Use CardTable with responsive layout and working client-side pagination inside the SideSheet Improve subscription purchase modal empty-gateway state with a Banner notice * ✨ feat(admin): streamline subscription plan benefits editor with bulk actions Restore the avatar/icon header for the “Model Benefits” section Replace scattered controls with a compact toolbar-style workflow Support multi-select add with a default quota for new items Add row selection with bulk apply-to-selected / apply-to-all quota updates Enable delete-selected to manage benefits faster and reduce mistakes * ✨ fix(subscription): finalize payments, log billing, and clean up dead code Complete subscription orders by creating a matching top-up record and writing billing logs Add Epay return handler to verify and finalize browser callbacks Require Stripe/Creem webhook configuration before starting subscription payments Show subscription purchases in topup history with clearer labels/methods Remove unused subscription helper, legacy Creem webhook struct, and unused topup fields Simplify subscription self API payload to active/all lists only * 🎨 style: format all code with gofmt and lint:fix Apply consistent code formatting across the entire codebase using gofmt and lint:fix tools. This ensures adherence to Go community standards and improves code readability and maintainability. Changes include: - Run gofmt on all .go files to standardize formatting - Apply lint:fix to automatically resolve linting issues - Fix code style inconsistencies and formatting violations No functional changes were made in this commit. * ✨ feat(subscription): add quota reset periods and admin configuration - Add reset period fields on subscription plans and user items - Apply automatic quota resets during pre-consume based on plan schedule - Expose reset-period configuration in the admin plan editor - Display reset cadence in subscription cards and purchase modal - Validate custom reset seconds on plan create/update * ✨ feat(subscription): harden subscription billing with resets, idempotency, and production-grade stability Add plan-level quota reset periods and display/reset cadence in admin/UI Enforce natural reset alignment with background reset task and cleanup job Make subscription pre-consume/refund idempotent with request-scoped records and retries Use database time for consistent resets across multi-instance deployments Harden payment callbacks with locking and idempotent order completion Record subscription purchases in topup history and billing logs Optimize subscription queries and add critical composite indexes * ✨ feat(subscription): cache plan lookups and stabilize pre-consume Introduce hybrid caches for subscription plans, items, and plan info with explicit invalidation on admin updates. Streamline pre-consume transactions to reduce redundant queries while preserving idempotency and reset logic. * 🐛 fix(subscription): avoid pre-consume lookup noise Use a RowsAffected check for the idempotency lookup so missing records no longer surface as "record not found" errors while preserving behavior. * 🔧 ci: Change workflow trigger to sub branch Update the Docker image workflow to run on pushes to the sub branch instead of main. * 💸 chore: Align subscription pricing display with global currency settings Unify subscription price rendering to use the site-wide currency symbol/rate on the wallet and admin views. Make subscription plan currency read-only in the editor and force USD on create/update to avoid drift. Use global currency display type when creating Creem checkout payloads. * 🔧 chore: Unify subscription plan status toggle with PATCH endpoint Replace separate enable/disable flows with a single PATCH API that updates the enabled flag. Update frontend hooks and table actions to call the unified endpoint and keep UI behavior consistent. Introduce a minimal admin controller handler and route for the status update. * ✨ feat: Add subscription limits and UI tags consistency Add per-plan purchase limits with backend enforcement and UI disable states. Expose limit configuration in admin plan editor and show limits in plan tables/cards. Refine subscription UI tags with unified badge style and streamlined “My Subscriptions” layout. * 🎨 style: tag color to white * 🚀 refactor: Simplify subscription quota to total amount model Remove per-model subscription items and switch to a single total quota per plan and user subscription. Update billing, reset, and logging flows to operate on total quota, and refactor admin/user UI to configure and display total quota consistently. * 🚀 chore: Remove duplicate subscription usage percentage display Keep the usage percentage shown only in the total quota line to avoid redundant “已用 0%” text while preserving remaining days in the summary. * ✨ feat: Add subscription upgrade group with auto downgrade * ✨ feat: Update subscription purchase modal display Show total quota as currency with tooltip for raw quota, hide reset cycle when never, and display upgrade group when configured to match card display rules. * ✨ feat: Extract quota conversion helpers to shared utils Move quota display/conversion helpers into web/src/helpers/quota.js and update the subscription plan editor to import and use the shared utilities instead of inline functions. * ✨ chore: Add upgrade group guidance in subscription editor Add explanatory helper text under the upgrade group field to clarify automatic group upgrades, rollback conditions, and the expected delay before downgrading takes effect. * 🔧 chore: remove unused Creem settings state Drop the unused originInputs state and redundant updates to keep the Creem settings form state minimal and easier to maintain. * 🚀 chore: Remove useless action * ✨ Add full i18n coverage for subscription-related UI across locales * ✨ feat: harden subscription billing and improve UI consistency Improve subscription payment safety and data integrity by handling user/URL lookup failures, fixing Stripe subscription mode, persisting quota reset fields, and correcting subscription delta accounting and DB timestamp casting. Refine the UI with stricter custom duration validation, accurate currency rounding, conditional Epay labeling, rollback on preference update failure, and shared subscription formatting helpers plus clearer component naming. * 🔧 fix: make epay webhook and return flow subscription-aware Ensure Epay webhook acknowledges success only after order completion, returning fail on processing errors to allow retries. Redirect subscription payment returns to the subscription page instead of top-up for correct user flow. * 🚦 fix: guard epay return success on order completion Redirect subscription return flow to failure when order completion fails, preventing false success states after payment verification. * 🔧 fix: normalize epay error handling and webhook retries Standardize SubscriptionRequestEpay error responses via ApiErrorMsg for a consistent schema. Return "fail" on non-success trade statuses in the epay webhook to preserve retry behavior. * 🧾 fix: persist epay orders before purchase Create the subscription order before initiating epay payment and expire it if the provider call fails, preventing orphaned transactions and improving reconciliation. * 🔧 fix: harden epay callbacks and billing fallbacks Use POST and form parsing for epay notify/return routes, persist epay orders before provider calls with expiry on failure, and ensure notify handlers retry correctly. Restrict subscription-first fallback to insufficient-subscription errors and log refund failures after retries to avoid silent quota drift. * 🔧 fix: harden billing flow and sidebar settings Add missing strings import for subscription fallback checks, log failed subscription refunds after retries, and extend sidebar module settings with a subscription management toggle plus translations. * 🛡️ fix: fail fast on epay form parse errors Handle ParseForm errors in epay notify/return handlers by returning fail or redirecting to failure, avoiding unsafe fallback to query parameters. * ✨ fix: refine Japanese subscription status labels Adjust Japanese UI wording for active-count labels to read more naturally and consistently. * ✅ fix: standardize epay success response schema Return subscription epay pay success responses via ApiSuccess to include the consistent success field and align with error schema.
This commit is contained in:
@@ -2476,7 +2476,6 @@
|
||||
"重新生成备用码失败": "Не удалось сгенерировать резервные коды заново",
|
||||
"重新生成备用码将使现有的备用码失效,请确保您已保存了当前的备用码。": "Повторная генерация резервных кодов сделает существующие резервные коды недействительными, убедитесь, что вы сохранили текущие резервные коды.",
|
||||
"重绘": "Перерисовать",
|
||||
"重置": "Сброс",
|
||||
"重置 2FA": "Сброс 2FA",
|
||||
"重置 Passkey": "Сброс Passkey",
|
||||
"重置为默认": "Сбросить по умолчанию",
|
||||
@@ -2617,6 +2616,92 @@
|
||||
"格式化 JSON": "Форматировать JSON",
|
||||
"关闭提示": "Закрыть уведомление",
|
||||
"说明:本页测试为非流式请求;若渠道仅支持流式返回,可能出现测试失败,请以实际使用为准。": "Примечание: тесты на этой странице используют нестриминговые запросы. Если канал поддерживает только стриминговые ответы, тест может завершиться неудачей. Ориентируйтесь на реальное использование.",
|
||||
"提示:端点映射仅用于模型广场展示,不会影响模型真实调用。如需配置真实调用,请前往「渠道管理」。": "Примечание: сопоставление endpoint'ов используется только для отображения в «Маркетплейсе моделей» и не влияет на реальный вызов. Чтобы настроить реальное поведение вызовов, перейдите в «Управление каналами»."
|
||||
"提示:端点映射仅用于模型广场展示,不会影响模型真实调用。如需配置真实调用,请前往「渠道管理」。": "Примечание: сопоставление эндпоинтов используется только для отображения в «Маркетплейсе моделей» и не влияет на реальный вызов. Чтобы настроить реальное поведение вызовов, перейдите в «Управление каналами».",
|
||||
"Stripe/Creem 需在第三方平台创建商品并填入 ID": "Товары Stripe/Creem нужно создать на сторонней платформе и указать их ID",
|
||||
"暂无订阅套餐": "Нет тарифных планов",
|
||||
"订阅管理": "Управление подписками",
|
||||
"订阅套餐管理": "Управление тарифами подписки",
|
||||
"新建套餐": "Создать план",
|
||||
"套餐": "План",
|
||||
"支付渠道": "Платежные каналы",
|
||||
"购买上限": "Лимит покупок",
|
||||
"有效期": "Срок действия",
|
||||
"重置": "Сброс",
|
||||
"禁用后用户端不再展示,但历史订单不受影响。是否继续?": "После отключения план не будет отображаться пользователям, но история заказов не затрагивается. Продолжить?",
|
||||
"启用后套餐将在用户端展示。是否继续?": "После включения план будет отображаться пользователям. Продолжить?",
|
||||
"更新套餐信息": "Обновить информацию о плане",
|
||||
"创建新的订阅套餐": "Создать новый план подписки",
|
||||
"套餐的基本信息和定价": "Основная информация и цена плана",
|
||||
"套餐标题": "Название плана",
|
||||
"请输入套餐标题": "Введите название плана",
|
||||
"套餐副标题": "Подзаголовок плана",
|
||||
"例如:适合轻度使用": "Например: для легкого использования",
|
||||
"请输入金额": "Введите сумму",
|
||||
"请输入总额度": "Введите общий лимит",
|
||||
"0 表示不限": "0 означает без лимита",
|
||||
"原生额度": "Исходный лимит",
|
||||
"升级分组": "Группа повышения",
|
||||
"不升级": "Не повышать",
|
||||
"购买或手动新增订阅会升级到该分组;当套餐失效/过期或手动作废/删除后,将回退到升级前分组。回退不会立即生效,通常会有几分钟延迟。": "Покупка или ручное добавление подписки повысит группу до этой. При истечении/аннулировании/удалении плана произойдет возврат к предыдущей группе. Возврат обычно занимает несколько минут.",
|
||||
"币种": "Валюта",
|
||||
"由全站货币展示设置统一控制": "Управляется глобальными настройками отображения валюты",
|
||||
"排序": "Порядок",
|
||||
"启用状态": "Статус включения",
|
||||
"有效期设置": "Настройки срока действия",
|
||||
"配置套餐的有效时长": "Настроить срок действия плана",
|
||||
"有效期单位": "Единица срока",
|
||||
"自定义秒数": "Пользовательские секунды",
|
||||
"请输入秒数": "Введите количество секунд",
|
||||
"有效期数值": "Значение срока",
|
||||
"额度重置": "Сброс лимита",
|
||||
"支持周期性重置套餐权益额度": "Поддерживает периодический сброс лимита плана",
|
||||
"重置周期": "Период сброса",
|
||||
"第三方支付配置": "Настройки сторонних платежей",
|
||||
"Stripe/Creem 商品ID(可选)": "ID продукта Stripe/Creem (необязательно)",
|
||||
"生效": "Активно",
|
||||
"已作废": "Аннулировано",
|
||||
"用户订阅管理": "Управление подписками пользователей",
|
||||
"选择订阅套餐": "Выберите план подписки",
|
||||
"新增订阅": "Добавить подписку",
|
||||
"暂无订阅记录": "Нет записей подписок",
|
||||
"来源": "Источник",
|
||||
"开始": "Начало",
|
||||
"结束": "Окончание",
|
||||
"作废": "Аннулировать",
|
||||
"确认作废": "Подтвердить аннулирование",
|
||||
"作废后该订阅将立即失效,历史记录不受影响。是否继续?": "После аннулирования подписка сразу станет недействительной. История не изменится. Продолжить?",
|
||||
"删除会彻底移除该订阅记录(含权益明细)。是否继续?": "Удаление полностью удалит запись подписки (включая детали прав). Продолжить?",
|
||||
"绑定订阅套餐": "Привязать план подписки",
|
||||
"绑定后会立即生成用户订阅(无需支付),有效期按套餐配置计算。": "После привязки подписка будет создана сразу (без оплаты); срок действия рассчитывается по настройкам плана.",
|
||||
"订阅套餐": "Планы подписки",
|
||||
"购买订阅获得模型额度/次数": "Купите подписку, чтобы получить лимит/количество использования моделей",
|
||||
"优先订阅": "Сначала подписка",
|
||||
"优先钱包": "Сначала кошелек",
|
||||
"仅用订阅": "Только подписка",
|
||||
"仅用钱包": "Только кошелек",
|
||||
"我的订阅": "Мои подписки",
|
||||
"个生效中": "активных",
|
||||
"无生效": "Нет активных",
|
||||
"个已过期": "истекших",
|
||||
"订阅": "Подписка",
|
||||
"至": "до",
|
||||
"过期于": "Истекает",
|
||||
"购买套餐后即可享受模型权益": "После покупки плана доступны преимущества моделей",
|
||||
"限购": "Лимит",
|
||||
"推荐": "Рекомендуется",
|
||||
"已达到购买上限": "Достигнут лимит покупок",
|
||||
"已达上限": "Лимит достигнут",
|
||||
"立即订阅": "Оформить сейчас",
|
||||
"暂无可购买套餐": "Нет доступных для покупки планов",
|
||||
"该套餐未配置 Stripe": "Для этого плана не настроен Stripe",
|
||||
"已打开支付页面": "Страница оплаты открыта",
|
||||
"支付失败": "Оплата не удалась",
|
||||
"该套餐未配置 Creem": "Для этого плана не настроен Creem",
|
||||
"已发起支付": "Оплата инициирована",
|
||||
"购买订阅套餐": "Купить план подписки",
|
||||
"套餐名称": "Название плана",
|
||||
"应付金额": "К оплате",
|
||||
"支付": "Оплатить",
|
||||
"管理员未开启在线支付功能,请联系管理员配置。": "Онлайн-оплата не включена администратором. Пожалуйста, свяжитесь с администратором."
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user