feat(platform-fulfillment): 按任务状态配置租约释放

This commit is contained in:
yml
2026-11-22 09:24:39 +08:00
parent fa75ce66ee
commit 2eb20f0d32
13 changed files with 578 additions and 23 deletions
@@ -460,6 +460,35 @@ AND 不违反 365 天规则
- `platform_fulfillment_lease_reaper`:保持独立
- `douyu_tasks_retention`:保持独立
### 履约租约状态策略
2026-11-22 起,履约租约不再使用“所有 active 租约统一 TTL”。默认策略是
**未完成状态无限保留**,只有明确终态才设置 `expires_at`:
| 任务状态 | 默认策略 |
| --- | --- |
| `pending_mapping / ready` | 无账号租约 |
| `allocated / waiting_bind / role_ready / binding_confirming` | 默认无限 |
| `bound + waiting_release` | 预售等待开放,默认无限 |
| `bound + points_short / not_opened / limited` | 等待人工处理,默认无限 |
| `manual_required` | 独立 TTL,默认无限 |
| `completed` | 按自动或人工完成配置保留窗口,到期后释放 |
| `cancelled` | 立即释放 |
配置项:
- `lease_duration_minutes`:普通进行中任务的可选兜底 TTL,NULL 为无限;
- `completed_release_delay_minutes`:自动兑换完成后的保留时间,默认 30 分钟;
- `manual_completed_release_delay_minutes`:人工兑换完成后的保留时间,默认 120 分钟;
- `presale_waiting_release_ttl_minutes`:预售等待开放 TTL,默认 NULL;
- `manual_required_lease_ttl_minutes`:人工处理 TTL,默认 NULL。
订单同步只创建已支付订单的履约任务,但预售和直接兑换都是已支付订单。因此不能按
`paid_at` 或订单创建时间统一计时,必须按任务当前业务状态重算租约策略。
回收器仍然只处理 `expires_at IS NOT NULL AND expires_at <= now` 的租约。任何仍可能
继续履约、等待开放或人工处理的任务都保持 NULL,不会因为 24 小时兜底 TTL 被误释放。
## 统一预算
任务槽仍由 `task_runtime` 管理,但增加持久化域预算:
@@ -669,3 +698,4 @@ Runner 启动前必须有预算 token;没有 token 时留在工作队列。
| 2026-11-21 | 阶段 4:增加基于库存、积压和近期成功率的登录预算建议及人工一键应用 |
| 2026-11-21 | 阶段 1:一键查询接入本地快照复用,商品过期改为后台同步,避免重复官网查询 |
| 2026-11-21 | 阶段 0-4 完成:全部账号查询域接入本地优先策略、独立同步工作项和兑换记录统一投影;阶段 5 暂不启动 |
| 2026-11-22 | 履约租约改为状态化策略:默认无限,预售/人工独立配置,完成或取消后才设置释放时间 |
@@ -420,6 +420,10 @@ AND 没有 force_refresh
| `points_expire_check` | 关闭 | 每天 | 积分到期补记 |
| `platform_fulfillment_lease_reaper` | 关闭 | 每 60 秒 | 回收过期履约租约 |
2026-11-22 起,履约租约改为状态化策略:未完成、预售等待和人工状态默认
`expires_at=NULL`,不会因为普通 24 小时 TTL 被释放;只有兑换完成等明确终态才按
配置设置释放时间。回收作业是否开启不再等同于“所有履约账号 24 小时到期”。
### 当前账号状态
2026-11-21 生产只读快照:
+1 -1
View File
@@ -42,7 +42,7 @@ TESTS_DIR = Path(__file__).resolve().parent
PROJECT_ROOT = TESTS_DIR.parent
VERSIONS_DIR = PROJECT_ROOT / "web" / "backend" / "migrations" / "versions"
HEAD_REVISION = "20261121_0112"
HEAD_REVISION = "20261122_0113"
# 迁移新增、但不声明在模型里的复合查询索引。
EXTRA_INDEXES = (
+111 -1
View File
@@ -1564,6 +1564,76 @@ class TestAccountSelection(_Base):
assert unlimited["leaseDurationMinutes"] is None
assert lease.expires_at is None
def test_lease_policy_is_applied_by_task_state(self):
self.account("state-policy-account")
task = self.task()
service.allocate_task(self.session, task_id=task.id, current=self.admin)
lease = self.session.query(AccountLease).one()
task = self.session.get(PlatformFulfillmentTask, task.id)
service.update_settings(
self.session,
lease_duration_minutes=60,
completed_release_delay_minutes=30,
manual_completed_release_delay_minutes=120,
presale_waiting_release_ttl_minutes=None,
manual_required_lease_ttl_minutes=90,
order_match_started_at=NOW - timedelta(days=1),
current=self.admin,
)
self.session.refresh(lease)
assert lease.expires_at is not None
task.sale_mode = "presale"
task.execution_status = "bound"
task.exchange_status = "waiting_release"
self.session.commit()
service.update_settings(
self.session,
lease_duration_minutes=60,
completed_release_delay_minutes=30,
manual_completed_release_delay_minutes=120,
presale_waiting_release_ttl_minutes=None,
manual_required_lease_ttl_minutes=90,
order_match_started_at=NOW - timedelta(days=1),
current=self.admin,
)
self.session.refresh(lease)
assert lease.expires_at is None
task.execution_status = "manual_required"
task.exchange_status = "points_short"
self.session.commit()
service.update_settings(
self.session,
lease_duration_minutes=60,
completed_release_delay_minutes=30,
manual_completed_release_delay_minutes=120,
presale_waiting_release_ttl_minutes=None,
manual_required_lease_ttl_minutes=90,
order_match_started_at=NOW - timedelta(days=1),
current=self.admin,
)
self.session.refresh(lease)
assert lease.expires_at is not None
task.execution_status = "completed"
task.exchange_status = "manual_done"
self.session.commit()
service.update_settings(
self.session,
lease_duration_minutes=60,
completed_release_delay_minutes=30,
manual_completed_release_delay_minutes=120,
presale_waiting_release_ttl_minutes=None,
manual_required_lease_ttl_minutes=90,
order_match_started_at=NOW - timedelta(days=1),
current=self.admin,
)
self.session.refresh(lease)
assert lease.status == "active"
assert lease.expires_at is not None
class TestBindingAndCompletion(_Base):
def _allocated(self):
@@ -2572,7 +2642,7 @@ class TestBindingAndCompletion(_Base):
assert listed["items"][0]["bindTask"]["qrUrl"] == ""
assert detail["task"]["bindTask"]["qrUrl"] == "https://example.com/private-qr"
def test_manual_completion_requires_bound_and_releases_lease(self):
def test_manual_completion_requires_bound_and_keeps_review_window(self):
task = self._allocated()
task.binding_status = "bound"
task.execution_status = "bound"
@@ -2588,8 +2658,48 @@ class TestBindingAndCompletion(_Base):
assert detail["task"]["executionStatus"] == "completed"
assert detail["task"]["exchangeStatus"] == "manual_done"
lease = self.session.query(AccountLease).one()
assert lease.status == "active"
assert lease.expires_at is not None
job = AutomationJob(key=reaper.JOB_KEY, batch_size=100)
result = reaper.run_platform_fulfillment_lease_reaper(
self.session,
job,
now=lease.expires_at + timedelta(seconds=1),
)
self.session.refresh(lease)
assert result["expired"] == 1
assert lease.status == "expired"
def test_manual_completion_zero_delay_releases_immediately(self):
task = self._allocated()
task.binding_status = "bound"
task.execution_status = "bound"
task.exchange_status = "eligible"
self.session.commit()
service.update_settings(
self.session,
lease_duration_minutes=None,
completed_release_delay_minutes=30,
manual_completed_release_delay_minutes=0,
presale_waiting_release_ttl_minutes=None,
manual_required_lease_ttl_minutes=None,
order_match_started_at=NOW - timedelta(days=1),
current=self.admin,
)
service.complete_manual_exchange(
self.session,
task_id=task.id,
current=self.admin,
note="立即释放",
)
lease = self.session.query(AccountLease).one()
assert lease.status == "released"
assert lease.release_reason == "lease_policy:manual_completed"
def test_points_short_after_binding_keeps_account_and_stays_bound(
self, monkeypatch
@@ -449,6 +449,10 @@
"20261121_0112_account_sync_trend_index.py": {
"revision": "20261121_0112",
"sha256": "9c1ebee5fba13efc413a4dcca258fa66dfbca5b41c1bd9b89ab794c394af3fee"
},
"20261122_0113_platform_fulfillment_lease_policy.py": {
"revision": "20261122_0113",
"sha256": "195042a0f84e0ba8f0950e305e485ca4a96f69d9c0fd59b7dcc5a9f62b32357e"
}
}
}
@@ -0,0 +1,75 @@
"""按履约状态配置租约释放策略。
默认未完成状态保持无限租约;兑换完成后再保留一段可配置时间。预售等待开放
和人工处理也必须独立配置,不能被普通的进行中 TTL 误释放。
"""
from __future__ import annotations
import sqlalchemy as sa
from alembic import op
revision: str = "20261122_0113"
down_revision: str | None = "20261121_0112"
branch_labels: str | None = None
depends_on: str | None = None
def _column_exists(column: str) -> bool:
return bool(
op.get_bind()
.execute(
sa.text(
"""
SELECT COUNT(*)
FROM information_schema.columns
WHERE table_schema = DATABASE()
AND table_name = 'platform_fulfillment_settings'
AND column_name = :column
"""
),
{"column": column},
)
.scalar()
)
def upgrade() -> None:
columns = (
sa.Column(
"completed_release_delay_minutes",
sa.Integer(),
nullable=True,
server_default="30",
),
sa.Column(
"manual_completed_release_delay_minutes",
sa.Integer(),
nullable=True,
server_default="120",
),
sa.Column(
"presale_waiting_release_ttl_minutes",
sa.Integer(),
nullable=True,
),
sa.Column(
"manual_required_lease_ttl_minutes",
sa.Integer(),
nullable=True,
),
)
for column in columns:
if not _column_exists(column.name):
op.add_column("platform_fulfillment_settings", column)
def downgrade() -> None:
for column in (
"manual_required_lease_ttl_minutes",
"presale_waiting_release_ttl_minutes",
"manual_completed_release_delay_minutes",
"completed_release_delay_minutes",
):
if _column_exists(column):
op.drop_column("platform_fulfillment_settings", column)
+25
View File
@@ -2056,7 +2056,32 @@ class PlatformFulfillmentSetting(Base):
__tablename__ = "platform_fulfillment_settings"
id: Mapped[int] = mapped_column(Integer, primary_key=True)
# 未完成、非预售等待状态的可选兜底 TTL。NULL 表示默认无限。
lease_duration_minutes: Mapped[int | None] = mapped_column(Integer, nullable=True)
# 2026-11-22:租约进入终态后不再统一立即释放,而是按状态设置保留窗口。
# NULL 表示永久保留;0 表示状态命中后立即释放。
completed_release_delay_minutes: Mapped[int | None] = mapped_column(
Integer,
nullable=True,
default=30,
server_default="30",
)
manual_completed_release_delay_minutes: Mapped[int | None] = mapped_column(
Integer,
nullable=True,
default=120,
server_default="120",
)
# 预售等待开放期间默认无限;如配置 TTL,也只在 waiting_release 状态生效。
presale_waiting_release_ttl_minutes: Mapped[int | None] = mapped_column(
Integer,
nullable=True,
)
# 人工处理中的任务默认无限,避免普通进行中 TTL 误释放人工任务。
manual_required_lease_ttl_minutes: Mapped[int | None] = mapped_column(
Integer,
nullable=True,
)
order_match_started_at: Mapped[datetime] = mapped_column(
UTCDateTime,
nullable=False,
@@ -45,6 +45,16 @@ def update_settings(
result = service.update_settings(
db,
lease_duration_minutes=req.lease_duration_minutes,
completed_release_delay_minutes=req.completed_release_delay_minutes,
manual_completed_release_delay_minutes=(
req.manual_completed_release_delay_minutes
),
presale_waiting_release_ttl_minutes=(
req.presale_waiting_release_ttl_minutes
),
manual_required_lease_ttl_minutes=(
req.manual_required_lease_ttl_minutes
),
order_match_started_at=req.order_match_started_at,
current=current,
)
+20
View File
@@ -1660,6 +1660,26 @@ class PlatformFulfillmentCompleteRequest(BaseModel):
class PlatformFulfillmentSettingsUpdate(BaseModel):
lease_duration_minutes: int | None = Field(..., ge=1, le=525600)
completed_release_delay_minutes: int | None = Field(
default=30,
ge=0,
le=525600,
)
manual_completed_release_delay_minutes: int | None = Field(
default=120,
ge=0,
le=525600,
)
presale_waiting_release_ttl_minutes: int | None = Field(
default=None,
ge=0,
le=525600,
)
manual_required_lease_ttl_minutes: int | None = Field(
default=None,
ge=0,
le=525600,
)
order_match_started_at: datetime | None = None
@@ -73,7 +73,6 @@ from .account_selector import (
lease_account,
live_candidate_accounts,
release_lease,
renew_lease,
)
from .order_site_notifier import enqueue_order_site_binding_state
@@ -409,6 +408,8 @@ def _upsert_order_snapshot(
task.issue_code = "source_cancelled"
task.last_error = "订单已关闭或直播履约配置已停用"
task.next_allocate_at = None
# 订单源头取消/关闭后不再保留执行账号;统一策略会立即释放租约。
_apply_task_lease_policy(db, task)
else:
# 订单快照会被重复投递。只有未分配任务从「待映射」进入「待分配」时
# 才允许改生命周期状态;已分配任务不能被快照更新打回 pending。
@@ -561,6 +562,10 @@ def get_settings(db: Session) -> dict[str, Any]:
row = PlatformFulfillmentSetting(
id=1,
lease_duration_minutes=None,
completed_release_delay_minutes=30,
manual_completed_release_delay_minutes=120,
presale_waiting_release_ttl_minutes=None,
manual_required_lease_ttl_minutes=None,
order_match_started_at=now,
)
db.add(row)
@@ -568,15 +573,148 @@ def get_settings(db: Session) -> dict[str, Any]:
db.refresh(row)
return {
"leaseDurationMinutes": row.lease_duration_minutes,
"completedReleaseDelayMinutes": row.completed_release_delay_minutes,
"manualCompletedReleaseDelayMinutes": (
row.manual_completed_release_delay_minutes
),
"presaleWaitingReleaseTtlMinutes": (
row.presale_waiting_release_ttl_minutes
),
"manualRequiredLeaseTtlMinutes": (
row.manual_required_lease_ttl_minutes
),
"orderMatchStartedAt": _jsonable(row.order_match_started_at),
"updatedAt": _jsonable(row.updated_at),
}
def _lease_policy_for_task(
task: PlatformFulfillmentTask,
settings: dict[str, Any],
) -> tuple[str, int | None]:
"""返回任务当前状态对应的租约策略代码和保留分钟数。
``None`` 表示无限租约。2026-11-22 的业务规则:
- 预售等待开放、人工处理、所有正常进行中状态默认无限;
- 只有兑换完成后的短暂复核窗口自动设置到期时间;
- 普通进行中 TTL 只作为兜底配置,不能再套到预售或人工状态上。
"""
status = str(task.execution_status or "")
exchange_status = str(task.exchange_status or "")
if status == "completed":
if exchange_status == "manual_done":
return (
"manual_completed",
settings.get("manualCompletedReleaseDelayMinutes"),
)
return "completed", settings.get("completedReleaseDelayMinutes")
if status == "cancelled":
return "cancelled", 0
if status == "manual_required":
return (
"manual_required",
settings.get("manualRequiredLeaseTtlMinutes"),
)
if (
classification.normalize_sale_mode(task.sale_mode) == "presale"
and exchange_status == "waiting_release"
):
return (
"presale_waiting_release",
settings.get("presaleWaitingReleaseTtlMinutes"),
)
return "active", settings.get("leaseDurationMinutes")
def _apply_task_lease_policy(
db: Session,
task: PlatformFulfillmentTask,
*,
lease: AccountLease | None = None,
settings: dict[str, Any] | None = None,
now: datetime | None = None,
) -> AccountLease | None:
"""按任务状态重设租约到期时间,不提交事务。
当前生产默认无限租约。只有 ``completed`` 等明确终态才设置到期时间,
回收器因此不会再误伤预售等待和人工处理任务。
"""
moment = now or _now()
active_lease = lease
if active_lease is None and task.lease_id:
active_lease = (
db.query(AccountLease)
.filter(AccountLease.id == int(task.lease_id))
.first()
)
if (
active_lease is None
or active_lease.status != "active"
or active_lease.purpose != "platform_fulfillment"
):
return active_lease
if str(task.execution_status or "") in {"completed", "cancelled"}:
# 终态释放前先检查活动外部协作单。若账号仍被协作单使用,租约转换为
# douyu_collab 并保持无限,不能被平台 TTL 抢走。
from ..douyu_collab_service import retain_lease_for_active_collab
retained = retain_lease_for_active_collab(
db,
account_id=int(active_lease.account_id),
holder_user_id=int(active_lease.holder_user_id),
lease=active_lease,
source_task_id=int(task.id),
reason=f"platform_{task.execution_status}_retained_for_collab",
commit=False,
)
if retained is not None:
return retained
policy, minutes = _lease_policy_for_task(task, settings or get_settings(db))
if minutes is not None:
minutes = max(0, int(minutes))
old_expiry = active_lease.expires_at
if minutes is None:
active_lease.expires_at = None
else:
active_lease.expires_at = moment + timedelta(minutes=minutes)
if active_lease.expires_at != old_expiry:
_append_event(
db,
task.id,
"lease_policy_applied",
actor_type="system",
detail={
"policy": policy,
"minutes": minutes,
"expiresAt": _jsonable(active_lease.expires_at),
"previousExpiresAt": _jsonable(old_expiry),
},
)
if minutes == 0:
release_lease(
db,
active_lease,
reason=f"lease_policy:{policy}",
commit=False,
now=moment,
)
return None
return active_lease
def update_settings(
db: Session,
*,
lease_duration_minutes: int | None,
completed_release_delay_minutes: int | None = 30,
manual_completed_release_delay_minutes: int | None = 120,
presale_waiting_release_ttl_minutes: int | None = None,
manual_required_lease_ttl_minutes: int | None = None,
order_match_started_at: datetime | None = None,
current: User,
) -> dict[str, Any]:
@@ -595,8 +733,27 @@ def update_settings(
elif order_match_started_at is not None:
row.order_match_started_at = order_match_started_at
row.lease_duration_minutes = lease_duration_minutes
row.completed_release_delay_minutes = completed_release_delay_minutes
row.manual_completed_release_delay_minutes = (
manual_completed_release_delay_minutes
)
row.presale_waiting_release_ttl_minutes = (
presale_waiting_release_ttl_minutes
)
row.manual_required_lease_ttl_minutes = manual_required_lease_ttl_minutes
row.updated_by = current.id
row.updated_at = now
settings = {
"leaseDurationMinutes": lease_duration_minutes,
"completedReleaseDelayMinutes": completed_release_delay_minutes,
"manualCompletedReleaseDelayMinutes": (
manual_completed_release_delay_minutes
),
"presaleWaitingReleaseTtlMinutes": (
presale_waiting_release_ttl_minutes
),
"manualRequiredLeaseTtlMinutes": manual_required_lease_ttl_minutes,
}
active_leases = (
db.query(AccountLease)
.filter(
@@ -606,14 +763,35 @@ def update_settings(
.all()
)
for lease in active_leases:
lease.expires_at = (
None
if lease_duration_minutes is None
else now + timedelta(minutes=lease_duration_minutes)
task = (
db.query(PlatformFulfillmentTask)
.filter(PlatformFulfillmentTask.lease_id == lease.id)
.first()
)
if task is None:
# 没有可解释业务状态的租约不能套通用 TTL,保持无限并等待人工排查。
lease.expires_at = None
continue
_apply_task_lease_policy(
db,
task,
lease=lease,
settings=settings,
now=now,
)
db.commit()
return {
"leaseDurationMinutes": row.lease_duration_minutes,
"completedReleaseDelayMinutes": row.completed_release_delay_minutes,
"manualCompletedReleaseDelayMinutes": (
row.manual_completed_release_delay_minutes
),
"presaleWaitingReleaseTtlMinutes": (
row.presale_waiting_release_ttl_minutes
),
"manualRequiredLeaseTtlMinutes": (
row.manual_required_lease_ttl_minutes
),
"orderMatchStartedAt": _jsonable(row.order_match_started_at),
"updatedAt": _jsonable(row.updated_at),
}
@@ -746,6 +924,7 @@ def record_douyu_operation_started(
"payload": payload or {},
},
)
_apply_task_lease_policy(db, task)
db.commit()
@@ -2419,6 +2598,7 @@ def allocate_task(db: Session, *, task_id: int, current: User) -> dict[str, Any]
task.issue_code = ""
task.last_error = ""
task.updated_at = _now()
_apply_task_lease_policy(db, task, lease=lease)
_append_event(
db,
task.id,
@@ -2530,7 +2710,7 @@ def reset_task_binding(
task.last_error = ""
task.operator_id = current.id
task.updated_at = _now()
renew_lease(db, lease, ttl_minutes=_lease_duration_minutes(db))
_apply_task_lease_policy(db, task, lease=lease)
_append_event(
db,
task.id,
@@ -2635,11 +2815,7 @@ def start_binding_sync(
task.last_error = ""
task.operator_id = current.id
task.updated_at = _now()
renew_lease(
db,
lease,
ttl_minutes=_lease_duration_minutes(db),
)
_apply_task_lease_policy(db, task, lease=lease)
_append_event(
db,
task.id,
@@ -2735,6 +2911,7 @@ def refresh_binding(db: Session, *, task_id: int) -> dict[str, Any]:
},
)
_emit_order_site_binding_state(db, task.id)
_apply_task_lease_policy(db, task)
db.commit()
return get_task_detail(db, task.id)
elif result.get("url"):
@@ -2764,6 +2941,7 @@ def refresh_binding(db: Session, *, task_id: int) -> dict[str, Any]:
},
)
_emit_order_site_binding_state(db, task.id)
_apply_task_lease_policy(db, task)
db.commit()
return get_task_detail(db, task.id)
@@ -2874,7 +3052,7 @@ def confirm_binding_sync(
task.execution_status = "binding_confirming"
task.operator_id = current.id
task.updated_at = _now()
renew_lease(db, lease, ttl_minutes=_lease_duration_minutes(db))
_apply_task_lease_policy(db, task, lease=lease)
_append_event(
db,
task.id,
@@ -3074,6 +3252,9 @@ def refresh_exchange_eligibility(
task.execution_status = "bound"
task.updated_at = _now()
account.updated_at = _now()
# waiting_release 的预售任务在这里切回无限租约,普通 bound 也遵循
# “进行中默认无限”的状态策略。
_apply_task_lease_policy(db, task)
_append_event(
db,
task.id,
@@ -3125,11 +3306,12 @@ def complete_manual_exchange(
reason="platform_completed_but_collab_active",
)
if retained is None:
release_lease(
# 2026-11-22:兑换完成不再一律立即释放。任务已完成但保留一段可配置
# 的复核窗口;默认人工兑换完成后保留 120 分钟,期间仍可供截图与纠错。
_apply_task_lease_policy(
db,
lease,
reason="manual_exchange_completed",
commit=False,
task,
lease=lease,
)
_append_event(
db,
@@ -3157,6 +3339,7 @@ def mark_manual_required(
task.last_error = reason.strip()[:2000]
task.issue_code = task.issue_code or "manual_required"
task.updated_at = _now()
_apply_task_lease_policy(db, task)
_append_event(
db,
task.id,
@@ -29,12 +29,23 @@ export const platformFulfillmentApi = {
),
updateSettings: (data: {
leaseDurationMinutes: number | null;
completedReleaseDelayMinutes: number | null;
manualCompletedReleaseDelayMinutes: number | null;
presaleWaitingReleaseTtlMinutes: number | null;
manualRequiredLeaseTtlMinutes: number | null;
orderMatchStartedAt: string | null;
}) =>
api.put<PlatformFulfillmentSettings, PlatformFulfillmentSettings>(
'/platform-fulfillment/settings',
{
lease_duration_minutes: data.leaseDurationMinutes,
completed_release_delay_minutes: data.completedReleaseDelayMinutes,
manual_completed_release_delay_minutes:
data.manualCompletedReleaseDelayMinutes,
presale_waiting_release_ttl_minutes:
data.presaleWaitingReleaseTtlMinutes,
manual_required_lease_ttl_minutes:
data.manualRequiredLeaseTtlMinutes,
order_match_started_at: data.orderMatchStartedAt,
},
),
+4
View File
@@ -2354,6 +2354,10 @@ export interface PlatformFulfillmentAccount {
export interface PlatformFulfillmentSettings {
leaseDurationMinutes: number | null;
completedReleaseDelayMinutes: number | null;
manualCompletedReleaseDelayMinutes: number | null;
presaleWaitingReleaseTtlMinutes: number | null;
manualRequiredLeaseTtlMinutes: number | null;
orderMatchStartedAt: string | null;
updatedAt: string | null;
}
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, 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';
import { Alert, Button, Card, Col, DatePicker, Descriptions, Drawer, Empty, Input, InputNumber, Modal, QRCode, Row, Segmented, Select, Space, Switch, Table, Tabs, Tag, Timeline, Typography } from 'antd';
import { CheckCircleOutlined, CopyOutlined, CreditCardOutlined, DownloadOutlined, GiftOutlined, LinkOutlined, QrcodeOutlined, ReloadOutlined, SettingOutlined, ShoppingOutlined, SyncOutlined, UndoOutlined, UserSwitchOutlined } from '@ant-design/icons';
import type { ColumnsType } from 'antd/es/table';
import { douyuApi, platformFulfillmentApi } from '../api/modules';
@@ -389,6 +389,10 @@ export default function PlatformFulfillmentPage() {
const [settingsOpen, setSettingsOpen] = useState(false);
const [leaseDurationMode, setLeaseDurationMode] = useState<'unlimited' | 'minutes' | 'hours'>('unlimited');
const [leaseDurationValue, setLeaseDurationValue] = useState<number | null>(60);
const [completedReleaseDelay, setCompletedReleaseDelay] = useState<number | null>(30);
const [manualCompletedReleaseDelay, setManualCompletedReleaseDelay] = useState<number | null>(120);
const [presaleWaitingReleaseTtl, setPresaleWaitingReleaseTtl] = useState<number | null>(null);
const [manualRequiredLeaseTtl, setManualRequiredLeaseTtl] = useState<number | null>(null);
const [orderMatchStartedAt, setOrderMatchStartedAt] = useState<Dayjs | null>(null);
const [savingSettings, setSavingSettings] = useState(false);
const [douyuActionLoading, setDouyuActionLoading] = useState('');
@@ -974,6 +978,16 @@ export default function PlatformFulfillmentPage() {
setOrderMatchStartedAt(
settings?.orderMatchStartedAt ? dayjs(settings.orderMatchStartedAt) : null,
);
setCompletedReleaseDelay(settings?.completedReleaseDelayMinutes ?? 30);
setManualCompletedReleaseDelay(
settings?.manualCompletedReleaseDelayMinutes ?? 120,
);
setPresaleWaitingReleaseTtl(
settings?.presaleWaitingReleaseTtlMinutes ?? null,
);
setManualRequiredLeaseTtl(
settings?.manualRequiredLeaseTtlMinutes ?? null,
);
setSettingsOpen(true);
};
@@ -996,6 +1010,10 @@ export default function PlatformFulfillmentPage() {
try {
const result = await platformFulfillmentApi.updateSettings({
leaseDurationMinutes: minutes,
completedReleaseDelayMinutes: completedReleaseDelay,
manualCompletedReleaseDelayMinutes: manualCompletedReleaseDelay,
presaleWaitingReleaseTtlMinutes: presaleWaitingReleaseTtl,
manualRequiredLeaseTtlMinutes: manualRequiredLeaseTtl,
orderMatchStartedAt: orderMatchStartedAt.toISOString(),
});
setSettings(result);
@@ -1305,7 +1323,7 @@ export default function PlatformFulfillmentPage() {
<Text type="secondary">系统自动检测账号并选号;只有缺货、CK 异常或资格失败时转人工处理。客户扫码绑定后,运营可直接开通宝典、充值或兑换皮肤。</Text>
</div>
<Space wrap>
<Tag>账号租约:{leaseDurationLabel(settings?.leaseDurationMinutes)}</Tag>
<Tag>进行中租约:{leaseDurationLabel(settings?.leaseDurationMinutes)}</Tag>
<Tag>订单起算:{settings?.orderMatchStartedAt ? formatTime(settings.orderMatchStartedAt) : '-'}</Tag>
<Button
icon={<SettingOutlined />}
@@ -1839,7 +1857,7 @@ export default function PlatformFulfillmentPage() {
</Text>
</div>
<div>
<Text strong>账号租约</Text>
<Text strong>进行中任务兜底 TTL</Text>
<Segmented
block
value={leaseDurationMode}
@@ -1860,12 +1878,73 @@ export default function PlatformFulfillmentPage() {
style={{ width: '100%' }}
/>
) : null}
<Text type="secondary">
默认无限制。这里的 TTL 只作用于普通进行中状态,不会覆盖预售等待开放和人工处理状态。
</Text>
</div>
<div>
<Text strong>终态释放与特殊状态策略</Text>
<Text type="secondary">
留空表示永久保留;0 表示命中该状态后立即释放。
</Text>
<Row gutter={12} style={{ marginTop: 8 }}>
<Col span={12}>
<Text type="secondary">自动兑换完成保留</Text>
<InputNumber
min={0}
precision={0}
value={completedReleaseDelay}
onChange={setCompletedReleaseDelay}
placeholder="留空=永久"
addonAfter="分钟"
style={{ width: '100%' }}
/>
</Col>
<Col span={12}>
<Text type="secondary">人工兑换完成保留</Text>
<InputNumber
min={0}
precision={0}
value={manualCompletedReleaseDelay}
onChange={setManualCompletedReleaseDelay}
placeholder="留空=永久"
addonAfter="分钟"
style={{ width: '100%' }}
/>
</Col>
</Row>
<Row gutter={12} style={{ marginTop: 8 }}>
<Col span={12}>
<Text type="secondary">预售等待开放 TTL</Text>
<InputNumber
min={0}
precision={0}
value={presaleWaitingReleaseTtl}
onChange={setPresaleWaitingReleaseTtl}
placeholder="留空=永久"
addonAfter="分钟"
style={{ width: '100%' }}
/>
</Col>
<Col span={12}>
<Text type="secondary">人工处理 TTL</Text>
<InputNumber
min={0}
precision={0}
value={manualRequiredLeaseTtl}
onChange={setManualRequiredLeaseTtl}
placeholder="留空=永久"
addonAfter="分钟"
style={{ width: '100%' }}
/>
</Col>
</Row>
</div>
<Alert
type="info"
showIcon
message={`订单起算:${settings?.orderMatchStartedAt ? formatTime(settings.orderMatchStartedAt) : '-'};账号租约:${leaseDurationLabel(settings?.leaseDurationMinutes)}`}
description="保存后会立即同步当前所有活跃租约。无限制模式不会自动回收,任务完成、释放或取消时仍会正常释放账号。"
message="按任务状态应用租约策略"
description="保存后会按每个任务当前状态重新计算租约,不会把所有预售、人工和进行中任务统一套用同一个 TTL。"
/>
</Space>
</Modal>