PMC#16 账户登录地址不正确: - 写死的 https://airshelf.com/login(不存在的域名)改成 ${location.origin}/login, 与邀请链接同源,成员拿到的就是当前真实访问地址。 PMC#17/#18 成员三档额度只有月度生效、日/总纯装饰 → 列表显示与配置对不上: - TeamMember 新增 daily_credit_limit / total_credit_limit(0=不限,迁移 0006); - reserve_credit 逐档真实管控(每日/每月/累计总额),口径=窗口内 CHARGE 流水 + 在途预留; - 成员列表"每日额度"由写死"不限"改成真实日额度+今日已用,并新增"总额度"列; - 创建/编辑弹窗三档额度真入库真生效;补 3 个计费单测(日/总拦截、0=不限)。 PMC#24 同批生成的图片文字/内容雷同: - 根因=套图/自由创作同批 N 张用同一 prompt 且无变化(只有模特上身图按 index 变); - 给平台套图/自由参考/纯文生图都加按 index 的版式变体,避开传 seed(防中转站 400)。 PMC#25 重跑应在原任务上重跑而非新开任务: - 全批"重跑"改为原地复位同一批次卡;"重跑这张/再生成"改为补图进原卡(不覆盖好图、不新开任务)。 YYX#row22 图片生成未读角标(本仓库既有改动一并提交): - AITask 新增 read_at(迁移 0020 + 索引一致性迁移 0021);导航栏"图片生成"未读胶囊、 商品预览右下角未读分数;查看某商品即标记其生成任务已读、清零角标。 注:PMC#14/#15/#20/#22/#23 早前提交已修,需部署重测;PMC#13/#21 为 provider 侧 生成失败,代码侧重试/退费/僵尸回收/错误外露已就位,需部署后看真实 error_message 定位; PMC#19 收件箱标记与设计稿逐字一致,待截图复现。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
208 lines
9.2 KiB
Python
208 lines
9.2 KiB
Python
from decimal import Decimal
|
|
|
|
from django.db import transaction
|
|
from django.db.models import Sum
|
|
from django.utils import timezone
|
|
|
|
from apps.billing.models import CreditAccount, CreditLedger, CreditReservation, QuotaPolicy
|
|
|
|
|
|
def _enforce_member_monthly_limit(*, team, user, amount: Decimal) -> None:
|
|
"""成员三档限额管控(每日 / 每月 / 累计总额,各 0=不限)。团队页可设,此前只有「月」生效,
|
|
「日」/「总」纯装饰 → 列表显示与配置对不上(PMC#17/#18)。这里逐档真实管控。
|
|
口径与成员列表一致:某窗口内该成员的 CHARGE 流水合计 + 其当前 ACTIVE 预留(在途任务),
|
|
防止并发把限额冲穿。调用方(reserve_credit)已持有 account 行锁,团队内 reserve 串行化,无竞态。"""
|
|
if user is None:
|
|
return
|
|
member = team.members.filter(user=user).first()
|
|
if member is None:
|
|
return
|
|
now = timezone.now()
|
|
reserved = (
|
|
CreditReservation.objects.filter(team=team, user=user, status=CreditReservation.Status.ACTIVE)
|
|
.aggregate(s=Sum("amount"))["s"] or Decimal("0")
|
|
)
|
|
|
|
def _charged_since(since):
|
|
qs = CreditLedger.objects.filter(team=team, user=user, ledger_type=CreditLedger.Type.CHARGE)
|
|
if since is not None:
|
|
qs = qs.filter(created_at__gte=since)
|
|
return qs.aggregate(s=Sum("amount"))["s"] or Decimal("0")
|
|
|
|
day_limit = member.daily_credit_limit or Decimal("0")
|
|
if day_limit > 0:
|
|
day_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
|
|
charged = _charged_since(day_start)
|
|
if charged + reserved + amount > day_limit:
|
|
raise ValueError(f"成员今日额度不足:每日限额 ¥{day_limit},今日已用 ¥{charged}(另有在途 ¥{reserved})")
|
|
|
|
month_limit = member.monthly_credit_limit or Decimal("0")
|
|
if month_limit > 0:
|
|
month_start = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
|
|
charged = _charged_since(month_start)
|
|
if charged + reserved + amount > month_limit:
|
|
raise ValueError(f"成员本月额度不足:限额 ¥{month_limit},本月已用 ¥{charged}(另有在途 ¥{reserved})")
|
|
|
|
total_limit = member.total_credit_limit or Decimal("0")
|
|
if total_limit > 0:
|
|
charged = _charged_since(None)
|
|
if charged + reserved + amount > total_limit:
|
|
raise ValueError(f"成员累计额度不足:总额度 ¥{total_limit},累计已用 ¥{charged}(另有在途 ¥{reserved})")
|
|
|
|
|
|
def _enforce_quota_policy(*, team, project, amount: Decimal) -> None:
|
|
"""平台 4 层额度策略(QuotaPolicy)。**仅当团队存在 active 团队级策略时才生效** ——
|
|
无策略的团队行为完全不变(零回归)。检查 单任务 / 团队月度 / 项目 三类限额(任一为 None 即该维度不限)。"""
|
|
policy = (
|
|
team.quota_policies.filter(is_active=True, user__isnull=True, project__isnull=True)
|
|
.order_by("-created_at")
|
|
.first()
|
|
)
|
|
if policy is None:
|
|
return
|
|
if policy.per_task_limit is not None and amount > policy.per_task_limit:
|
|
raise ValueError(f"单任务额度超限:上限 ¥{policy.per_task_limit}")
|
|
now = timezone.now()
|
|
month_start = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
|
|
if policy.monthly_limit is not None:
|
|
charged = (
|
|
CreditLedger.objects.filter(team=team, ledger_type=CreditLedger.Type.CHARGE, created_at__gte=month_start)
|
|
.aggregate(s=Sum("amount"))["s"] or Decimal("0")
|
|
)
|
|
reserved = (
|
|
CreditReservation.objects.filter(team=team, status=CreditReservation.Status.ACTIVE)
|
|
.aggregate(s=Sum("amount"))["s"] or Decimal("0")
|
|
)
|
|
if charged + reserved + amount > policy.monthly_limit:
|
|
raise ValueError(f"团队本月额度超限:上限 ¥{policy.monthly_limit}")
|
|
if policy.project_limit is not None and project is not None:
|
|
p_charged = (
|
|
CreditLedger.objects.filter(team=team, project=project, ledger_type=CreditLedger.Type.CHARGE)
|
|
.aggregate(s=Sum("amount"))["s"] or Decimal("0")
|
|
)
|
|
p_reserved = (
|
|
CreditReservation.objects.filter(team=team, project=project, status=CreditReservation.Status.ACTIVE)
|
|
.aggregate(s=Sum("amount"))["s"] or Decimal("0")
|
|
)
|
|
if p_charged + p_reserved + amount > policy.project_limit:
|
|
raise ValueError(f"项目额度超限:上限 ¥{policy.project_limit}")
|
|
|
|
|
|
@transaction.atomic
|
|
def adjust_credit(*, team, amount: Decimal, reason: str = "", operator=None) -> CreditLedger:
|
|
"""平台超管手动调额(争议 / 补偿)。amount 可正可负;落 ADJUSTMENT 流水并更新余额。
|
|
调额后余额不得为负(否则拒绝)。"""
|
|
account, _ = CreditAccount.objects.select_for_update().get_or_create(team=team)
|
|
new_balance = account.balance + amount
|
|
if new_balance < 0:
|
|
raise ValueError("调额后余额为负,已拒绝")
|
|
account.balance = new_balance
|
|
account.save(update_fields=["balance", "updated_at"])
|
|
return CreditLedger.objects.create(
|
|
team=team,
|
|
user=operator,
|
|
ledger_type=CreditLedger.Type.ADJUSTMENT,
|
|
amount=amount,
|
|
balance_after=new_balance,
|
|
reason=reason or "平台手动调额",
|
|
metadata={"kind": "admin_adjust"},
|
|
)
|
|
|
|
|
|
@transaction.atomic
|
|
def reserve_credit(*, team, user, task, amount: Decimal) -> CreditReservation:
|
|
account, _ = CreditAccount.objects.select_for_update().get_or_create(team=team)
|
|
available = account.balance - account.reserved_balance
|
|
if available < amount:
|
|
raise ValueError("insufficient credit")
|
|
_enforce_member_monthly_limit(team=team, user=user, amount=amount)
|
|
_enforce_quota_policy(team=team, project=task.project, amount=amount)
|
|
|
|
account.reserved_balance += amount
|
|
account.save(update_fields=["reserved_balance", "updated_at"])
|
|
reservation = CreditReservation.objects.create(
|
|
team=team,
|
|
user=user,
|
|
project=task.project,
|
|
task=task,
|
|
amount=amount,
|
|
)
|
|
CreditLedger.objects.create(
|
|
team=team,
|
|
user=user,
|
|
project=task.project,
|
|
task=task,
|
|
ledger_type=CreditLedger.Type.RESERVE,
|
|
amount=amount,
|
|
balance_after=account.balance,
|
|
reason="AI 任务预扣额度",
|
|
)
|
|
return reservation
|
|
|
|
|
|
@transaction.atomic
|
|
def release_credit(*, reservation: CreditReservation, reason: str = "") -> None:
|
|
account = CreditAccount.objects.select_for_update().get(team=reservation.team)
|
|
# 锁内重读:与 charge 同款竞态——并发双 release(或 charge+release 交错)用陈旧快照都看到 ACTIVE,
|
|
# reserved_balance 会被减两次直接记坏账。已终态(已扣/已释放)→ 幂等返回。
|
|
reservation = CreditReservation.objects.select_for_update().get(id=reservation.id)
|
|
if reservation.status != CreditReservation.Status.ACTIVE:
|
|
return
|
|
|
|
account.reserved_balance -= reservation.amount
|
|
account.save(update_fields=["reserved_balance", "updated_at"])
|
|
reservation.status = CreditReservation.Status.RELEASED
|
|
reservation.save(update_fields=["status", "updated_at"])
|
|
CreditLedger.objects.create(
|
|
team=reservation.team,
|
|
user=reservation.user,
|
|
project=reservation.project,
|
|
task=reservation.task,
|
|
ledger_type=CreditLedger.Type.RELEASE,
|
|
amount=reservation.amount,
|
|
balance_after=account.balance,
|
|
reason=reason or "释放预留额度",
|
|
)
|
|
|
|
|
|
@transaction.atomic
|
|
def charge_reserved_credit(*, reservation: CreditReservation, actual_amount: Decimal) -> None:
|
|
account = CreditAccount.objects.select_for_update().get(team=reservation.team)
|
|
# 锁内重读 reservation:调用方传入的可能是并发竞态下的陈旧快照(双方都看到 ACTIVE),
|
|
# 旧实现会对同一笔预留扣两次费(实测同秒两条 charge 流水)。已扣费 → 幂等直接返回。
|
|
reservation = CreditReservation.objects.select_for_update().get(id=reservation.id)
|
|
if reservation.status == CreditReservation.Status.CHARGED:
|
|
return
|
|
if reservation.status != CreditReservation.Status.ACTIVE:
|
|
raise ValueError("reservation is not active")
|
|
if actual_amount > reservation.amount:
|
|
raise ValueError("actual amount exceeds reserved amount")
|
|
|
|
account.balance -= actual_amount
|
|
account.reserved_balance -= reservation.amount
|
|
account.save(update_fields=["balance", "reserved_balance", "updated_at"])
|
|
reservation.status = CreditReservation.Status.CHARGED
|
|
reservation.save(update_fields=["status", "updated_at"])
|
|
CreditLedger.objects.create(
|
|
team=reservation.team,
|
|
user=reservation.user,
|
|
project=reservation.project,
|
|
task=reservation.task,
|
|
ledger_type=CreditLedger.Type.CHARGE,
|
|
amount=actual_amount,
|
|
balance_after=account.balance,
|
|
reason="AI 任务扣费",
|
|
)
|
|
if reservation.amount > actual_amount:
|
|
CreditLedger.objects.create(
|
|
team=reservation.team,
|
|
user=reservation.user,
|
|
project=reservation.project,
|
|
task=reservation.task,
|
|
ledger_type=CreditLedger.Type.RELEASE,
|
|
amount=reservation.amount - actual_amount,
|
|
balance_after=account.balance,
|
|
reason="释放未用预留额度",
|
|
)
|
|
|