feat(fulfillment): 增加取消恢复与操作人审计

This commit is contained in:
yml
2026-11-18 21:40:25 +08:00
parent 7a11be3885
commit e90e93d515
9 changed files with 424 additions and 7 deletions
+154
View File
@@ -10,6 +10,7 @@ import pytest
from fastapi import HTTPException
from tests.support.db import get_test_engine, make_test_session
from web.backend.deps import require_permission
from web.backend.models import (
Account,
AccountCommodityState,
@@ -26,6 +27,7 @@ from web.backend.models import (
PlatformFulfillmentTask,
User,
)
from web.backend.permissions import ROLE_PERMISSIONS
from web.backend.schemas import DouyuCollabOrderOut
from web.backend.services import douyu_collab_service as collab
from web.backend.services.automation.jobs import (
@@ -1343,6 +1345,150 @@ class TestBindingAndCompletion(_Base):
assert exc_info.value.status_code == 409
assert "仍在执行" in str(exc_info.value.detail)
def test_cancel_permission_excludes_support(self):
assert "platform_fulfillment:cancel" in ROLE_PERMISSIONS["operation"]
assert "platform_fulfillment:cancel" in ROLE_PERMISSIONS["super_admin"]
assert "platform_fulfillment:cancel" not in ROLE_PERMISSIONS["support"]
assert "platform_fulfillment:view" in ROLE_PERMISSIONS["support"]
assert "platform_fulfillment:use" in ROLE_PERMISSIONS["support"]
checker = require_permission("platform_fulfillment:cancel")
support = User(
username="cancel-support",
password_hash="h",
role="support",
is_active=True,
)
operator = User(
username="cancel-operator",
password_hash="h",
role="operation",
is_active=True,
)
with pytest.raises(HTTPException) as exc_info:
checker(current_user=support)
assert exc_info.value.status_code == 403
assert checker(current_user=operator) is operator
def test_restore_permission_is_super_admin_only(self):
assert "platform_fulfillment:restore" in ROLE_PERMISSIONS["super_admin"]
assert "platform_fulfillment:restore" not in ROLE_PERMISSIONS["operation"]
assert "platform_fulfillment:restore" not in ROLE_PERMISSIONS["support"]
checker = require_permission("platform_fulfillment:restore")
operator = User(
username="restore-operator",
password_hash="h",
role="operation",
is_active=True,
)
admin = User(
username="restore-admin",
password_hash="h",
role="super_admin",
is_active=True,
)
with pytest.raises(HTTPException) as exc_info:
checker(current_user=operator)
assert exc_info.value.status_code == 403
assert checker(current_user=admin) is admin
def test_restore_manual_cancel_requeues_task_and_restores_collab(
self, monkeypatch
):
task = self.task()
service.cancel_task(
self.session,
task_id=task.id,
current=self.admin,
reason="客服误点取消",
)
collab_order = DouyuExternalOrder(
order_no=task.platform_order_id,
source_type="platform_fulfillment",
source_task_id=task.id,
status="void",
void_reason="直播履约任务已取消",
)
self.session.add(collab_order)
self.session.commit()
monkeypatch.setattr(
service,
"lookup_pending_manual_fulfillment",
lambda _item_id: {
"order_status": "paid",
"pay_status": "paid",
"fulfillment_issue_code": "",
},
)
detail = service.restore_cancelled_task(
self.session,
task_id=task.id,
current=self.admin,
reason="核对订单仍有效,恢复误取消任务",
)
self.session.refresh(task)
self.session.refresh(collab_order)
assert detail["task"]["executionStatus"] == "ready"
assert task.account_id is None
assert task.lease_id is None
assert task.next_allocate_at is not None
assert collab_order.status == "incomplete"
assert collab_order.void_reason == ""
restored = next(
event for event in detail["events"] if event["eventType"] == "task_restored"
)
assert restored["actorName"] == "pf-admin"
assert restored["detail"]["reason"] == "核对订单仍有效,恢复误取消任务"
def test_restore_rejects_source_cancelled_task(self):
task = self.task()
task.execution_status = "cancelled"
task.issue_code = "source_cancelled"
self.session.commit()
with pytest.raises(HTTPException) as exc_info:
service.restore_cancelled_task(
self.session,
task_id=task.id,
current=self.admin,
reason="尝试恢复来源取消任务",
)
assert exc_info.value.status_code == 409
assert "来源订单已取消" in str(exc_info.value.detail)
def test_restore_rejects_terminal_source_order(self, monkeypatch):
task = self.task()
service.cancel_task(
self.session,
task_id=task.id,
current=self.admin,
reason="客服误点取消",
)
monkeypatch.setattr(
service,
"lookup_pending_manual_fulfillment",
lambda _item_id: {
"order_status": "refunded",
"pay_status": "paid",
"fulfillment_issue_code": "",
},
)
with pytest.raises(HTTPException) as exc_info:
service.restore_cancelled_task(
self.session,
task_id=task.id,
current=self.admin,
reason="核对订单是否可恢复",
)
assert exc_info.value.status_code == 409
assert "不能恢复" in str(exc_info.value.detail)
def test_cancel_releases_account_and_terminal_state_cannot_be_refreshed_back(
self, monkeypatch
):
@@ -1384,6 +1530,14 @@ class TestBindingAndCompletion(_Base):
self.session.refresh(bind_task)
lease = self.session.query(AccountLease).filter_by(id=lease_id).one()
assert detail["task"]["executionStatus"] == "cancelled"
cancel_event = next(
event
for event in detail["events"]
if event["eventType"] == "task_cancelled"
)
assert cancel_event["actorName"] == "pf-admin"
assert cancel_event["actorRole"] == "super_admin"
assert cancel_event["actorRoleLabel"] == "超级管理员"
assert task.account_id is None
assert task.lease_id is None
assert task.bind_task_id is None