fix(approval): 版本号唯一键兜底 + 取号改当前读防并发重复
- V12 迁移：先重排存量重复 (order_type, ref_id) 分组的 version_no （V11 把存量一律置 1，而 V11 前重提是新建行），再加 uk_approval_orders_order_type_ref_version；只重排真有重复的分组， 避免改动前端已展示过的历史版本号 - _next_version 改锁读（select version_no ... FOR UPDATE，最大值在 Python 侧算）：请求级鉴权的普通 SELECT 已把 REPEATABLE READ 快照 锚定在请求开始时刻，原 MAX 快照读在并发下会算出同一版本号； 聚合 + FOR UPDATE 为 MySQL 明确禁止，故不锁聚合结果 - 编辑与月结提交路径把 1062 收敛为 400「提交冲突（版本号生成重复）， 请重试」，其余完整性错误原样上抛；submit_order 内不 catch/rollback - 驳回清空方案的过时注释改为 V11 起的 append-only 语义（置历史不删行） - init-dev.sql 同步唯一键与 alembic_version 7f4f7b918bc4，导出 V12 SQL - 测试：集成 +5（锁读 SQL 形态、两会话快照回归、唯一键 1062、冲突 400、 正常递增）+ 单元 +1；工作台假审批单改用不同 ref_id 适配唯一键 - 全量回归 897 passed；ruff 与前端 type-check 绿 Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
liuwenxinandClaude Code committed
1 parent
694d21d1fd
commit
9964281c14
12 files changed
+398
-42
No files matched your search
@@ -15,7 +15,16 @@ ref_id 为**固化无外键**（同 business_status_logs 先例）：order_type=
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import JSON, DateTime, ForeignKey, Index, Integer, String, text
|
||||
from sqlalchemy import (
|
||||
JSON,
|
||||
DateTime,
|
||||
ForeignKey,
|
||||
Index,
|
||||
Integer,
|
||||
String,
|
||||
UniqueConstraint,
|
||||
text,
|
||||
)
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import BIGINT_UNSIGNED, TINYINT_TYPE, Base, TimestampMixin, mysql_table_args
|
||||
@@ -54,6 +63,14 @@ class ApprovalOrder(Base, TimestampMixin):
|
||||
__tablename__ = "approval_orders"
|
||||
__table_args__ = mysql_table_args(
|
||||
"审批单表（营销后勤提交→财务复核→领导审核；开关关闭时自动通过留痕）",
|
||||
# 同一引用对象的第 N 次送审在库里有唯一一行：并发提单算重版本号时
|
||||
# 由 DB 兜住（应用层取号走锁读，见 approval_service._next_version）
|
||||
UniqueConstraint(
|
||||
"order_type",
|
||||
"ref_id",
|
||||
"version_no",
|
||||
name="uk_approval_orders_order_type_ref_version",
|
||||
),
|
||||
Index("idx_approval_orders_type_status", "order_type", "status"),
|
||||
# 版本号按 (order_type, ref_id) 递增，须有对应索引避免全表 max 扫描
|
||||
Index("idx_approval_orders_type_ref", "order_type", "ref_id"),
|
||||
@@ -82,7 +99,8 @@ class ApprovalOrder(Base, TimestampMixin):
|
||||
Integer,
|
||||
nullable=False,
|
||||
server_default="1",
|
||||
comment="提交版本号（同一对象类型+引用对象从1递增；重提产生新版本，旧单快照不覆盖）",
|
||||
comment="提交版本号（同一对象类型+引用对象从1递增；重提产生新版本，旧单快照不覆盖；"
|
||||
"同一对象内唯一，由uk_approval_orders_order_type_ref_version强制）",
|
||||
)
|
||||
snapshot_json: Mapped[dict | None] = mapped_column(
|
||||
JSON,
|
||||
|
||||
@@ -296,11 +296,11 @@ def act(
|
||||
operator_name=operator.username,
|
||||
)
|
||||
)
|
||||
# 驳回=方案未获批准：清空该业务的二次分配行，防止被否决的方案以
|
||||
# 「当前生效行」身份留在表里、被 M3 核算快照算进工资；方案事实由
|
||||
# 审批单留痕与操作日志 request_data 承载（分摊语义落定后如需保留
|
||||
# 历史版本，在 ④ 设计时演进）。审批单的清理由调用方（act 内联）
|
||||
# 委托 business_repository 完成 —— service 层互调、不触 commit。
|
||||
# 驳回=方案未获批准：把该业务的生效方案行置历史（is_active=0，
|
||||
# **不删行**——V11 起 append-only 版本化），防止被否决的方案以
|
||||
# 「当前生效行」身份被 M3 核算快照算进工资；历史方案仍可在业务
|
||||
# 详情 allocation_history 回溯。委托 business_repository 完成
|
||||
# —— service 层互调、不触 commit。
|
||||
if rejected and order.order_type == 1:
|
||||
from app.repositories import business_repository
|
||||
|
||||
@@ -414,18 +414,34 @@ def _withdraw_pending(session: Session, *, order_type: int, ref_id: int, operato
|
||||
|
||||
|
||||
def _next_version(session: Session, order_type: int, ref_id: int) -> int:
|
||||
"""同一对象类型+引用对象的下一个提交版本号（从 1 递增）。"""
|
||||
return (
|
||||
int(
|
||||
session.execute(
|
||||
select(func.coalesce(func.max(ApprovalOrder.version_no), 0)).where(
|
||||
ApprovalOrder.order_type == order_type,
|
||||
ApprovalOrder.ref_id == ref_id,
|
||||
)
|
||||
).scalar_one()
|
||||
"""同一对象类型+引用对象的下一个提交版本号（从 1 递增）。
|
||||
|
||||
**必须用锁读（当前读），不能用普通 MAX 查询**：普通 SELECT 在
|
||||
REPEATABLE READ 下是快照读，读到的是本事务首次一致读的快照；请求级
|
||||
鉴权（deps.get_current_user 与业务共用同一 DbSession）那次 SELECT 已把
|
||||
快照锚定在请求开始时刻，此后即使父行锁等到并发事务提交，MAX 仍停在
|
||||
旧快照上——两个请求会算出同一个 version_no。锁读是当前读，永远读最新
|
||||
已提交数据。
|
||||
|
||||
**不能写成 select(func.max(...)).with_for_update()**：MySQL 官方明确
|
||||
「Locking clauses are not permitted in queries with aggregate functions
|
||||
or GROUP BY」，聚合结果上的 FOR UPDATE 语义无保证。改锁「该 ref 的现有
|
||||
版本行」，最大值在 Python 侧算——同 no_generator 的既有套路。只取
|
||||
version_no 单列，不把 snapshot_json 拉进内存。
|
||||
"""
|
||||
versions = (
|
||||
session.execute(
|
||||
select(ApprovalOrder.version_no)
|
||||
.where(
|
||||
ApprovalOrder.order_type == order_type,
|
||||
ApprovalOrder.ref_id == ref_id,
|
||||
)
|
||||
.with_for_update()
|
||||
)
|
||||
+ 1
|
||||
.scalars()
|
||||
.all()
|
||||
)
|
||||
return (max(versions) if versions else 0) + 1
|
||||
|
||||
|
||||
def allocation_content(session: Session, business: Business) -> dict:
|
||||
|
||||
@@ -347,15 +347,14 @@ def _build_allocation_rows(
|
||||
return rows
|
||||
|
||||
|
||||
def _plan_changed(
|
||||
old_rows: list[SecondaryAllocation], new_rows: list[SecondaryAllocation]
|
||||
) -> bool:
|
||||
def _plan_changed(old_rows: list[SecondaryAllocation], new_rows: list[SecondaryAllocation]) -> bool:
|
||||
"""方案内容（参与人 + 比例）是否真的变了。
|
||||
|
||||
比较口径是**集合**（人员 ID 与其比例的组合），与提交顺序无关——送审
|
||||
快照同样按库内生效行的顺序生成，若按顺序比较，用户只是把行拖了个
|
||||
序就会被判成「变了」，进而无谓地新增版本与重提审批单。
|
||||
"""
|
||||
|
||||
def _key(row: SecondaryAllocation) -> tuple[int, Decimal]:
|
||||
return (row.personnel_id, Decimal(row.ratio).quantize(Decimal("0.01")))
|
||||
|
||||
@@ -564,14 +563,22 @@ def update_business(
|
||||
ref_id=business_id,
|
||||
snapshot=snapshot,
|
||||
):
|
||||
approval_service.submit_order(
|
||||
session,
|
||||
order_type=APPROVAL_TYPE_SECONDARY_ALLOCATION,
|
||||
ref_id=business_id,
|
||||
refer_no=business.business_no,
|
||||
submitter=operator,
|
||||
snapshot=snapshot,
|
||||
)
|
||||
try:
|
||||
approval_service.submit_order(
|
||||
session,
|
||||
order_type=APPROVAL_TYPE_SECONDARY_ALLOCATION,
|
||||
ref_id=business_id,
|
||||
refer_no=business.business_no,
|
||||
submitter=operator,
|
||||
snapshot=snapshot,
|
||||
)
|
||||
except IntegrityError as exc:
|
||||
# version_no 唯一键的并发冲突（取号是锁读后此项理论不可达，
|
||||
# 留作 DB 兜底）：审计上下文会统一回滚，这里只把 1062
|
||||
# 翻译成可重试的业务提示，其余完整性错误原样上抛
|
||||
if _is_duplicate_entry(exc):
|
||||
raise BadRequestError("提交冲突（版本号生成重复），请重试") from exc
|
||||
raise
|
||||
else:
|
||||
approval_service.withdraw_pending_orders(
|
||||
session,
|
||||
|
||||
@@ -13,11 +13,13 @@ from datetime import date
|
||||
from decimal import ROUND_HALF_UP, Decimal
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
MODULE_SETTLEMENT,
|
||||
)
|
||||
from app.core.db_errors import is_duplicate_entry
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.models import (
|
||||
MonthlySettlement,
|
||||
@@ -254,16 +256,24 @@ def submit(
|
||||
if settlement.status not in (SETTLEMENT_STATUS_DRAFT, SETTLEMENT_STATUS_REJECTED):
|
||||
raise BadRequestError("仅草稿或已驳回状态可提交")
|
||||
|
||||
order = approval_service.submit_order(
|
||||
session,
|
||||
order_type=_SETTLEMENT_ORDER_TYPE,
|
||||
ref_id=settlement.id,
|
||||
refer_no=f"JS{settlement.settlement_month.replace('-', '')}",
|
||||
submitter=operator,
|
||||
# 月结明细在生成时已固化；提交时快照让复核者看到的是送审版本，
|
||||
# 而不是审批期间若发生重生成后的内容
|
||||
snapshot=approval_service.settlement_content(session, settlement.id),
|
||||
)
|
||||
try:
|
||||
order = approval_service.submit_order(
|
||||
session,
|
||||
order_type=_SETTLEMENT_ORDER_TYPE,
|
||||
ref_id=settlement.id,
|
||||
refer_no=f"JS{settlement.settlement_month.replace('-', '')}",
|
||||
submitter=operator,
|
||||
# 月结明细在生成时已固化；提交时快照让复核者看到的是送审版本，
|
||||
# 而不是审批期间若发生重生成后的内容
|
||||
snapshot=approval_service.settlement_content(session, settlement.id),
|
||||
)
|
||||
except IntegrityError as exc:
|
||||
# version_no 唯一键的并发冲突（提交前已锁月结行，此项理论不可达，
|
||||
# 留作 DB 兜底）：审计上下文会统一回滚，这里只把 1062 翻译成
|
||||
# 可重试的业务提示，其余完整性错误原样上抛
|
||||
if is_duplicate_entry(exc):
|
||||
raise BadRequestError("提交冲突（版本号生成重复），请重试") from exc
|
||||
raise
|
||||
settlement.approval_order_no = order.order_no
|
||||
if order.status == SETTLEMENT_STATUS_APPROVED:
|
||||
mark_locked(session, settlement, operator=operator)
|
||||
|
||||
Reference in new issue
Block a user