mirror of
https://github.com/langgenius/dify.git
synced 2026-09-08 11:04:27 +08:00
fix: When the user is a non-sandbox user and has a paid balance, the … (#32173)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
parent
1a050c9f86
commit
7dabc03a08
@ -1,6 +1,7 @@
|
|||||||
from flask_login import current_user
|
from flask_login import current_user
|
||||||
|
|
||||||
from configs import dify_config
|
from configs import dify_config
|
||||||
|
from enums.cloud_plan import CloudPlan
|
||||||
from extensions.ext_database import db
|
from extensions.ext_database import db
|
||||||
from models.account import Tenant, TenantAccountJoin, TenantAccountRole
|
from models.account import Tenant, TenantAccountJoin, TenantAccountRole
|
||||||
from services.account_service import TenantService
|
from services.account_service import TenantService
|
||||||
@ -53,7 +54,12 @@ class WorkspaceService:
|
|||||||
from services.credit_pool_service import CreditPoolService
|
from services.credit_pool_service import CreditPoolService
|
||||||
|
|
||||||
paid_pool = CreditPoolService.get_pool(tenant_id=tenant.id, pool_type="paid")
|
paid_pool = CreditPoolService.get_pool(tenant_id=tenant.id, pool_type="paid")
|
||||||
if paid_pool:
|
# if the tenant is not on the sandbox plan and the paid pool is not full, use the paid pool
|
||||||
|
if (
|
||||||
|
feature.billing.subscription.plan != CloudPlan.SANDBOX
|
||||||
|
and paid_pool is not None
|
||||||
|
and (paid_pool.quota_limit == -1 or paid_pool.quota_limit > paid_pool.quota_used)
|
||||||
|
):
|
||||||
tenant_info["trial_credits"] = paid_pool.quota_limit
|
tenant_info["trial_credits"] = paid_pool.quota_limit
|
||||||
tenant_info["trial_credits_used"] = paid_pool.quota_used
|
tenant_info["trial_credits_used"] = paid_pool.quota_used
|
||||||
else:
|
else:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user