feat(douyu): 锁定成功订单购买信息
This commit is contained in:
@@ -955,10 +955,132 @@ class TestDouyuCollabOrders:
|
|||||||
assert result["verdict"] == collab.VERDICT_SUCCESS
|
assert result["verdict"] == collab.VERDICT_SUCCESS
|
||||||
assert result["order"].status == collab.STATUS_DONE
|
assert result["order"].status == collab.STATUS_DONE
|
||||||
assert result["order"].done_at is not None
|
assert result["order"].done_at is not None
|
||||||
|
assert result["order"].succeeded_at is not None
|
||||||
lease = self.session.query(AccountLease).one()
|
lease = self.session.query(AccountLease).one()
|
||||||
assert lease.status == "released"
|
assert lease.status == "released"
|
||||||
assert lease.release_reason == "douyu_collab_done"
|
assert lease.release_reason == "douyu_collab_done"
|
||||||
|
|
||||||
|
def test_successful_order_purchase_fields_locked_after_status_rollback(self):
|
||||||
|
order = collab.create_order(
|
||||||
|
self.session,
|
||||||
|
self.admin,
|
||||||
|
order_no="DY-SUCCESS-LOCK-1",
|
||||||
|
shop="店铺A",
|
||||||
|
account_username="douyu-account-a",
|
||||||
|
gift_name="礼包A",
|
||||||
|
required_points=100,
|
||||||
|
home_images=["collab/home-success-lock-1.png"],
|
||||||
|
client=FakeClient(),
|
||||||
|
)
|
||||||
|
collab.set_status(
|
||||||
|
self.session,
|
||||||
|
self.admin,
|
||||||
|
order,
|
||||||
|
status=collab.STATUS_DONE,
|
||||||
|
reason="已兑换",
|
||||||
|
)
|
||||||
|
collab.set_status(
|
||||||
|
self.session,
|
||||||
|
self.admin,
|
||||||
|
order,
|
||||||
|
status=collab.STATUS_TO_RECHARGE,
|
||||||
|
reason="测试回退",
|
||||||
|
rollback=True,
|
||||||
|
)
|
||||||
|
assert order.done_at is None
|
||||||
|
assert order.succeeded_at is not None
|
||||||
|
|
||||||
|
support = User(
|
||||||
|
username="douyu-collab-support-lock",
|
||||||
|
password_hash="hash",
|
||||||
|
role="support",
|
||||||
|
is_active=True,
|
||||||
|
)
|
||||||
|
self.session.add(support)
|
||||||
|
self.session.commit()
|
||||||
|
|
||||||
|
with pytest.raises(collab.CollabError) as excinfo:
|
||||||
|
collab.update_order(
|
||||||
|
self.session,
|
||||||
|
support,
|
||||||
|
order,
|
||||||
|
{
|
||||||
|
"gift_name": "礼包B",
|
||||||
|
"commodity_id": "gift-b",
|
||||||
|
"required_points": 900,
|
||||||
|
},
|
||||||
|
expected_version=order.version,
|
||||||
|
)
|
||||||
|
assert excinfo.value.code == "purchase_lock_admin_required"
|
||||||
|
assert order.gift_name == "礼包A"
|
||||||
|
|
||||||
|
with pytest.raises(collab.CollabError) as account_excinfo:
|
||||||
|
collab.set_account(
|
||||||
|
self.session,
|
||||||
|
support,
|
||||||
|
order,
|
||||||
|
self.account.username,
|
||||||
|
client=FakeClient(),
|
||||||
|
)
|
||||||
|
assert account_excinfo.value.code == "purchase_lock_admin_required"
|
||||||
|
|
||||||
|
collab.update_order(
|
||||||
|
self.session,
|
||||||
|
support,
|
||||||
|
order,
|
||||||
|
{"remark": "成功后仍允许补充备注"},
|
||||||
|
expected_version=order.version,
|
||||||
|
)
|
||||||
|
assert order.remark == "成功后仍允许补充备注"
|
||||||
|
|
||||||
|
def test_super_admin_success_purchase_change_requires_confirmation(self):
|
||||||
|
order = collab.create_order(
|
||||||
|
self.session,
|
||||||
|
self.admin,
|
||||||
|
order_no="DY-SUCCESS-LOCK-2",
|
||||||
|
shop="店铺A",
|
||||||
|
account_username="douyu-account-a",
|
||||||
|
gift_name="礼包A",
|
||||||
|
required_points=100,
|
||||||
|
home_images=["collab/home-success-lock-2.png"],
|
||||||
|
client=FakeClient(),
|
||||||
|
)
|
||||||
|
collab.set_status(
|
||||||
|
self.session,
|
||||||
|
self.admin,
|
||||||
|
order,
|
||||||
|
status=collab.STATUS_DONE,
|
||||||
|
reason="已兑换",
|
||||||
|
)
|
||||||
|
payload = {
|
||||||
|
"gift_name": "礼包B",
|
||||||
|
"commodity_id": "gift-b",
|
||||||
|
"required_points": 900,
|
||||||
|
}
|
||||||
|
|
||||||
|
with pytest.raises(collab.CollabError) as excinfo:
|
||||||
|
collab.update_order(
|
||||||
|
self.session,
|
||||||
|
self.admin,
|
||||||
|
order,
|
||||||
|
payload,
|
||||||
|
expected_version=order.version,
|
||||||
|
)
|
||||||
|
assert excinfo.value.code == "purchase_change_confirmation_required"
|
||||||
|
assert order.gift_name == "礼包A"
|
||||||
|
|
||||||
|
changes = collab.update_order(
|
||||||
|
self.session,
|
||||||
|
self.admin,
|
||||||
|
order,
|
||||||
|
{**payload, "confirm_purchase_change": True},
|
||||||
|
expected_version=order.version,
|
||||||
|
)
|
||||||
|
assert changes["gift_name"]["new"] == "礼包B"
|
||||||
|
assert order.gift_name == "礼包B"
|
||||||
|
assert order.commodity_id == "gift-b"
|
||||||
|
assert order.required_points == 900
|
||||||
|
|
||||||
def test_status_change_rejects_unrelated_active_platform_lease(self):
|
def test_status_change_rejects_unrelated_active_platform_lease(self):
|
||||||
order = collab.create_order(
|
order = collab.create_order(
|
||||||
self.session,
|
self.session,
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ TESTS_DIR = Path(__file__).resolve().parent
|
|||||||
PROJECT_ROOT = TESTS_DIR.parent
|
PROJECT_ROOT = TESTS_DIR.parent
|
||||||
VERSIONS_DIR = PROJECT_ROOT / "web" / "backend" / "migrations" / "versions"
|
VERSIONS_DIR = PROJECT_ROOT / "web" / "backend" / "migrations" / "versions"
|
||||||
|
|
||||||
HEAD_REVISION = "20261120_0102"
|
HEAD_REVISION = "20261120_0103"
|
||||||
|
|
||||||
# 迁移新增、但不声明在模型里的复合查询索引。
|
# 迁移新增、但不声明在模型里的复合查询索引。
|
||||||
EXTRA_INDEXES = (
|
EXTRA_INDEXES = (
|
||||||
@@ -168,6 +168,92 @@ class TestMigrationSmoke:
|
|||||||
with admin_engine.begin() as conn:
|
with admin_engine.begin() as conn:
|
||||||
conn.execute(text(f"DROP DATABASE IF EXISTS `{mig_db}`;"))
|
conn.execute(text(f"DROP DATABASE IF EXISTS `{mig_db}`;"))
|
||||||
|
|
||||||
|
def test_0103_backfills_success_marker_from_history(self):
|
||||||
|
creds = get_mysql_credentials()
|
||||||
|
mig_db = f"douyu_login_mig_{secrets.token_hex(4)}"
|
||||||
|
mig_url = (
|
||||||
|
f"mysql+pymysql://{quote_plus(creds['user'])}:"
|
||||||
|
f"{quote_plus(creds['password'])}@{creds['host']}:{creds['port']}/"
|
||||||
|
f"{mig_db}?charset=utf8mb4"
|
||||||
|
)
|
||||||
|
|
||||||
|
admin_engine = get_test_engine()
|
||||||
|
mig_engine = create_engine(mig_url)
|
||||||
|
original_url = database_module.DATABASE_URL
|
||||||
|
with admin_engine.begin() as conn:
|
||||||
|
conn.execute(
|
||||||
|
text(
|
||||||
|
f"CREATE DATABASE `{mig_db}` "
|
||||||
|
"CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
database_module.DATABASE_URL = mig_url
|
||||||
|
cfg = _migration_config()
|
||||||
|
cfg.set_main_option("sqlalchemy.url", mig_url)
|
||||||
|
command.upgrade(cfg, "20261120_0102")
|
||||||
|
|
||||||
|
with mig_engine.begin() as conn:
|
||||||
|
for order_no, status, done_at in (
|
||||||
|
("DY-MIG-DONE", "done", "2026-11-01 10:00:00"),
|
||||||
|
("DY-MIG-ROLLED-BACK", "to_recharge", None),
|
||||||
|
("DY-MIG-ACTIVE", "recharged", None),
|
||||||
|
):
|
||||||
|
conn.execute(
|
||||||
|
text(
|
||||||
|
"INSERT INTO douyu_external_orders "
|
||||||
|
"(order_no, status, done_at, version, created_at, updated_at) "
|
||||||
|
"VALUES (:order_no, :status, :done_at, 0, NOW(), NOW())"
|
||||||
|
),
|
||||||
|
{
|
||||||
|
"order_no": order_no,
|
||||||
|
"status": status,
|
||||||
|
"done_at": done_at,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
rolled_back_id = conn.execute(
|
||||||
|
text(
|
||||||
|
"SELECT id FROM douyu_external_orders "
|
||||||
|
"WHERE order_no = 'DY-MIG-ROLLED-BACK'"
|
||||||
|
)
|
||||||
|
).scalar_one()
|
||||||
|
conn.execute(
|
||||||
|
text(
|
||||||
|
"INSERT INTO audit_logs "
|
||||||
|
"(user_id, username, action, target, detail, success, created_at) "
|
||||||
|
"VALUES "
|
||||||
|
"(NULL, 'migration-test', 'douyu:collab:status', :target, "
|
||||||
|
"'{\"from\":\"scripted\",\"to\":\"done\"}', 1, "
|
||||||
|
"'2026-11-02 10:00:00'), "
|
||||||
|
"(NULL, 'migration-test', 'douyu:collab:status', :target, "
|
||||||
|
"'{\"from\":\"done\",\"to\":\"to_recharge\"}', 1, "
|
||||||
|
"'2026-11-03 10:00:00')"
|
||||||
|
),
|
||||||
|
{"target": f"douyu_external_order:{rolled_back_id}"},
|
||||||
|
)
|
||||||
|
|
||||||
|
command.upgrade(cfg, "head")
|
||||||
|
|
||||||
|
with mig_engine.connect() as conn:
|
||||||
|
rows = conn.execute(
|
||||||
|
text(
|
||||||
|
"SELECT order_no, succeeded_at "
|
||||||
|
"FROM douyu_external_orders ORDER BY id"
|
||||||
|
)
|
||||||
|
).mappings()
|
||||||
|
succeeded = {
|
||||||
|
row["order_no"]: row["succeeded_at"]
|
||||||
|
for row in rows
|
||||||
|
}
|
||||||
|
assert succeeded["DY-MIG-DONE"] is not None
|
||||||
|
assert succeeded["DY-MIG-ROLLED-BACK"] is not None
|
||||||
|
assert succeeded["DY-MIG-ACTIVE"] is None
|
||||||
|
finally:
|
||||||
|
database_module.DATABASE_URL = original_url
|
||||||
|
mig_engine.dispose()
|
||||||
|
with admin_engine.begin() as conn:
|
||||||
|
conn.execute(text(f"DROP DATABASE IF EXISTS `{mig_db}`;"))
|
||||||
|
|
||||||
def test_0077_converts_super_admin_membership_to_overlay(self):
|
def test_0077_converts_super_admin_membership_to_overlay(self):
|
||||||
creds = get_mysql_credentials()
|
creds = get_mysql_credentials()
|
||||||
mig_db = f"douyu_login_mig_{secrets.token_hex(4)}"
|
mig_db = f"douyu_login_mig_{secrets.token_hex(4)}"
|
||||||
|
|||||||
@@ -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)
|
recharged_at: Mapped[datetime | None] = mapped_column(UTCDateTime, nullable=True)
|
||||||
scripted_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: 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="")
|
void_reason: Mapped[str] = mapped_column(String(256), default="", server_default="")
|
||||||
|
|
||||||
# ---- 鱼翅 / 积分 / 核账快照 ----
|
# ---- 鱼翅 / 积分 / 核账快照 ----
|
||||||
|
|||||||
@@ -2590,6 +2590,7 @@ class DouyuCollabOrderUpdate(BaseModel):
|
|||||||
home_images: list[str] | None = None
|
home_images: list[str] | None = None
|
||||||
remark: str | None = Field(None, max_length=512)
|
remark: str | None = Field(None, max_length=512)
|
||||||
expected_version: int | None = None
|
expected_version: int | None = None
|
||||||
|
confirm_purchase_change: bool = False
|
||||||
takeover_platform_lease: bool = False
|
takeover_platform_lease: bool = False
|
||||||
|
|
||||||
|
|
||||||
@@ -2783,6 +2784,8 @@ class DouyuCollabOrderOut(BaseModel):
|
|||||||
recharged_at: datetime | None = None
|
recharged_at: datetime | None = None
|
||||||
scripted_at: datetime | None = None
|
scripted_at: datetime | None = None
|
||||||
done_at: datetime | None = None
|
done_at: datetime | None = None
|
||||||
|
succeeded_at: datetime | None = None
|
||||||
|
purchase_change_locked: bool = False
|
||||||
void_reason: str = ""
|
void_reason: str = ""
|
||||||
|
|
||||||
is_archived: bool = False
|
is_archived: bool = False
|
||||||
|
|||||||
@@ -181,6 +181,18 @@ STATUS_TIMESTAMP_FIELDS = {
|
|||||||
STATUS_DONE: "done_at",
|
STATUS_DONE: "done_at",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# 成功订单已经锁定购买事实。这些字段一旦变更,会让订单号、购买账号或
|
||||||
|
# 兑换商品与后续核账/审计不一致,因此只允许超级管理员显式确认后修改。
|
||||||
|
SUCCESS_PURCHASE_FIELDS = frozenset(
|
||||||
|
{
|
||||||
|
"order_no",
|
||||||
|
"account_username",
|
||||||
|
"gift_name",
|
||||||
|
"commodity_id",
|
||||||
|
"required_points",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
ARCHIVABLE_STATUSES = (STATUS_DONE,)
|
ARCHIVABLE_STATUSES = (STATUS_DONE,)
|
||||||
# 同一账号核账只统计“还没有完成兑换”的单:done/scripted 不重复占积分。
|
# 同一账号核账只统计“还没有完成兑换”的单:done/scripted 不重复占积分。
|
||||||
POINTS_GROUP_STATUSES: tuple[str, ...] = (
|
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
|
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:
|
def _json_safe(value: Any) -> Any:
|
||||||
if isinstance(value, dict):
|
if isinstance(value, dict):
|
||||||
return {str(k): _json_safe(v) for k, v in value.items()}
|
return {str(k): _json_safe(v) for k, v in value.items()}
|
||||||
@@ -531,6 +551,7 @@ def unlink_account(
|
|||||||
) -> DouyuExternalOrder:
|
) -> DouyuExternalOrder:
|
||||||
"""解除协作单与账号的关联,但不删除内部账号。"""
|
"""解除协作单与账号的关联,但不删除内部账号。"""
|
||||||
_assert_account_replace_permission(current)
|
_assert_account_replace_permission(current)
|
||||||
|
_assert_success_account_change_allowed(current, order)
|
||||||
_assert_account_replaceable(order)
|
_assert_account_replaceable(order)
|
||||||
_assert_version(order, expected_version)
|
_assert_version(order, expected_version)
|
||||||
if not order.account_id and not _text(order.account_username):
|
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:
|
def _order_occupies_account(order: DouyuExternalOrder) -> bool:
|
||||||
return (
|
return (
|
||||||
bool(order.account_id)
|
bool(order.account_id)
|
||||||
@@ -1795,6 +1827,7 @@ def _apply_platform_fulfillment_status(
|
|||||||
if task.execution_status == "completed":
|
if task.execution_status == "completed":
|
||||||
order.status = STATUS_DONE
|
order.status = STATUS_DONE
|
||||||
order.done_at = order.done_at or task.completed_at or _now()
|
order.done_at = order.done_at or task.completed_at or _now()
|
||||||
|
_mark_order_succeeded(order, order.done_at)
|
||||||
elif task.execution_status == "cancelled":
|
elif task.execution_status == "cancelled":
|
||||||
order.status = STATUS_VOID
|
order.status = STATUS_VOID
|
||||||
order.void_reason = order.void_reason or "直播履约任务已取消"
|
order.void_reason = order.void_reason or "直播履约任务已取消"
|
||||||
@@ -1808,6 +1841,7 @@ def _apply_platform_fulfillment_status(
|
|||||||
):
|
):
|
||||||
order.status = STATUS_DONE
|
order.status = STATUS_DONE
|
||||||
order.done_at = order.done_at or task.completed_at or _now()
|
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:
|
elif task.execution_status == "cancelled" and order.status != STATUS_VOID:
|
||||||
order.status = STATUS_VOID
|
order.status = STATUS_VOID
|
||||||
order.void_reason = order.void_reason or "直播履约任务已取消"
|
order.void_reason = order.void_reason or "直播履约任务已取消"
|
||||||
@@ -2051,6 +2085,7 @@ def update_order(
|
|||||||
_assert_version(order, expected_version)
|
_assert_version(order, expected_version)
|
||||||
previous_account_id = int(order.account_id or 0)
|
previous_account_id = int(order.account_id or 0)
|
||||||
changes: dict[str, dict[str, Any]] = {}
|
changes: dict[str, dict[str, Any]] = {}
|
||||||
|
pending: dict[str, Any] = {}
|
||||||
editable = {
|
editable = {
|
||||||
"order_no",
|
"order_no",
|
||||||
"shop",
|
"shop",
|
||||||
@@ -2086,9 +2121,28 @@ def update_order(
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
new = _text(payload[field], max_length=512 if field == "remark" else 128)
|
new = _text(payload[field], max_length=512 if field == "remark" else 128)
|
||||||
|
pending[field] = new
|
||||||
if new != old:
|
if new != old:
|
||||||
changes[field] = {"old": old, "new": new}
|
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 (
|
if "account_username" in payload and (
|
||||||
order.account_id is None
|
order.account_id is None
|
||||||
or not order.bind_game_role
|
or not order.bind_game_role
|
||||||
@@ -2190,6 +2244,7 @@ def set_account(
|
|||||||
commit: bool = True,
|
commit: bool = True,
|
||||||
) -> dict[str, Any]:
|
) -> dict[str, Any]:
|
||||||
_assert_mutable(order)
|
_assert_mutable(order)
|
||||||
|
_assert_success_account_change_allowed(current, order)
|
||||||
_assert_version(order, expected_version)
|
_assert_version(order, expected_version)
|
||||||
account = account_by_username(db, username)
|
account = account_by_username(db, username)
|
||||||
if account is None:
|
if account is None:
|
||||||
@@ -2371,6 +2426,8 @@ def _restore_void_status(
|
|||||||
setattr(order, field, _now())
|
setattr(order, field, _now())
|
||||||
|
|
||||||
order.status = target
|
order.status = target
|
||||||
|
if target == STATUS_DONE:
|
||||||
|
_mark_order_succeeded(order)
|
||||||
order.void_reason = ""
|
order.void_reason = ""
|
||||||
order.updated_by = current.id
|
order.updated_by = current.id
|
||||||
order.version = int(order.version or 0) + 1
|
order.version = int(order.version or 0) + 1
|
||||||
@@ -2544,6 +2601,8 @@ def set_status(
|
|||||||
allow_missing_role=target == STATUS_RECHARGED,
|
allow_missing_role=target == STATUS_RECHARGED,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if target == STATUS_DONE:
|
||||||
|
_mark_order_succeeded(order, now)
|
||||||
if rollback:
|
if rollback:
|
||||||
for name, field in STATUS_TIMESTAMP_FIELDS.items():
|
for name, field in STATUS_TIMESTAMP_FIELDS.items():
|
||||||
if STAGE_INDEX.get(name, -1) > target_index:
|
if STAGE_INDEX.get(name, -1) > target_index:
|
||||||
@@ -3379,6 +3438,8 @@ def serialize_order(
|
|||||||
"recharged_at": order.recharged_at,
|
"recharged_at": order.recharged_at,
|
||||||
"scripted_at": order.scripted_at,
|
"scripted_at": order.scripted_at,
|
||||||
"done_at": order.done_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 "",
|
"void_reason": order.void_reason or "",
|
||||||
"is_archived": order.archived_at is not None,
|
"is_archived": order.archived_at is not None,
|
||||||
"archived_at": order.archived_at,
|
"archived_at": order.archived_at,
|
||||||
|
|||||||
@@ -73,6 +73,8 @@ export interface DouyuCollabOrder {
|
|||||||
recharged_at: string | null;
|
recharged_at: string | null;
|
||||||
scripted_at: string | null;
|
scripted_at: string | null;
|
||||||
done_at: string | null;
|
done_at: string | null;
|
||||||
|
succeeded_at: string | null;
|
||||||
|
purchase_change_locked: boolean;
|
||||||
void_reason: string;
|
void_reason: string;
|
||||||
is_archived: boolean;
|
is_archived: boolean;
|
||||||
archived_at: string | null;
|
archived_at: string | null;
|
||||||
@@ -275,6 +277,7 @@ export interface DouyuCollabOrderUpdate {
|
|||||||
home_images?: string[];
|
home_images?: string[];
|
||||||
remark?: string;
|
remark?: string;
|
||||||
expected_version?: number;
|
expected_version?: number;
|
||||||
|
confirm_purchase_change?: boolean;
|
||||||
takeover_platform_lease?: boolean;
|
takeover_platform_lease?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -396,6 +396,42 @@ const EMPTY_FORM: OrderFormState = {
|
|||||||
remark: '',
|
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() {
|
export default function DouyuCollabPage() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const [searchParams, setSearchParams] = useSearchParams();
|
const [searchParams, setSearchParams] = useSearchParams();
|
||||||
@@ -447,6 +483,7 @@ export default function DouyuCollabPage() {
|
|||||||
|
|
||||||
const [createOpen, setCreateOpen] = useState(false);
|
const [createOpen, setCreateOpen] = useState(false);
|
||||||
const [editing, setEditing] = useState<DouyuCollabOrder | null>(null);
|
const [editing, setEditing] = useState<DouyuCollabOrder | null>(null);
|
||||||
|
const successfulPurchaseFieldsLocked = Boolean(editing?.succeeded_at && !isAdmin);
|
||||||
const [form, setForm] = useState<OrderFormState>(EMPTY_FORM);
|
const [form, setForm] = useState<OrderFormState>(EMPTY_FORM);
|
||||||
const [lookup, setLookup] = useState<DouyuCollabAccountLookup | null>(null);
|
const [lookup, setLookup] = useState<DouyuCollabAccountLookup | null>(null);
|
||||||
const lookupSeq = useRef(0);
|
const lookupSeq = useRef(0);
|
||||||
@@ -855,7 +892,10 @@ export default function DouyuCollabPage() {
|
|||||||
!form.account_username.trim() ||
|
!form.account_username.trim() ||
|
||||||
!form.gift_name.trim() ||
|
!form.gift_name.trim() ||
|
||||||
form.home_images.length === 0;
|
form.home_images.length === 0;
|
||||||
const saveOrder = async (takeoverPlatformLease: boolean) => {
|
const saveOrder = async (
|
||||||
|
takeoverPlatformLease: boolean,
|
||||||
|
confirmPurchaseChange = false,
|
||||||
|
) => {
|
||||||
if (editing) {
|
if (editing) {
|
||||||
return douyuCollabApi.updateOrder(editing.id, {
|
return douyuCollabApi.updateOrder(editing.id, {
|
||||||
order_no: form.order_no.trim(),
|
order_no: form.order_no.trim(),
|
||||||
@@ -868,6 +908,7 @@ export default function DouyuCollabPage() {
|
|||||||
home_images: form.home_images,
|
home_images: form.home_images,
|
||||||
remark: form.remark,
|
remark: form.remark,
|
||||||
expected_version: editing.version,
|
expected_version: editing.version,
|
||||||
|
confirm_purchase_change: confirmPurchaseChange,
|
||||||
takeover_platform_lease: takeoverPlatformLease,
|
takeover_platform_lease: takeoverPlatformLease,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -904,34 +945,71 @@ export default function DouyuCollabPage() {
|
|||||||
refreshAll();
|
refreshAll();
|
||||||
};
|
};
|
||||||
|
|
||||||
setSubmitting(true);
|
const runSave = async (confirmPurchaseChange: boolean) => {
|
||||||
try {
|
setSubmitting(true);
|
||||||
finishSaved(await saveOrder(false));
|
try {
|
||||||
} catch (error) {
|
finishSaved(await saveOrder(false, confirmPurchaseChange));
|
||||||
if (errorCodeOf(error) === 'account_lease_conflict') {
|
} 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);
|
setSubmitting(false);
|
||||||
modal.confirm({
|
}
|
||||||
title: '平台履约账号需要转人工',
|
};
|
||||||
content: `${getErrorMessage(error)}。确认后平台履约任务会转为人工,并由当前协作单接管账号。`,
|
|
||||||
okText: '确认接管并转人工',
|
const purchaseChanges =
|
||||||
cancelText: '取消',
|
editing?.succeeded_at ? successfulPurchaseChanges(editing, form) : [];
|
||||||
onOk: async () => {
|
if (purchaseChanges.length > 0) {
|
||||||
setSubmitting(true);
|
if (!isAdmin) {
|
||||||
try {
|
message.error('订单已有成功记录,购买信息仅允许超级管理员修改');
|
||||||
finishSaved(await saveOrder(true));
|
|
||||||
} catch (retryError) {
|
|
||||||
message.error(getErrorMessage(retryError));
|
|
||||||
} finally {
|
|
||||||
setSubmitting(false);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
message.error(getErrorMessage(error));
|
modal.confirm({
|
||||||
} finally {
|
title: '确认修改成功订单的购买信息?',
|
||||||
setSubmitting(false);
|
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 = () => {
|
const openUnlinkAccount = () => {
|
||||||
@@ -2246,6 +2324,23 @@ export default function DouyuCollabPage() {
|
|||||||
description="只有斗鱼账号、礼包、主页截图和绑定角色都齐全,才会自动进入「待充值」。绑定角色读不到时,请先确认账号 CK 是否可用。"
|
description="只有斗鱼账号、礼包、主页截图和绑定角色都齐全,才会自动进入「待充值」。绑定角色读不到时,请先确认账号 CK 是否可用。"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{editing?.succeeded_at && (
|
||||||
|
<Alert
|
||||||
|
style={{ marginBottom: 12 }}
|
||||||
|
type={isAdmin ? 'warning' : 'error'}
|
||||||
|
showIcon
|
||||||
|
message={
|
||||||
|
isAdmin
|
||||||
|
? '该订单已有成功记录'
|
||||||
|
: '该订单已有成功记录,购买信息已锁定'
|
||||||
|
}
|
||||||
|
description={
|
||||||
|
isAdmin
|
||||||
|
? '订单编号、斗鱼用户名、礼包、商品编号和所需积分只能在二次确认后修改。'
|
||||||
|
: '订单编号、斗鱼用户名、礼包、商品编号和所需积分仅允许超级管理员修改;其他资料仍可编辑。'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<Row gutter={16}>
|
<Row gutter={16}>
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
<div style={{ marginBottom: 12 }}>
|
<div style={{ marginBottom: 12 }}>
|
||||||
@@ -2255,6 +2350,7 @@ export default function DouyuCollabPage() {
|
|||||||
value={form.order_no}
|
value={form.order_no}
|
||||||
maxLength={64}
|
maxLength={64}
|
||||||
placeholder="外部订单编号"
|
placeholder="外部订单编号"
|
||||||
|
disabled={successfulPurchaseFieldsLocked}
|
||||||
onChange={(event) => updateForm('order_no', event.target.value)}
|
onChange={(event) => updateForm('order_no', event.target.value)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -2296,9 +2392,14 @@ export default function DouyuCollabPage() {
|
|||||||
<Input
|
<Input
|
||||||
value={form.account_username}
|
value={form.account_username}
|
||||||
placeholder="输入内部斗鱼账号用户名,停止输入后自动查询"
|
placeholder="输入内部斗鱼账号用户名,停止输入后自动查询"
|
||||||
|
disabled={successfulPurchaseFieldsLocked}
|
||||||
onChange={(event) => updateForm('account_username', event.target.value)}
|
onChange={(event) => updateForm('account_username', event.target.value)}
|
||||||
/>
|
/>
|
||||||
<Button loading={lookupLoading} onClick={() => void handleLookup()}>
|
<Button
|
||||||
|
loading={lookupLoading}
|
||||||
|
disabled={successfulPurchaseFieldsLocked}
|
||||||
|
onClick={() => void handleLookup()}
|
||||||
|
>
|
||||||
查询账号
|
查询账号
|
||||||
</Button>
|
</Button>
|
||||||
</Space.Compact>
|
</Space.Compact>
|
||||||
@@ -2321,6 +2422,7 @@ export default function DouyuCollabPage() {
|
|||||||
)}
|
)}
|
||||||
{editing &&
|
{editing &&
|
||||||
canReplaceAccount &&
|
canReplaceAccount &&
|
||||||
|
!editing.succeeded_at &&
|
||||||
editing.status !== 'done' &&
|
editing.status !== 'done' &&
|
||||||
editing.status !== 'void' && (
|
editing.status !== 'void' && (
|
||||||
<Space style={{ marginTop: 8 }} wrap>
|
<Space style={{ marginTop: 8 }} wrap>
|
||||||
@@ -2355,6 +2457,7 @@ export default function DouyuCollabPage() {
|
|||||||
allowClear
|
allowClear
|
||||||
value={form.gift_name}
|
value={form.gift_name}
|
||||||
options={giftNameOptions}
|
options={giftNameOptions}
|
||||||
|
disabled={successfulPurchaseFieldsLocked}
|
||||||
placeholder={
|
placeholder={
|
||||||
goodsPool.length || giftRecords.length
|
goodsPool.length || giftRecords.length
|
||||||
? '输入礼包名称,或选择已有礼包'
|
? '输入礼包名称,或选择已有礼包'
|
||||||
@@ -2370,6 +2473,7 @@ export default function DouyuCollabPage() {
|
|||||||
optionFilterProp="label"
|
optionFilterProp="label"
|
||||||
value={form.gift_name || undefined}
|
value={form.gift_name || undefined}
|
||||||
options={giftNameOptions}
|
options={giftNameOptions}
|
||||||
|
disabled={successfulPurchaseFieldsLocked}
|
||||||
placeholder={
|
placeholder={
|
||||||
giftNameOptions.length
|
giftNameOptions.length
|
||||||
? '选择礼包(由管理员统一维护)'
|
? '选择礼包(由管理员统一维护)'
|
||||||
@@ -2395,7 +2499,7 @@ export default function DouyuCollabPage() {
|
|||||||
min={0}
|
min={0}
|
||||||
precision={0}
|
precision={0}
|
||||||
value={form.required_points}
|
value={form.required_points}
|
||||||
disabled={!canManage}
|
disabled={!canManage || successfulPurchaseFieldsLocked}
|
||||||
placeholder={canManage ? '手动填写;选择礼包后自动带出' : '由管理员统一配置'}
|
placeholder={canManage ? '手动填写;选择礼包后自动带出' : '由管理员统一配置'}
|
||||||
onChange={(value) => updateForm('required_points', value ?? null)}
|
onChange={(value) => updateForm('required_points', value ?? null)}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user