fix(fulfillment): 使用真实订单号并支持协作单跳转
This commit is contained in:
@@ -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
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user