feat(billing): 计费商业化重构(积分制)+ 团队差异化调价
统一计价引擎 apps/billing/pricing.py:1积分=¥0.1,平台成本(¥)与用户价(积分)双记账, 视频按火山真实 usage.total_tokens 结算(true-up,终结¥1/段倒贴)+ 首发×1.5毛利系数。 Team.price_multiplier 差异化调价(jimeng同款):挂牌价×系数两步HALF_UP取整,视频类 按下单时的价格/汇率快照结算(中途改配不影响在途任务)。 BillingConfig 单例(汇率/毛利系数/预留buffer,admin可调即刻生效)。存量数据 ×10 rescale 迁移(RunPython+atomic,MySQL 迁移不可中断重跑)。开户赠送归零(DEFAULT_TRIAL_CREDITS=0, 商业决策)。audit_billing 加 I9(卖亏审计)。271 条测试 + tsc/build 全绿。 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -18,6 +18,8 @@ class Project(TeamOwnedModel):
|
||||
product = models.ForeignKey("products.Product", on_delete=models.PROTECT, related_name="projects")
|
||||
status = models.CharField(max_length=32, choices=Status.choices, default=Status.DRAFT)
|
||||
current_stage = models.CharField(max_length=32, default="script")
|
||||
# ⚠️ 废弃休眠字段:从未有过写入路径与运行语义,单位未定义(积分制 rescale 有意未缩放它)。
|
||||
# 勿接入额度管控/展示;项目级限额请用 QuotaPolicy.project_limit。留列仅为免迁移。
|
||||
budget_limit = models.DecimalField(max_digits=12, decimal_places=2, null=True, blank=True)
|
||||
failure_reason = models.TextField(blank=True)
|
||||
metadata = models.JSONField(default=dict, blank=True)
|
||||
|
||||
@@ -1030,3 +1030,87 @@ class AttachOfficialModelTests(TestCase):
|
||||
self.assertEqual((group.metadata or {}).get("adopt"), "adopted") # 自动采用
|
||||
sub.assert_called_once() # 自动送审(on_commit 在 TestCase 事务提交点触发)
|
||||
self.assertEqual(sub.call_args.args[0].id, mine.id)
|
||||
|
||||
|
||||
class VideoSegmentTrueUpTests(TestCase):
|
||||
"""pipeline 视频段积分计价 + 按火山真实 usage.total_tokens 结算(true-up)。
|
||||
终结「视频 ¥1/段、成本 ¥15」的倒贴定价:预留=预估积分×buffer,终态按实结算、差额自动 RELEASE。"""
|
||||
|
||||
def setUp(self):
|
||||
from decimal import Decimal
|
||||
|
||||
self.user = User.objects.create_user(username="tu-owner", password="p")
|
||||
self.team = Team.objects.create(name="TU", owner=self.user)
|
||||
TeamMember.objects.create(team=self.team, user=self.user, role=TeamMember.Role.OWNER)
|
||||
CreditAccount.objects.create(team=self.team, balance=Decimal("10000.0000"))
|
||||
self.product = Product.objects.create(team=self.team, created_by=self.user, title="P")
|
||||
self.project = Project.objects.create(team=self.team, created_by=self.user, product=self.product, name="TU-P")
|
||||
self.segment = VideoSegment.objects.create(project=self.project, sort_order=0, target_duration_seconds=15)
|
||||
self.provider = patch("apps.ai.services.build_provider").start().return_value
|
||||
self.provider.create_video_task.return_value = {"id": "ark-tu-1", "status": "queued"}
|
||||
self.addCleanup(patch.stopall)
|
||||
|
||||
def _submit(self):
|
||||
from apps.ai.services import submit_video_segment
|
||||
|
||||
submit_video_segment(video_segment=self.segment, user=self.user, prompt="测试")
|
||||
return AITask.objects.get(team=self.team, task_type=AITask.Type.VIDEO_SEGMENT)
|
||||
|
||||
def test_submit_prices_by_tokens_with_buffer(self):
|
||||
from apps.billing.pricing import quote_video_estimate, video_reserve_amount
|
||||
|
||||
task = self._submit()
|
||||
model = task.model_config
|
||||
tokens, quote = quote_video_estimate(model, aspect_ratio="9:16", resolution="720p", duration=15, references=[])
|
||||
self.assertEqual(task.estimated_cost, quote.points)
|
||||
self.assertEqual(task.base_cost, quote.base_cost_yuan)
|
||||
self.assertGreater(quote.points, 100) # 告别 ¥1/段:15s 720p 竖屏应是三位数积分
|
||||
self.assertEqual(task.credit_reservation.amount, video_reserve_amount(quote.points))
|
||||
self.assertEqual(task.request_payload["estimated_tokens"], tokens)
|
||||
|
||||
@patch("apps.ai.services._store_generated_media")
|
||||
def test_poll_settles_by_actual_usage_tokens(self, store):
|
||||
from decimal import Decimal
|
||||
|
||||
from apps.ai.services import poll_video_segment
|
||||
from apps.billing.pricing import quote_video_actual
|
||||
|
||||
task = self._submit()
|
||||
store.return_value = Asset.objects.create(
|
||||
team=self.team, created_by=self.user, name="clip",
|
||||
asset_type=Asset.Type.VIDEO, source=Asset.Source.AI_GENERATED, category=Asset.Category.VIDEO_CLIP,
|
||||
)
|
||||
self.provider.poll_video_task.return_value = {
|
||||
"status": "succeeded",
|
||||
"usage": {"total_tokens": 300000},
|
||||
"content": {"video_url": "http://x/v.mp4"},
|
||||
}
|
||||
self.provider.extract_first_media_url.return_value = "http://x/v.mp4"
|
||||
poll_video_segment(video_segment=self.segment, user=self.user)
|
||||
task.refresh_from_db()
|
||||
settle = quote_video_actual(task.model_config, tokens=300000, with_video_ref=False, resolution="720p")
|
||||
self.assertEqual(task.status, AITask.Status.SUCCEEDED)
|
||||
self.assertEqual(task.actual_cost, settle.points)
|
||||
self.assertEqual(task.base_cost, settle.base_cost_yuan)
|
||||
# 真实 tokens(30万) < 预估(32.4万):实扣 < 预留,charge 自动 RELEASE 差额,冻结清零
|
||||
account = CreditAccount.objects.get(team=self.team)
|
||||
self.assertEqual(account.reserved_balance, Decimal("0"))
|
||||
self.assertEqual(account.balance, Decimal("10000.0000") - settle.points)
|
||||
charges = CreditLedger.objects.filter(task=task, ledger_type=CreditLedger.Type.CHARGE)
|
||||
self.assertEqual(charges.count(), 1)
|
||||
self.assertEqual(charges.first().amount, settle.points)
|
||||
|
||||
@patch("apps.ai.services._store_generated_media")
|
||||
def test_poll_falls_back_to_estimate_when_usage_missing(self, store):
|
||||
from apps.ai.services import poll_video_segment
|
||||
|
||||
task = self._submit()
|
||||
store.return_value = Asset.objects.create(
|
||||
team=self.team, created_by=self.user, name="clip2",
|
||||
asset_type=Asset.Type.VIDEO, source=Asset.Source.AI_GENERATED, category=Asset.Category.VIDEO_CLIP,
|
||||
)
|
||||
self.provider.poll_video_task.return_value = {"status": "succeeded", "content": {"video_url": "http://x/v.mp4"}}
|
||||
self.provider.extract_first_media_url.return_value = "http://x/v.mp4"
|
||||
poll_video_segment(video_segment=self.segment, user=self.user)
|
||||
task.refresh_from_db()
|
||||
self.assertEqual(task.actual_cost, task.estimated_cost) # usage 缺失回落预估,不阻断出片
|
||||
|
||||
Reference in New Issue
Block a user