fix(fulfillment): 仅同步已映射订单

This commit is contained in:
yml
2026-11-18 12:05:28 +08:00
parent 509a6eecb3
commit 27da489b79
4 changed files with 171 additions and 42 deletions
+17
View File
@@ -148,6 +148,10 @@ class TestUrlNormalization:
url = "postgresql://u:p@h:5432/db"
assert src._normalize_url(url) == "postgresql+psycopg://u:p@h:5432/db"
def test_bare_postgres_url_gets_driver(self):
url = "postgres://u:p@h:5432/db"
assert src._normalize_url(url) == "postgresql+psycopg://u:p@h:5432/db"
def test_url_with_driver_is_untouched(self):
url = "postgresql+psycopg://u:p@h:5432/db"
assert src._normalize_url(url) == url
@@ -171,6 +175,19 @@ class TestDegradation:
with pytest.raises(src.OrderLookupUnavailable):
src.lookup_order(" ")
def test_empty_pending_sku_filter_skips_external_lookup(self, monkeypatch):
monkeypatch.setenv("ORDER_SITE_DATABASE_URL", "postgresql://u:p@h:5432/db")
monkeypatch.setenv("ORDER_SITE_LOOKUP_ENABLED", "true")
monkeypatch.setattr(
src,
"_get_engine",
lambda: (_ for _ in ()).throw(
AssertionError("没有 SKU 白名单时不应连接 order_site")
),
)
assert src.list_pending_manual_fulfillments(internal_sku_keys=[]) == []
class TestCacheRoundTrip:
"""缓存读写:命中未过期快照就不查外部。"""
+61 -31
View File
@@ -148,46 +148,32 @@ class _Base:
class TestSyncAndMapping(_Base):
def test_sync_creates_pending_mapping_task(self, monkeypatch):
def test_sync_skips_external_orders_when_no_mapping_is_configured(
self, monkeypatch
):
monkeypatch.setattr(
service,
"list_pending_manual_fulfillments",
lambda limit: [
{
"source_system": "order_site",
"source_order_id": "100",
"source_order_item_id": "101",
"source_fulfillment_id": "201",
"platform_order_id": "ORDER-101",
"provider": "91kaquan",
"shop_id": "shop-1",
"shop_name": "测试店",
"sku_code": INTERNAL_SKU,
"sku_name": INTERNAL_SKU,
"internal_sku_key": INTERNAL_SKU,
"quantity": 1,
"revenue_amount_fen": 9900,
"total_amount": 9900,
"paid_at": NOW,
"item_updated_at": NOW,
}
],
lambda **_kwargs: (_ for _ in ()).throw(
AssertionError("没有映射时不应查询 order_site")
),
)
result = service.sync_pending_tasks(self.session, limit=10)
assert result["created"] == 1
task = self.session.query(PlatformFulfillmentTask).one()
assert task.execution_status == "pending_mapping"
assert task.internal_sku_key == INTERNAL_SKU
assert task.order_amount_fen == 9900
assert result["fetched"] == 0
assert result["created"] == 0
assert result["configuredSkuCount"] == 0
assert self.session.query(PlatformFulfillmentTask).count() == 0
def test_sync_is_idempotent_and_applies_mapping(self, monkeypatch):
self.mapping()
monkeypatch.setattr(
service,
"list_pending_manual_fulfillments",
lambda limit: [
captured_keys: list[str] = []
def _rows(*, limit: int, internal_sku_keys: list[str]):
del limit
captured_keys.extend(internal_sku_keys)
return [
{
"source_order_id": "100",
"source_order_item_id": "101",
@@ -205,7 +191,12 @@ class TestSyncAndMapping(_Base):
"paid_at": NOW,
"item_updated_at": NOW,
}
],
]
monkeypatch.setattr(
service,
"list_pending_manual_fulfillments",
_rows,
)
first = service.sync_pending_tasks(self.session, limit=10)
@@ -213,11 +204,50 @@ class TestSyncAndMapping(_Base):
assert first["created"] == 1
assert second["created"] == 0
assert captured_keys == [INTERNAL_SKU, INTERNAL_SKU]
assert self.session.query(PlatformFulfillmentTask).count() == 1
task = self.session.query(PlatformFulfillmentTask).one()
assert task.execution_status == "ready"
assert task.commodity_id == COMMODITY
def test_list_only_returns_tasks_that_have_a_commodity_mapping(self):
legacy = self.task(mapped=False)
mapping = self.mapping()
mapped = PlatformFulfillmentTask(
source_system="order_site",
source_order_id="102",
source_order_item_id="103",
source_fulfillment_id="203",
platform_order_id="ORDER-103",
provider="91kaquan",
shop_id="shop-1",
shop_name="测试店",
sku_code=INTERNAL_SKU,
sku_name=INTERNAL_SKU,
internal_sku_key=INTERNAL_SKU,
quantity=1,
order_amount_fen=9900,
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",
source_snapshot_json={"order_no": "ORDER-103"},
created_at=NOW,
updated_at=NOW,
)
self.session.add(mapped)
self.session.commit()
listed = service.list_tasks(self.session)
assert [item["id"] for item in listed["items"]] == [mapped.id]
assert listed["pagination"]["total"] == 1
assert legacy.id != mapped.id
def test_upsert_mapping_advances_existing_task(self):
task = self.task(mapped=False)
self.session.add(