feat(douyu): 锁定成功订单购买信息
This commit is contained in:
@@ -0,0 +1,98 @@
|
||||
"""记录斗鱼外部单首次成功时间,防止状态回退后绕过购买信息锁。
|
||||
|
||||
``done_at`` 只表示当前流程仍处于成功终态,订单回退时会被清空;
|
||||
新增的 ``succeeded_at`` 记录购买至少成功过一次,状态回退后也不清除。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision: str = "20261120_0103"
|
||||
down_revision: str | None = "20261120_0102"
|
||||
branch_labels: str | None = None
|
||||
depends_on: str | None = None
|
||||
|
||||
TABLE = "douyu_external_orders"
|
||||
|
||||
|
||||
def _column_exists(name: str) -> bool:
|
||||
return bool(
|
||||
op.get_bind()
|
||||
.execute(
|
||||
sa.text(
|
||||
"SELECT COUNT(*) FROM information_schema.columns "
|
||||
"WHERE table_schema = DATABASE() "
|
||||
"AND table_name = :table AND column_name = :name"
|
||||
),
|
||||
{"table": TABLE, "name": name},
|
||||
)
|
||||
.scalar()
|
||||
)
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
if not _column_exists("succeeded_at"):
|
||||
op.add_column(
|
||||
TABLE,
|
||||
sa.Column("succeeded_at", sa.DateTime(), nullable=True),
|
||||
)
|
||||
|
||||
# 当前仍是成功的单,优先沿用原 done_at。
|
||||
op.execute(
|
||||
sa.text(
|
||||
f"""
|
||||
UPDATE {TABLE}
|
||||
SET succeeded_at = COALESCE(done_at, updated_at)
|
||||
WHERE status = 'done' AND succeeded_at IS NULL
|
||||
"""
|
||||
)
|
||||
)
|
||||
|
||||
# 曾成功后又回退状态的历史单,从审计日志恢复首次成功时间。
|
||||
op.execute(
|
||||
sa.text(
|
||||
f"""
|
||||
UPDATE {TABLE} AS orders
|
||||
JOIN (
|
||||
SELECT
|
||||
CAST(
|
||||
SUBSTRING(
|
||||
target,
|
||||
LENGTH('douyu_external_order:') + 1
|
||||
) AS UNSIGNED
|
||||
) AS order_id,
|
||||
MIN(created_at) AS first_succeeded_at
|
||||
FROM audit_logs
|
||||
WHERE target LIKE 'douyu_external_order:%'
|
||||
AND success = 1
|
||||
AND (
|
||||
(
|
||||
action IN (
|
||||
'douyu:collab:status',
|
||||
'douyu:collab:void_restore'
|
||||
)
|
||||
AND detail LIKE '%"to":"done"%'
|
||||
)
|
||||
OR (
|
||||
action = 'douyu:collab:sync_from_platform_fulfillment'
|
||||
AND detail LIKE '%"status":"done"%'
|
||||
)
|
||||
)
|
||||
GROUP BY order_id
|
||||
) AS succeeded
|
||||
ON succeeded.order_id = orders.id
|
||||
SET orders.succeeded_at = COALESCE(
|
||||
orders.succeeded_at,
|
||||
succeeded.first_succeeded_at
|
||||
)
|
||||
WHERE orders.succeeded_at IS NULL
|
||||
"""
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
if _column_exists("succeeded_at"):
|
||||
op.drop_column(TABLE, "succeeded_at")
|
||||
@@ -749,6 +749,9 @@ class DouyuExternalOrder(Base):
|
||||
recharged_at: Mapped[datetime | None] = mapped_column(UTCDateTime, nullable=True)
|
||||
scripted_at: Mapped[datetime | None] = mapped_column(UTCDateTime, nullable=True)
|
||||
done_at: Mapped[datetime | None] = mapped_column(UTCDateTime, nullable=True)
|
||||
# 首次成功时间。状态回退时 done_at 会被清空,但成功事实不能丢:
|
||||
# 订单成功后,购买信息只允许超级管理员在二次确认后修改。
|
||||
succeeded_at: Mapped[datetime | None] = mapped_column(UTCDateTime, nullable=True)
|
||||
void_reason: Mapped[str] = mapped_column(String(256), default="", server_default="")
|
||||
|
||||
# ---- 鱼翅 / 积分 / 核账快照 ----
|
||||
|
||||
@@ -2590,6 +2590,7 @@ class DouyuCollabOrderUpdate(BaseModel):
|
||||
home_images: list[str] | None = None
|
||||
remark: str | None = Field(None, max_length=512)
|
||||
expected_version: int | None = None
|
||||
confirm_purchase_change: bool = False
|
||||
takeover_platform_lease: bool = False
|
||||
|
||||
|
||||
@@ -2783,6 +2784,8 @@ class DouyuCollabOrderOut(BaseModel):
|
||||
recharged_at: datetime | None = None
|
||||
scripted_at: datetime | None = None
|
||||
done_at: datetime | None = None
|
||||
succeeded_at: datetime | None = None
|
||||
purchase_change_locked: bool = False
|
||||
void_reason: str = ""
|
||||
|
||||
is_archived: bool = False
|
||||
|
||||
@@ -181,6 +181,18 @@ STATUS_TIMESTAMP_FIELDS = {
|
||||
STATUS_DONE: "done_at",
|
||||
}
|
||||
|
||||
# 成功订单已经锁定购买事实。这些字段一旦变更,会让订单号、购买账号或
|
||||
# 兑换商品与后续核账/审计不一致,因此只允许超级管理员显式确认后修改。
|
||||
SUCCESS_PURCHASE_FIELDS = frozenset(
|
||||
{
|
||||
"order_no",
|
||||
"account_username",
|
||||
"gift_name",
|
||||
"commodity_id",
|
||||
"required_points",
|
||||
}
|
||||
)
|
||||
|
||||
ARCHIVABLE_STATUSES = (STATUS_DONE,)
|
||||
# 同一账号核账只统计“还没有完成兑换”的单:done/scripted 不重复占积分。
|
||||
POINTS_GROUP_STATUSES: tuple[str, ...] = (
|
||||
@@ -236,6 +248,14 @@ def _text(value: Any, *, max_length: int | None = None) -> str:
|
||||
return text[:max_length] if max_length else text
|
||||
|
||||
|
||||
def _mark_order_succeeded(
|
||||
order: DouyuExternalOrder, when: datetime | None = None
|
||||
) -> None:
|
||||
"""记录首次成功时间;状态回退不能清掉这条购买锁定依据。"""
|
||||
if order.succeeded_at is None:
|
||||
order.succeeded_at = when or _now()
|
||||
|
||||
|
||||
def _json_safe(value: Any) -> Any:
|
||||
if isinstance(value, dict):
|
||||
return {str(k): _json_safe(v) for k, v in value.items()}
|
||||
@@ -531,6 +551,7 @@ def unlink_account(
|
||||
) -> DouyuExternalOrder:
|
||||
"""解除协作单与账号的关联,但不删除内部账号。"""
|
||||
_assert_account_replace_permission(current)
|
||||
_assert_success_account_change_allowed(current, order)
|
||||
_assert_account_replaceable(order)
|
||||
_assert_version(order, expected_version)
|
||||
if not order.account_id and not _text(order.account_username):
|
||||
@@ -949,6 +970,17 @@ def _assert_account_replaceable(order: DouyuExternalOrder) -> None:
|
||||
)
|
||||
|
||||
|
||||
def _assert_success_account_change_allowed(
|
||||
current: User, order: DouyuExternalOrder
|
||||
) -> None:
|
||||
if order.succeeded_at is not None and current.role != "super_admin":
|
||||
raise CollabError(
|
||||
"订单已有成功记录,购买账号仅允许超级管理员修改",
|
||||
status_code=403,
|
||||
code="purchase_lock_admin_required",
|
||||
)
|
||||
|
||||
|
||||
def _order_occupies_account(order: DouyuExternalOrder) -> bool:
|
||||
return (
|
||||
bool(order.account_id)
|
||||
@@ -1795,6 +1827,7 @@ def _apply_platform_fulfillment_status(
|
||||
if task.execution_status == "completed":
|
||||
order.status = STATUS_DONE
|
||||
order.done_at = order.done_at or task.completed_at or _now()
|
||||
_mark_order_succeeded(order, order.done_at)
|
||||
elif task.execution_status == "cancelled":
|
||||
order.status = STATUS_VOID
|
||||
order.void_reason = order.void_reason or "直播履约任务已取消"
|
||||
@@ -1808,6 +1841,7 @@ def _apply_platform_fulfillment_status(
|
||||
):
|
||||
order.status = STATUS_DONE
|
||||
order.done_at = order.done_at or task.completed_at or _now()
|
||||
_mark_order_succeeded(order, order.done_at)
|
||||
elif task.execution_status == "cancelled" and order.status != STATUS_VOID:
|
||||
order.status = STATUS_VOID
|
||||
order.void_reason = order.void_reason or "直播履约任务已取消"
|
||||
@@ -2051,6 +2085,7 @@ def update_order(
|
||||
_assert_version(order, expected_version)
|
||||
previous_account_id = int(order.account_id or 0)
|
||||
changes: dict[str, dict[str, Any]] = {}
|
||||
pending: dict[str, Any] = {}
|
||||
editable = {
|
||||
"order_no",
|
||||
"shop",
|
||||
@@ -2086,9 +2121,28 @@ def update_order(
|
||||
)
|
||||
else:
|
||||
new = _text(payload[field], max_length=512 if field == "remark" else 128)
|
||||
pending[field] = new
|
||||
if new != old:
|
||||
changes[field] = {"old": old, "new": new}
|
||||
setattr(order, field, new)
|
||||
|
||||
if order.succeeded_at is not None:
|
||||
locked_changes = SUCCESS_PURCHASE_FIELDS.intersection(changes)
|
||||
if locked_changes:
|
||||
if current.role != "super_admin":
|
||||
raise CollabError(
|
||||
"订单已有成功记录,购买信息仅允许超级管理员修改",
|
||||
status_code=403,
|
||||
code="purchase_lock_admin_required",
|
||||
)
|
||||
if payload.get("confirm_purchase_change") is not True:
|
||||
raise CollabError(
|
||||
"修改成功订单的购买信息需要二次确认",
|
||||
status_code=409,
|
||||
code="purchase_change_confirmation_required",
|
||||
)
|
||||
|
||||
for field, new in pending.items():
|
||||
setattr(order, field, new)
|
||||
if "account_username" in payload and (
|
||||
order.account_id is None
|
||||
or not order.bind_game_role
|
||||
@@ -2190,6 +2244,7 @@ def set_account(
|
||||
commit: bool = True,
|
||||
) -> dict[str, Any]:
|
||||
_assert_mutable(order)
|
||||
_assert_success_account_change_allowed(current, order)
|
||||
_assert_version(order, expected_version)
|
||||
account = account_by_username(db, username)
|
||||
if account is None:
|
||||
@@ -2371,6 +2426,8 @@ def _restore_void_status(
|
||||
setattr(order, field, _now())
|
||||
|
||||
order.status = target
|
||||
if target == STATUS_DONE:
|
||||
_mark_order_succeeded(order)
|
||||
order.void_reason = ""
|
||||
order.updated_by = current.id
|
||||
order.version = int(order.version or 0) + 1
|
||||
@@ -2544,6 +2601,8 @@ def set_status(
|
||||
allow_missing_role=target == STATUS_RECHARGED,
|
||||
)
|
||||
|
||||
if target == STATUS_DONE:
|
||||
_mark_order_succeeded(order, now)
|
||||
if rollback:
|
||||
for name, field in STATUS_TIMESTAMP_FIELDS.items():
|
||||
if STAGE_INDEX.get(name, -1) > target_index:
|
||||
@@ -3379,6 +3438,8 @@ def serialize_order(
|
||||
"recharged_at": order.recharged_at,
|
||||
"scripted_at": order.scripted_at,
|
||||
"done_at": order.done_at,
|
||||
"succeeded_at": order.succeeded_at,
|
||||
"purchase_change_locked": order.succeeded_at is not None,
|
||||
"void_reason": order.void_reason or "",
|
||||
"is_archived": order.archived_at is not None,
|
||||
"archived_at": order.archived_at,
|
||||
|
||||
@@ -73,6 +73,8 @@ export interface DouyuCollabOrder {
|
||||
recharged_at: string | null;
|
||||
scripted_at: string | null;
|
||||
done_at: string | null;
|
||||
succeeded_at: string | null;
|
||||
purchase_change_locked: boolean;
|
||||
void_reason: string;
|
||||
is_archived: boolean;
|
||||
archived_at: string | null;
|
||||
@@ -275,6 +277,7 @@ export interface DouyuCollabOrderUpdate {
|
||||
home_images?: string[];
|
||||
remark?: string;
|
||||
expected_version?: number;
|
||||
confirm_purchase_change?: boolean;
|
||||
takeover_platform_lease?: boolean;
|
||||
}
|
||||
|
||||
|
||||
@@ -396,6 +396,42 @@ const EMPTY_FORM: OrderFormState = {
|
||||
remark: '',
|
||||
};
|
||||
|
||||
const SUCCESS_PURCHASE_FIELD_LABELS: Record<string, string> = {
|
||||
order_no: '订单编号',
|
||||
account_username: '斗鱼用户名',
|
||||
gift_name: '礼包',
|
||||
commodity_id: '商品编号',
|
||||
required_points: '所需积分',
|
||||
};
|
||||
|
||||
interface SuccessfulPurchaseChange {
|
||||
field: string;
|
||||
label: string;
|
||||
before: string;
|
||||
after: string;
|
||||
}
|
||||
|
||||
function successfulPurchaseChanges(
|
||||
order: DouyuCollabOrder,
|
||||
form: OrderFormState,
|
||||
): SuccessfulPurchaseChange[] {
|
||||
const pairs: Array<[string, string | number | null, string | number | null]> = [
|
||||
['order_no', order.order_no, form.order_no.trim()],
|
||||
['account_username', order.account_username, form.account_username.trim()],
|
||||
['gift_name', order.gift_name, form.gift_name.trim()],
|
||||
['commodity_id', order.commodity_id, form.commodity_id.trim()],
|
||||
['required_points', order.required_points, form.required_points],
|
||||
];
|
||||
return pairs
|
||||
.filter(([, before, after]) => (before ?? '') !== (after ?? ''))
|
||||
.map(([field, before, after]) => ({
|
||||
field,
|
||||
label: SUCCESS_PURCHASE_FIELD_LABELS[field] || field,
|
||||
before: before == null || before === '' ? '未填写' : String(before),
|
||||
after: after == null || after === '' ? '未填写' : String(after),
|
||||
}));
|
||||
}
|
||||
|
||||
export default function DouyuCollabPage() {
|
||||
const navigate = useNavigate();
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
@@ -447,6 +483,7 @@ export default function DouyuCollabPage() {
|
||||
|
||||
const [createOpen, setCreateOpen] = useState(false);
|
||||
const [editing, setEditing] = useState<DouyuCollabOrder | null>(null);
|
||||
const successfulPurchaseFieldsLocked = Boolean(editing?.succeeded_at && !isAdmin);
|
||||
const [form, setForm] = useState<OrderFormState>(EMPTY_FORM);
|
||||
const [lookup, setLookup] = useState<DouyuCollabAccountLookup | null>(null);
|
||||
const lookupSeq = useRef(0);
|
||||
@@ -855,7 +892,10 @@ export default function DouyuCollabPage() {
|
||||
!form.account_username.trim() ||
|
||||
!form.gift_name.trim() ||
|
||||
form.home_images.length === 0;
|
||||
const saveOrder = async (takeoverPlatformLease: boolean) => {
|
||||
const saveOrder = async (
|
||||
takeoverPlatformLease: boolean,
|
||||
confirmPurchaseChange = false,
|
||||
) => {
|
||||
if (editing) {
|
||||
return douyuCollabApi.updateOrder(editing.id, {
|
||||
order_no: form.order_no.trim(),
|
||||
@@ -868,6 +908,7 @@ export default function DouyuCollabPage() {
|
||||
home_images: form.home_images,
|
||||
remark: form.remark,
|
||||
expected_version: editing.version,
|
||||
confirm_purchase_change: confirmPurchaseChange,
|
||||
takeover_platform_lease: takeoverPlatformLease,
|
||||
});
|
||||
}
|
||||
@@ -904,34 +945,71 @@ export default function DouyuCollabPage() {
|
||||
refreshAll();
|
||||
};
|
||||
|
||||
setSubmitting(true);
|
||||
try {
|
||||
finishSaved(await saveOrder(false));
|
||||
} catch (error) {
|
||||
if (errorCodeOf(error) === 'account_lease_conflict') {
|
||||
const runSave = async (confirmPurchaseChange: boolean) => {
|
||||
setSubmitting(true);
|
||||
try {
|
||||
finishSaved(await saveOrder(false, confirmPurchaseChange));
|
||||
} catch (error) {
|
||||
if (errorCodeOf(error) === 'account_lease_conflict') {
|
||||
setSubmitting(false);
|
||||
modal.confirm({
|
||||
title: '平台履约账号需要转人工',
|
||||
content: `${getErrorMessage(error)}。确认后平台履约任务会转为人工,并由当前协作单接管账号。`,
|
||||
okText: '确认接管并转人工',
|
||||
cancelText: '取消',
|
||||
onOk: async () => {
|
||||
setSubmitting(true);
|
||||
try {
|
||||
finishSaved(await saveOrder(true, confirmPurchaseChange));
|
||||
} catch (retryError) {
|
||||
message.error(getErrorMessage(retryError));
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
message.error(getErrorMessage(error));
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
modal.confirm({
|
||||
title: '平台履约账号需要转人工',
|
||||
content: `${getErrorMessage(error)}。确认后平台履约任务会转为人工,并由当前协作单接管账号。`,
|
||||
okText: '确认接管并转人工',
|
||||
cancelText: '取消',
|
||||
onOk: async () => {
|
||||
setSubmitting(true);
|
||||
try {
|
||||
finishSaved(await saveOrder(true));
|
||||
} catch (retryError) {
|
||||
message.error(getErrorMessage(retryError));
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const purchaseChanges =
|
||||
editing?.succeeded_at ? successfulPurchaseChanges(editing, form) : [];
|
||||
if (purchaseChanges.length > 0) {
|
||||
if (!isAdmin) {
|
||||
message.error('订单已有成功记录,购买信息仅允许超级管理员修改');
|
||||
return;
|
||||
}
|
||||
message.error(getErrorMessage(error));
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
modal.confirm({
|
||||
title: '确认修改成功订单的购买信息?',
|
||||
width: 560,
|
||||
content: (
|
||||
<Space direction="vertical" size={10} style={{ width: '100%' }}>
|
||||
<Alert
|
||||
type="warning"
|
||||
showIcon
|
||||
message="该订单已有成功记录,修改后可能与已兑换商品和核账记录不一致。"
|
||||
/>
|
||||
{purchaseChanges.map((item) => (
|
||||
<Text key={item.field}>
|
||||
{item.label}:<Text delete>{item.before}</Text>
|
||||
{' → '}
|
||||
<Text strong>{item.after}</Text>
|
||||
</Text>
|
||||
))}
|
||||
</Space>
|
||||
),
|
||||
okText: '确认修改',
|
||||
okButtonProps: { danger: true },
|
||||
cancelText: '取消',
|
||||
onOk: () => runSave(true),
|
||||
});
|
||||
return;
|
||||
}
|
||||
await runSave(false);
|
||||
};
|
||||
|
||||
const openUnlinkAccount = () => {
|
||||
@@ -2246,6 +2324,23 @@ export default function DouyuCollabPage() {
|
||||
description="只有斗鱼账号、礼包、主页截图和绑定角色都齐全,才会自动进入「待充值」。绑定角色读不到时,请先确认账号 CK 是否可用。"
|
||||
/>
|
||||
)}
|
||||
{editing?.succeeded_at && (
|
||||
<Alert
|
||||
style={{ marginBottom: 12 }}
|
||||
type={isAdmin ? 'warning' : 'error'}
|
||||
showIcon
|
||||
message={
|
||||
isAdmin
|
||||
? '该订单已有成功记录'
|
||||
: '该订单已有成功记录,购买信息已锁定'
|
||||
}
|
||||
description={
|
||||
isAdmin
|
||||
? '订单编号、斗鱼用户名、礼包、商品编号和所需积分只能在二次确认后修改。'
|
||||
: '订单编号、斗鱼用户名、礼包、商品编号和所需积分仅允许超级管理员修改;其他资料仍可编辑。'
|
||||
}
|
||||
/>
|
||||
)}
|
||||
<Row gutter={16}>
|
||||
<Col span={12}>
|
||||
<div style={{ marginBottom: 12 }}>
|
||||
@@ -2255,6 +2350,7 @@ export default function DouyuCollabPage() {
|
||||
value={form.order_no}
|
||||
maxLength={64}
|
||||
placeholder="外部订单编号"
|
||||
disabled={successfulPurchaseFieldsLocked}
|
||||
onChange={(event) => updateForm('order_no', event.target.value)}
|
||||
/>
|
||||
</div>
|
||||
@@ -2296,9 +2392,14 @@ export default function DouyuCollabPage() {
|
||||
<Input
|
||||
value={form.account_username}
|
||||
placeholder="输入内部斗鱼账号用户名,停止输入后自动查询"
|
||||
disabled={successfulPurchaseFieldsLocked}
|
||||
onChange={(event) => updateForm('account_username', event.target.value)}
|
||||
/>
|
||||
<Button loading={lookupLoading} onClick={() => void handleLookup()}>
|
||||
<Button
|
||||
loading={lookupLoading}
|
||||
disabled={successfulPurchaseFieldsLocked}
|
||||
onClick={() => void handleLookup()}
|
||||
>
|
||||
查询账号
|
||||
</Button>
|
||||
</Space.Compact>
|
||||
@@ -2321,6 +2422,7 @@ export default function DouyuCollabPage() {
|
||||
)}
|
||||
{editing &&
|
||||
canReplaceAccount &&
|
||||
!editing.succeeded_at &&
|
||||
editing.status !== 'done' &&
|
||||
editing.status !== 'void' && (
|
||||
<Space style={{ marginTop: 8 }} wrap>
|
||||
@@ -2355,6 +2457,7 @@ export default function DouyuCollabPage() {
|
||||
allowClear
|
||||
value={form.gift_name}
|
||||
options={giftNameOptions}
|
||||
disabled={successfulPurchaseFieldsLocked}
|
||||
placeholder={
|
||||
goodsPool.length || giftRecords.length
|
||||
? '输入礼包名称,或选择已有礼包'
|
||||
@@ -2370,6 +2473,7 @@ export default function DouyuCollabPage() {
|
||||
optionFilterProp="label"
|
||||
value={form.gift_name || undefined}
|
||||
options={giftNameOptions}
|
||||
disabled={successfulPurchaseFieldsLocked}
|
||||
placeholder={
|
||||
giftNameOptions.length
|
||||
? '选择礼包(由管理员统一维护)'
|
||||
@@ -2395,7 +2499,7 @@ export default function DouyuCollabPage() {
|
||||
min={0}
|
||||
precision={0}
|
||||
value={form.required_points}
|
||||
disabled={!canManage}
|
||||
disabled={!canManage || successfulPurchaseFieldsLocked}
|
||||
placeholder={canManage ? '手动填写;选择礼包后自动带出' : '由管理员统一配置'}
|
||||
onChange={(value) => updateForm('required_points', value ?? null)}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user