fix(fulfillment): 按支付时间过滤履约订单

This commit is contained in:
yml
2026-11-18 14:44:19 +08:00
parent 96fa9c7086
commit b7b09c90bd
9 changed files with 193 additions and 26 deletions
+46 -4
View File
@@ -148,6 +148,7 @@ class _Base:
execution_status="ready" if mapping else "pending_mapping",
exchange_status="not_started",
source_snapshot_json={"order_no": "ORDER-101"},
paid_at=NOW,
created_at=NOW,
updated_at=NOW,
)
@@ -227,6 +228,7 @@ class TestSyncAndMapping(_Base):
task = self.session.query(PlatformFulfillmentTask).one()
assert task.execution_status == "ready"
assert task.commodity_id == COMMODITY
assert task.paid_at == NOW
def test_list_only_returns_tasks_that_have_a_commodity_mapping(self):
legacy = self.task(mapped=False)
@@ -254,6 +256,7 @@ class TestSyncAndMapping(_Base):
execution_status="ready",
exchange_status="not_started",
source_snapshot_json={"order_no": "ORDER-103"},
paid_at=NOW,
created_at=NOW,
updated_at=NOW,
)
@@ -266,7 +269,7 @@ class TestSyncAndMapping(_Base):
assert listed["pagination"]["total"] == 1
assert legacy.id != mapped.id
def test_list_hides_tasks_created_before_order_match_cutoff(self):
def test_list_hides_tasks_paid_before_order_match_cutoff(self):
mapping = self.mapping()
task = PlatformFulfillmentTask(
source_system="order_site",
@@ -286,8 +289,9 @@ class TestSyncAndMapping(_Base):
binding_status="not_started",
execution_status="ready",
exchange_status="not_started",
created_at=NOW - timedelta(hours=2),
updated_at=NOW - timedelta(hours=2),
paid_at=NOW - timedelta(hours=2),
created_at=NOW,
updated_at=NOW,
)
self.session.add(task)
self.session.commit()
@@ -302,15 +306,53 @@ class TestSyncAndMapping(_Base):
assert listed["pagination"]["total"] == 0
def test_list_includes_recent_paid_task_created_before_order_match_cutoff(self):
mapping = self.mapping()
task = PlatformFulfillmentTask(
source_system="order_site",
source_order_id="106",
source_order_item_id="107",
source_fulfillment_id="207",
platform_order_id="ORDER-107",
sku_code=INTERNAL_SKU,
sku_name=INTERNAL_SKU,
internal_sku_key=INTERNAL_SKU,
quantity=1,
target_platform="douyu",
scope="elite",
commodity_mapping_id=mapping.id,
commodity_id=COMMODITY,
required_points=1280,
binding_status="not_started",
execution_status="ready",
exchange_status="not_started",
paid_at=NOW,
created_at=NOW - timedelta(hours=2),
updated_at=NOW,
)
self.session.add(task)
self.session.commit()
service.update_settings(
self.session,
lease_duration_minutes=None,
order_match_started_at=NOW - timedelta(hours=1),
current=self.admin,
)
listed = service.list_tasks(self.session)
assert [item["id"] for item in listed["items"]] == [task.id]
def test_customer_session_ignores_task_before_order_match_cutoff(
self,
monkeypatch,
):
task = self.task()
assert task.paid_at is not None
service.update_settings(
self.session,
lease_duration_minutes=None,
order_match_started_at=task.created_at + timedelta(minutes=1),
order_match_started_at=task.paid_at + timedelta(minutes=1),
current=self.admin,
)
monkeypatch.setattr(