fix(fulfillment): 使用真实订单号并支持协作单跳转
This commit is contained in:
@@ -29,6 +29,7 @@ from web.backend.models import (
|
||||
AccountEvent,
|
||||
AccountLease,
|
||||
AuditLog,
|
||||
DouyuExternalOrder,
|
||||
HuyaExternalOrder,
|
||||
PlatformFulfillmentTask,
|
||||
User,
|
||||
@@ -39,7 +40,7 @@ TESTS_DIR = Path(__file__).resolve().parent
|
||||
PROJECT_ROOT = TESTS_DIR.parent
|
||||
VERSIONS_DIR = PROJECT_ROOT / "web" / "backend" / "migrations" / "versions"
|
||||
|
||||
HEAD_REVISION = "20261118_0094"
|
||||
HEAD_REVISION = "20261118_0095"
|
||||
|
||||
# 迁移新增、但不声明在模型里的复合查询索引。
|
||||
EXTRA_INDEXES = (
|
||||
@@ -684,3 +685,76 @@ class TestMigrationSmoke:
|
||||
mig_engine.dispose()
|
||||
with admin_engine.begin() as conn:
|
||||
conn.execute(text(f"DROP DATABASE IF EXISTS `{mig_db}`;"))
|
||||
|
||||
def test_0095_repairs_fulfillment_collab_order_numbers_safely(self):
|
||||
creds = get_mysql_credentials()
|
||||
mig_db = f"douyu_login_mig_{secrets.token_hex(4)}"
|
||||
mig_url = (
|
||||
f"mysql+pymysql://{quote_plus(creds['user'])}:{quote_plus(creds['password'])}"
|
||||
f"@{creds['host']}:{creds['port']}/{mig_db}?charset=utf8mb4"
|
||||
)
|
||||
|
||||
admin_engine = get_test_engine()
|
||||
with admin_engine.begin() as conn:
|
||||
conn.execute(
|
||||
text(
|
||||
f"CREATE DATABASE `{mig_db}` "
|
||||
"CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;"
|
||||
)
|
||||
)
|
||||
|
||||
original_url = database_module.DATABASE_URL
|
||||
mig_engine = create_engine(mig_url)
|
||||
try:
|
||||
database_module.DATABASE_URL = mig_url
|
||||
cfg = _migration_config()
|
||||
cfg.set_main_option("sqlalchemy.url", mig_url)
|
||||
command.upgrade(cfg, "20261118_0094")
|
||||
|
||||
with Session(mig_engine) as session:
|
||||
repaired_task = PlatformFulfillmentTask(
|
||||
source_order_id="MIG-0095",
|
||||
source_order_item_id="MIG-0095-REPAIR",
|
||||
platform_order_id="2632201749556255",
|
||||
)
|
||||
conflicted_task = PlatformFulfillmentTask(
|
||||
source_order_id="MIG-0095",
|
||||
source_order_item_id="MIG-0095-CONFLICT",
|
||||
platform_order_id="2632201749556256",
|
||||
)
|
||||
session.add_all([repaired_task, conflicted_task])
|
||||
session.flush()
|
||||
repaired = DouyuExternalOrder(
|
||||
order_no=f"PF{repaired_task.id}",
|
||||
source_type="platform_fulfillment",
|
||||
source_task_id=repaired_task.id,
|
||||
)
|
||||
conflicted = DouyuExternalOrder(
|
||||
order_no=f"PF{conflicted_task.id}",
|
||||
source_type="platform_fulfillment",
|
||||
source_task_id=conflicted_task.id,
|
||||
)
|
||||
manual_conflict = DouyuExternalOrder(
|
||||
order_no=conflicted_task.platform_order_id,
|
||||
source_type="manual",
|
||||
)
|
||||
session.add_all([repaired, conflicted, manual_conflict])
|
||||
session.commit()
|
||||
repaired_id = repaired.id
|
||||
conflicted_id = conflicted.id
|
||||
|
||||
command.upgrade(cfg, "head")
|
||||
|
||||
with Session(mig_engine) as session:
|
||||
repaired = session.get(DouyuExternalOrder, repaired_id)
|
||||
conflicted = session.get(DouyuExternalOrder, conflicted_id)
|
||||
assert repaired is not None
|
||||
assert repaired.order_no == "2632201749556255"
|
||||
assert repaired.source_platform_order_id == "2632201749556255"
|
||||
assert conflicted is not None
|
||||
assert conflicted.order_no == f"PF{conflicted.source_task_id}"
|
||||
finally:
|
||||
database_module.DATABASE_URL = original_url
|
||||
mig_engine.dispose()
|
||||
with admin_engine.begin() as conn:
|
||||
conn.execute(text(f"DROP DATABASE IF EXISTS `{mig_db}`;"))
|
||||
|
||||
@@ -491,7 +491,7 @@ class TestFulfillmentCollabSync(_Base):
|
||||
)
|
||||
|
||||
assert action == "created"
|
||||
assert order.order_no == f"PF{task.id}"
|
||||
assert order.order_no == task.platform_order_id
|
||||
assert order.source_type == "platform_fulfillment"
|
||||
assert order.source_task_id == task.id
|
||||
assert order.source_order_id == task.source_order_id
|
||||
@@ -559,6 +559,7 @@ class TestFulfillmentCollabSync(_Base):
|
||||
order.points_balance = 654
|
||||
order.points_check_message = "人工核账快照"
|
||||
order.remark = "客服人工备注"
|
||||
order.order_no = f"PF{task.id}"
|
||||
self.session.commit()
|
||||
|
||||
synced, action = collab.sync_platform_fulfillment_order(
|
||||
@@ -570,12 +571,40 @@ class TestFulfillmentCollabSync(_Base):
|
||||
assert action == "updated"
|
||||
assert self.session.query(DouyuExternalOrder).count() == 1
|
||||
assert synced.id == order.id
|
||||
assert synced.order_no == task.platform_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_links_existing_collab_order_with_real_order_no(self):
|
||||
task = self.task()
|
||||
manual = DouyuExternalOrder(
|
||||
order_no=task.platform_order_id,
|
||||
shop="人工先建单",
|
||||
owner_id=self.admin.id,
|
||||
remark="人工备注保留",
|
||||
status="to_recharge",
|
||||
created_by=self.admin.id,
|
||||
updated_by=self.admin.id,
|
||||
)
|
||||
self.session.add(manual)
|
||||
self.session.commit()
|
||||
|
||||
synced, action = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
|
||||
assert action == "updated"
|
||||
assert synced.id == manual.id
|
||||
assert synced.order_no == task.platform_order_id
|
||||
assert synced.source_type == "platform_fulfillment"
|
||||
assert synced.source_task_id == task.id
|
||||
assert synced.remark == "人工备注保留"
|
||||
|
||||
def test_manual_sync_maps_only_safe_terminal_statuses(self):
|
||||
task = self._task_with_account()
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
|
||||
Reference in New Issue
Block a user