From 7a11be3885663e0b3ff85fc0402e8745dcf8911c Mon Sep 17 00:00:00 2001 From: yml Date: Wed, 18 Nov 2026 21:12:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(fulfillment):=20=E4=BD=BF=E7=94=A8=E7=9C=9F?= =?UTF-8?q?=E5=AE=9E=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=B9=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8D=8F=E4=BD=9C=E5=8D=95=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_migrations.py | 76 +++++++++++++++++- tests/test_platform_fulfillment.py | 31 +++++++- ...0095_repair_fulfillment_collab_order_no.py | 49 ++++++++++++ web/backend/services/douyu_collab_service.py | 46 ++++++++--- web/frontend/src/pages/DouyuCollabPage.tsx | 43 ++++++++-- .../src/pages/PlatformFulfillmentPage.tsx | 78 +++++++++++++++---- 6 files changed, 286 insertions(+), 37 deletions(-) create mode 100644 web/backend/migrations/versions/20261118_0095_repair_fulfillment_collab_order_no.py diff --git a/tests/test_migrations.py b/tests/test_migrations.py index 6d1a631..388cf5a 100644 --- a/tests/test_migrations.py +++ b/tests/test_migrations.py @@ -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}`;")) diff --git a/tests/test_platform_fulfillment.py b/tests/test_platform_fulfillment.py index 357ff54..4247105 100644 --- a/tests/test_platform_fulfillment.py +++ b/tests/test_platform_fulfillment.py @@ -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( diff --git a/web/backend/migrations/versions/20261118_0095_repair_fulfillment_collab_order_no.py b/web/backend/migrations/versions/20261118_0095_repair_fulfillment_collab_order_no.py new file mode 100644 index 0000000..b4b69c8 --- /dev/null +++ b/web/backend/migrations/versions/20261118_0095_repair_fulfillment_collab_order_no.py @@ -0,0 +1,49 @@ +"""把已同步协作单的临时 PF 单号回填为真实平台订单号。 + +只回填平台订单号非空、长度符合列限制、且不会与现有协作单或其它履约任务 +撞号的记录。存在冲突的数据保持原样,后续手动同步会明确报冲突。 +""" + +from __future__ import annotations + +import sqlalchemy as sa +from alembic import op + +revision: str = "20261118_0095" +down_revision: str | None = "20261118_0094" +branch_labels: str | None = None +depends_on: str | None = None + + +def upgrade() -> None: + op.get_bind().execute( + sa.text( + """ + UPDATE douyu_external_orders AS orders + JOIN platform_fulfillment_tasks AS tasks + ON tasks.id = orders.source_task_id + JOIN ( + SELECT TRIM(platform_order_id) AS order_no + FROM platform_fulfillment_tasks + WHERE LENGTH(TRIM(platform_order_id)) BETWEEN 1 AND 64 + GROUP BY TRIM(platform_order_id) + HAVING COUNT(*) = 1 + ) AS unique_source + ON unique_source.order_no = TRIM(tasks.platform_order_id) + LEFT JOIN douyu_external_orders AS conflict + ON conflict.order_no = TRIM(tasks.platform_order_id) + AND conflict.id <> orders.id + SET orders.order_no = TRIM(tasks.platform_order_id), + orders.source_platform_order_id = TRIM(tasks.platform_order_id), + orders.updated_at = UTC_TIMESTAMP() + WHERE orders.source_type = 'platform_fulfillment' + AND orders.order_no <> TRIM(tasks.platform_order_id) + AND conflict.id IS NULL + """ + ) + ) + + +def downgrade() -> None: + # 临时 PF 单号没有保留,无法可靠恢复;业务上真实订单号才是正确来源。 + pass diff --git a/web/backend/services/douyu_collab_service.py b/web/backend/services/douyu_collab_service.py index e149c6b..21882eb 100644 --- a/web/backend/services/douyu_collab_service.py +++ b/web/backend/services/douyu_collab_service.py @@ -714,6 +714,19 @@ def _platform_fulfillment_gift( return name, commodity_id, required_points +def _platform_fulfillment_order_no(task: PlatformFulfillmentTask) -> str: + """外部协作单直接使用 order_site 的真实平台订单号。""" + order_no = _text(task.platform_order_id) + if not order_no: + raise CollabError("履约任务缺少平台订单号", code="platform_order_no_required") + if len(order_no) > 64: + raise CollabError( + "平台订单号超过协作单号长度限制", + code="platform_order_no_too_long", + ) + return order_no + + def _apply_platform_fulfillment_binding( db: Session, order: DouyuExternalOrder, @@ -785,7 +798,28 @@ def sync_platform_fulfillment_order( .filter(DouyuExternalOrder.source_task_id == task.id) .first() ) + order_no = _platform_fulfillment_order_no(task) created = order is None + order_by_no = ( + db.query(DouyuExternalOrder) + .filter(DouyuExternalOrder.order_no == order_no) + .first() + ) + if order is not None and order_by_no is not None and order_by_no.id != order.id: + raise CollabError( + f"平台订单号 {order_no} 已关联其他履约任务", + code="order_no_conflict", + ) + if order is None and order_by_no is not None: + if order_by_no.source_task_id not in (None, task.id): + raise CollabError( + f"平台订单号 {order_no} 已关联其他履约任务", + code="order_no_conflict", + ) + # 手工先建过同一真实订单号时,直接接管为来源单,保留人工字段。 + order = order_by_no + created = False + now = _now() account = ( db.query(Account).filter(Account.id == task.account_id).first() @@ -795,17 +829,6 @@ def sync_platform_fulfillment_order( gift_name, commodity_id, required_points = _platform_fulfillment_gift(db, task) if order is None: - order_no = f"PF{task.id}" - occupied = ( - db.query(DouyuExternalOrder) - .filter(DouyuExternalOrder.order_no == order_no) - .first() - ) - if occupied is not None: - raise CollabError( - f"协作单号 {order_no} 已被其他订单占用", - code="order_no_conflict", - ) order = DouyuExternalOrder( order_no=order_no, source_type=SOURCE_TYPE_PLATFORM_FULFILLMENT, @@ -819,6 +842,7 @@ def sync_platform_fulfillment_order( ) db.add(order) + order.order_no = order_no order.source_type = SOURCE_TYPE_PLATFORM_FULFILLMENT order.source_task_id = int(task.id) order.source_order_id = _text(task.source_order_id, max_length=64) diff --git a/web/frontend/src/pages/DouyuCollabPage.tsx b/web/frontend/src/pages/DouyuCollabPage.tsx index 07d3080..c4c7cd3 100644 --- a/web/frontend/src/pages/DouyuCollabPage.tsx +++ b/web/frontend/src/pages/DouyuCollabPage.tsx @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate, useSearchParams } from 'react-router-dom'; import { Alert, App, @@ -198,6 +198,7 @@ const EMPTY_FORM: OrderFormState = { export default function DouyuCollabPage() { const navigate = useNavigate(); + const [searchParams, setSearchParams] = useSearchParams(); const { modal } = App.useApp(); const { can, user } = usePermissions(); const canView = can('douyu:collab:view'); @@ -255,6 +256,8 @@ export default function DouyuCollabPage() { const [detailMetrics, setDetailMetrics] = useState([]); const [detailTimeline, setDetailTimeline] = useState([]); const [detailLoading, setDetailLoading] = useState(false); + const handledQueryOrderIdRef = useRef(0); + const queryOrderId = Number(searchParams.get('orderId') || 0); const [statusTarget, setStatusTarget] = useState(null); const [batchStatusOpen, setBatchStatusOpen] = useState(false); @@ -720,15 +723,20 @@ export default function DouyuCollabPage() { } }; - const openDetail = async (order: DouyuCollabOrder) => { - setDetail(order); + const openDetail = useCallback(async (target: DouyuCollabOrder | number) => { + const orderId = typeof target === 'number' ? target : target.id; + if (typeof target === 'number') { + setDetail(null); + } else { + setDetail(target); + } setDetailOpen(true); setDetailLoading(true); try { const [metrics, timeline, latest] = await Promise.all([ - douyuCollabApi.metrics(order.id), - douyuCollabApi.timeline(order.id), - douyuCollabApi.getOrder(order.id), + douyuCollabApi.metrics(orderId), + douyuCollabApi.timeline(orderId), + douyuCollabApi.getOrder(orderId), ]); setDetailMetrics(metrics); setDetailTimeline(timeline); @@ -738,7 +746,24 @@ export default function DouyuCollabPage() { } finally { setDetailLoading(false); } - }; + }, []); + + useEffect(() => { + if (!canView || !Number.isInteger(queryOrderId) || queryOrderId <= 0) return; + if (handledQueryOrderIdRef.current === queryOrderId) return; + handledQueryOrderIdRef.current = queryOrderId; + void openDetail(queryOrderId); + }, [canView, openDetail, queryOrderId]); + + const closeDetail = useCallback(() => { + setDetailOpen(false); + if (searchParams.has('orderId')) { + const next = new URLSearchParams(searchParams); + next.delete('orderId'); + setSearchParams(next, { replace: true }); + } + handledQueryOrderIdRef.current = 0; + }, [searchParams, setSearchParams]); const openStatus = (order: DouyuCollabOrder) => { setStatusTarget(order); @@ -2186,7 +2211,7 @@ export default function DouyuCollabPage() { setDetailOpen(false)} + onClose={closeDetail} width={760} extra={ detail && canEdit ? ( @@ -2323,6 +2348,8 @@ export default function DouyuCollabPage() { /> + ) : detailLoading ? ( + 加载中… ) : null} diff --git a/web/frontend/src/pages/PlatformFulfillmentPage.tsx b/web/frontend/src/pages/PlatformFulfillmentPage.tsx index 3c0ae99..234db72 100644 --- a/web/frontend/src/pages/PlatformFulfillmentPage.tsx +++ b/web/frontend/src/pages/PlatformFulfillmentPage.tsx @@ -1,4 +1,5 @@ import { useCallback, useEffect, useState } from 'react'; +import { useNavigate } from 'react-router-dom'; import dayjs from 'dayjs'; import type { Dayjs } from 'dayjs'; import { Alert, Button, Card, DatePicker, Descriptions, Drawer, Empty, Input, InputNumber, Modal, QRCode, Segmented, Select, Space, Switch, Table, Tabs, Tag, Timeline, Typography } from 'antd'; @@ -260,6 +261,7 @@ function canResetBinding(task: PlatformFulfillmentTask) { export default function PlatformFulfillmentPage() { const user = getUser(); + const navigate = useNavigate(); const { can } = usePermissions(user); const [status, setStatus] = useState(''); const [keyword, setKeyword] = useState(''); @@ -270,6 +272,7 @@ export default function PlatformFulfillmentPage() { const [loading, setLoading] = useState(false); const [syncing, setSyncing] = useState(false); const [collabSyncing, setCollabSyncing] = useState(false); + const [rowCollabSyncingId, setRowCollabSyncingId] = useState(null); const [selectedRowKeys, setSelectedRowKeys] = useState([]); const [selectedId, setSelectedId] = useState(null); const [detail, setDetail] = useState(null); @@ -398,16 +401,19 @@ export default function PlatformFulfillmentPage() { } }; - const syncCollab = async () => { - const taskIds = selectedRowKeys.map(Number).filter((value) => Number.isInteger(value)); - if (taskIds.length === 0) { - message.warning('请先勾选要同步的履约任务'); - return; + const performCollabSync = async (taskIds: number[], rowTaskId?: number) => { + if (rowTaskId) { + setRowCollabSyncingId(rowTaskId); + } else { + setCollabSyncing(true); } - setCollabSyncing(true); try { const result = await platformFulfillmentApi.syncCollab(taskIds); - const summary = `外部协作同步完成:新增 ${result.created},更新 ${result.updated}`; + const syncedOrderNo = + result.items.find((item) => item.action === 'created' || item.action === 'updated')?.orderNo || ''; + const summary = `外部协作同步完成:新增 ${result.created},更新 ${result.updated}${ + taskIds.length === 1 && syncedOrderNo ? `,订单 ${syncedOrderNo}` : '' + }`; if (result.failed || result.skipped) { message.warning(`${summary},跳过 ${result.skipped},失败 ${result.failed}`); const problems = result.items.filter( @@ -432,16 +438,29 @@ export default function PlatformFulfillmentPage() { } else { message.success(summary); } - setSelectedRowKeys([]); + if (!rowTaskId) setSelectedRowKeys([]); await loadTasks(); if (selectedId) await loadDetail(selectedId, true); } catch (error) { message.error(getErrorMessage(error)); } finally { - setCollabSyncing(false); + if (rowTaskId) { + setRowCollabSyncingId(null); + } else { + setCollabSyncing(false); + } } }; + const syncCollab = async () => { + const taskIds = selectedRowKeys.map(Number).filter((value) => Number.isInteger(value)); + if (taskIds.length === 0) { + message.warning('请先勾选要同步的履约任务'); + return; + } + await performCollabSync(taskIds); + }; + const runTaskAction = async (action: () => Promise) => { try { const result = await action(); @@ -740,7 +759,21 @@ export default function PlatformFulfillmentPage() { {collabStatusLabel(task.collabOrder.status)} - {task.collabOrder.orderNo} + + {can('douyu:collab:view') ? ( + + ) : ( + {task.collabOrder.orderNo} + )} + + ) : ( 未同步 @@ -761,6 +794,20 @@ export default function PlatformFulfillmentPage() { + {task.executionStatus === 'pending_mapping' ? ( ) : null} - {task.executionStatus === 'allocated' ? ( - - ) : null} {['waiting_bind', 'binding_confirming'].includes(task.executionStatus) ? (