feat(platform-fulfillment): 按任务状态配置租约释放
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user