feat(fulfillment): 支持手动同步斗鱼外部单协作
This commit is contained in:
@@ -39,7 +39,7 @@ TESTS_DIR = Path(__file__).resolve().parent
|
||||
PROJECT_ROOT = TESTS_DIR.parent
|
||||
VERSIONS_DIR = PROJECT_ROOT / "web" / "backend" / "migrations" / "versions"
|
||||
|
||||
HEAD_REVISION = "20261118_0093"
|
||||
HEAD_REVISION = "20261118_0094"
|
||||
|
||||
# 迁移新增、但不声明在模型里的复合查询索引。
|
||||
EXTRA_INDEXES = (
|
||||
|
||||
@@ -16,6 +16,7 @@ from web.backend.models import (
|
||||
AccountEvent,
|
||||
AccountLease,
|
||||
AutomationJob,
|
||||
DouyuExternalOrder,
|
||||
DouyuGoodsSnapshot,
|
||||
DouyuTask,
|
||||
IntegrationOutbox,
|
||||
@@ -25,6 +26,8 @@ from web.backend.models import (
|
||||
PlatformFulfillmentTask,
|
||||
User,
|
||||
)
|
||||
from web.backend.schemas import DouyuCollabOrderOut
|
||||
from web.backend.services import douyu_collab_service as collab
|
||||
from web.backend.services.automation.jobs import (
|
||||
platform_fulfillment_lease_reaper as reaper,
|
||||
)
|
||||
@@ -438,6 +441,247 @@ class TestSyncAndMapping(_Base):
|
||||
assert task.required_points == 1280
|
||||
|
||||
|
||||
class TestFulfillmentCollabSync(_Base):
|
||||
def _task_with_account(
|
||||
self,
|
||||
*,
|
||||
execution_status: str = "ready",
|
||||
) -> PlatformFulfillmentTask:
|
||||
task = self.task()
|
||||
account = self.account("collab-sync-account")
|
||||
task.account_id = account.id
|
||||
task.execution_status = execution_status
|
||||
self.session.commit()
|
||||
return task
|
||||
|
||||
def test_manual_sync_creates_projected_collab_order(self):
|
||||
task = self._task_with_account()
|
||||
mapping = self.session.query(PlatformCommodityMapping).one()
|
||||
mapping.goods_name = "套装-兔兔白日梦(斗鱼)"
|
||||
self.session.add(
|
||||
DouyuGoodsSnapshot(
|
||||
commodity_id=COMMODITY,
|
||||
name="不应覆盖显式映射",
|
||||
score=999,
|
||||
)
|
||||
)
|
||||
bind_task = DouyuTask(
|
||||
batch_id="collab-sync-bind",
|
||||
account_id=task.account_id,
|
||||
task_type="get_bind_qr",
|
||||
handbook_scope="elite",
|
||||
status="success",
|
||||
result={
|
||||
"role_name": "已确认角色",
|
||||
"bind_confirmed": True,
|
||||
"area_name": "微信",
|
||||
"plat_name": "苹果(iOS)",
|
||||
},
|
||||
created_by=self.admin_id,
|
||||
)
|
||||
self.session.add(bind_task)
|
||||
self.session.flush()
|
||||
task.bind_task_id = bind_task.id
|
||||
self.session.commit()
|
||||
|
||||
order, action = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
|
||||
assert action == "created"
|
||||
assert order.order_no == f"PF{task.id}"
|
||||
assert order.source_type == "platform_fulfillment"
|
||||
assert order.source_task_id == task.id
|
||||
assert order.source_order_id == task.source_order_id
|
||||
assert order.source_order_item_id == task.source_order_item_id
|
||||
assert order.source_platform_order_id == task.platform_order_id
|
||||
assert order.last_synced_at is not None
|
||||
assert order.shop == task.shop_name
|
||||
assert order.gift_name == "套装-兔兔白日梦(斗鱼)"
|
||||
assert order.commodity_id == COMMODITY
|
||||
assert order.required_points == 1280
|
||||
assert order.account_id == task.account_id
|
||||
assert order.account_username == "collab-sync-account"
|
||||
assert order.bind_game_role == "已确认角色"
|
||||
assert order.bind_game_channel == "微信 / 苹果(iOS)"
|
||||
assert order.status == collab.STATUS_INCOMPLETE
|
||||
payload = DouyuCollabOrderOut.model_validate(
|
||||
collab.serialize_one(self.session, order)
|
||||
).model_dump()
|
||||
assert payload["source_task_id"] == task.id
|
||||
assert payload["source_platform_order_id"] == task.platform_order_id
|
||||
assert (
|
||||
self.session.query(AccountEvent)
|
||||
.filter(AccountEvent.event_type == "collab_synced")
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
|
||||
def test_manual_sync_does_not_clear_account_added_in_collab(self):
|
||||
task = self.task()
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
account = self.account("manual-collab-account")
|
||||
order.account_id = account.id
|
||||
order.account_username = account.username
|
||||
self.session.commit()
|
||||
|
||||
synced, _ = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
|
||||
assert synced.account_id == account.id
|
||||
assert synced.account_username == account.username
|
||||
|
||||
def test_manual_sync_is_idempotent_and_preserves_human_fields(self):
|
||||
task = self._task_with_account()
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
other_owner = User(
|
||||
username="collab-owner",
|
||||
password_hash="h",
|
||||
role="operator",
|
||||
)
|
||||
self.session.add(other_owner)
|
||||
self.session.commit()
|
||||
order.owner_id = other_owner.id
|
||||
order.fish_fin_balance = 321
|
||||
order.points_balance = 654
|
||||
order.points_check_message = "人工核账快照"
|
||||
order.remark = "客服人工备注"
|
||||
self.session.commit()
|
||||
|
||||
synced, action = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
|
||||
assert action == "updated"
|
||||
assert self.session.query(DouyuExternalOrder).count() == 1
|
||||
assert synced.id == order.id
|
||||
assert synced.owner_id == other_owner.id
|
||||
assert synced.fish_fin_balance == 321
|
||||
assert synced.points_balance == 654
|
||||
assert synced.points_check_message == "人工核账快照"
|
||||
assert synced.remark == "客服人工备注"
|
||||
|
||||
def test_manual_sync_maps_only_safe_terminal_statuses(self):
|
||||
task = self._task_with_account()
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
order.status = collab.STATUS_TO_RECHARGE
|
||||
self.session.commit()
|
||||
|
||||
task.execution_status = "completed"
|
||||
task.completed_at = NOW
|
||||
self.session.commit()
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
assert order.status == collab.STATUS_DONE
|
||||
assert order.done_at == NOW
|
||||
|
||||
cancelled = PlatformFulfillmentTask(
|
||||
source_system="order_site",
|
||||
source_order_id="200",
|
||||
source_order_item_id="201",
|
||||
source_fulfillment_id="301",
|
||||
platform_order_id="ORDER-201",
|
||||
sku_code=INTERNAL_SKU,
|
||||
sku_name=INTERNAL_SKU,
|
||||
internal_sku_key=INTERNAL_SKU,
|
||||
commodity_mapping_id=task.commodity_mapping_id,
|
||||
commodity_id=COMMODITY,
|
||||
required_points=1280,
|
||||
execution_status="cancelled",
|
||||
paid_at=NOW,
|
||||
created_at=NOW,
|
||||
updated_at=NOW,
|
||||
)
|
||||
self.session.add(cancelled)
|
||||
self.session.commit()
|
||||
cancelled_order, action = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
cancelled,
|
||||
)
|
||||
assert action == "created"
|
||||
assert cancelled_order.status == collab.STATUS_VOID
|
||||
assert cancelled_order.void_reason == "直播履约任务已取消"
|
||||
|
||||
def test_manual_sync_batch_reports_created_and_missing(self):
|
||||
first = self.task()
|
||||
second = PlatformFulfillmentTask(
|
||||
source_system="order_site",
|
||||
source_order_id="300",
|
||||
source_order_item_id="301",
|
||||
source_fulfillment_id="401",
|
||||
platform_order_id="ORDER-301",
|
||||
sku_code=INTERNAL_SKU,
|
||||
sku_name=INTERNAL_SKU,
|
||||
internal_sku_key=INTERNAL_SKU,
|
||||
commodity_mapping_id=first.commodity_mapping_id,
|
||||
commodity_id=COMMODITY,
|
||||
required_points=1280,
|
||||
execution_status="ready",
|
||||
paid_at=NOW,
|
||||
created_at=NOW,
|
||||
updated_at=NOW,
|
||||
)
|
||||
self.session.add(second)
|
||||
self.session.commit()
|
||||
|
||||
result = collab.sync_platform_fulfillment_orders(
|
||||
self.session,
|
||||
self.admin,
|
||||
task_ids=[first.id, second.id, 99999999],
|
||||
)
|
||||
|
||||
assert result["requested"] == 3
|
||||
assert result["created"] == 2
|
||||
assert result["updated"] == 0
|
||||
assert result["skipped"] == 1
|
||||
assert result["failed"] == 0
|
||||
assert [item["action"] for item in result["items"]] == [
|
||||
"created",
|
||||
"created",
|
||||
"skipped",
|
||||
]
|
||||
|
||||
def test_task_list_exposes_linked_collab_order(self):
|
||||
task = self._task_with_account()
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
|
||||
listed = service.list_tasks(self.session)
|
||||
|
||||
assert listed["items"][0]["collabOrder"] == {
|
||||
"id": order.id,
|
||||
"orderNo": order.order_no,
|
||||
"status": collab.STATUS_INCOMPLETE,
|
||||
"lastSyncedAt": order.last_synced_at,
|
||||
}
|
||||
|
||||
|
||||
class TestSnapshotSync(_Base):
|
||||
def snapshot(self, **overrides):
|
||||
payload = {
|
||||
|
||||
Reference in New Issue
Block a user