fix(douyu): coordinate collab and platform account leases

Avoid automatic allocation of accounts with active external collaboration, require explicit manual takeover of platform leases, and add Douyu account identity search.
This commit is contained in:
yml
2026-11-20 00:18:28 +08:00
parent d19809b4ca
commit 85837944d0
12 changed files with 704 additions and 59 deletions
+9 -1
View File
@@ -231,6 +231,7 @@ export interface DouyuCollabOrderCreate {
remark?: string;
draft?: boolean;
require_verified?: boolean;
takeover_platform_lease?: boolean;
}
export interface DouyuCollabOrderUpdate {
@@ -244,6 +245,7 @@ export interface DouyuCollabOrderUpdate {
home_images?: string[];
remark?: string;
expected_version?: number;
takeover_platform_lease?: boolean;
}
export interface DouyuCollabMetric {
@@ -368,10 +370,16 @@ export const douyuCollabApi = {
api.get<DouyuCollabOrder, DouyuCollabOrder>(`/douyu/external-orders/${id}`),
updateOrder: (id: number, data: DouyuCollabOrderUpdate) =>
api.put<DouyuCollabOrder, DouyuCollabOrder>(`/douyu/external-orders/${id}`, data),
setAccount: (id: number, account_username: string, expected_version?: number) =>
setAccount: (
id: number,
account_username: string,
expected_version?: number,
takeover_platform_lease = false,
) =>
api.post<DouyuCollabOrder, DouyuCollabOrder>(`/douyu/external-orders/${id}/account`, {
account_username,
expected_version,
takeover_platform_lease,
}),
verifyOrder: (id: number) =>
api.post<{ order: DouyuCollabOrder; probe: DouyuCollabAccountLookup }, { order: DouyuCollabOrder; probe: DouyuCollabAccountLookup }>(
+51 -17
View File
@@ -74,6 +74,10 @@ import { copyTextToClipboard } from '../utils/clipboard';
const { Text } = Typography;
function errorCodeOf(error: unknown): string {
return (error as { errorCode?: string } | null)?.errorCode || '';
}
function hasTextInputFocus(): boolean {
const active = document.activeElement;
return (
@@ -635,10 +639,9 @@ export default function DouyuCollabPage() {
!form.account_username.trim() ||
!form.gift_name.trim() ||
form.home_images.length === 0;
setSubmitting(true);
try {
const saveOrder = async (takeoverPlatformLease: boolean) => {
if (editing) {
const updated = await douyuCollabApi.updateOrder(editing.id, {
return douyuCollabApi.updateOrder(editing.id, {
order_no: form.order_no.trim(),
shop: form.shop.trim(),
owner_id: form.owner_id,
@@ -649,7 +652,26 @@ export default function DouyuCollabPage() {
home_images: form.home_images,
remark: form.remark,
expected_version: editing.version,
takeover_platform_lease: takeoverPlatformLease,
});
}
return douyuCollabApi.createOrder({
order_no: form.order_no.trim(),
shop: form.shop.trim(),
owner_id: form.owner_id,
account_username: form.account_username.trim(),
gift_name: form.gift_name,
commodity_id: form.commodity_id,
required_points: form.required_points,
home_images: form.home_images,
remark: form.remark,
draft: createAsDraft,
require_verified: !createAsDraft,
takeover_platform_lease: takeoverPlatformLease,
});
};
const finishSaved = (updated: DouyuCollabOrder) => {
if (editing) {
if (updated.status === 'incomplete' && updated.missing_fields?.length) {
message.warning(`资料已保存,但仍缺:${updated.missing_fields.join('、')}`);
} else if (editing.status === 'incomplete') {
@@ -658,26 +680,38 @@ export default function DouyuCollabPage() {
message.success('协作单已更新');
}
} else {
const created = await douyuCollabApi.createOrder({
order_no: form.order_no.trim(),
shop: form.shop.trim(),
owner_id: form.owner_id,
account_username: form.account_username.trim(),
gift_name: form.gift_name,
commodity_id: form.commodity_id,
required_points: form.required_points,
home_images: form.home_images,
remark: form.remark,
draft: createAsDraft,
require_verified: !createAsDraft,
});
message.success(
created.status === 'incomplete' ? '已创建待补资料协作单' : '协作单已创建',
updated.status === 'incomplete' ? '已创建待补资料协作单' : '协作单已创建',
);
}
setCreateOpen(false);
refreshAll();
};
setSubmitting(true);
try {
finishSaved(await saveOrder(false));
} 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));
} catch (retryError) {
message.error(getErrorMessage(retryError));
} finally {
setSubmitting(false);
}
},
});
return;
}
message.error(getErrorMessage(error));
} finally {
setSubmitting(false);
@@ -1053,7 +1053,7 @@ export default function PlatformFulfillmentPage() {
<Space wrap style={{ marginBottom: 16 }}>
<Input.Search
allowClear
placeholder="订单号 / SKU / 商品 ID"
placeholder="订单号 / SKU / 商品 ID / 斗鱼账号"
value={keyword}
onChange={(event) => {
setKeyword(event.target.value);