Compare commits
58
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74f1ef1cf9 | ||
|
|
8ef26e22fb | ||
|
|
680661a80b | ||
|
|
efed29647c | ||
|
|
e95dc4b2de | ||
|
|
acf87fdfdc | ||
|
|
94c49138bf | ||
|
|
f75a9d534e | ||
|
|
0ef3adec21 | ||
|
|
60f6af6494 | ||
|
|
409e26614f | ||
|
|
5ef48abf47 | ||
|
|
7f8f88c148 | ||
|
|
c2b462df3b | ||
|
|
e6c2c71d1b | ||
|
|
91fc6f6293 | ||
|
|
9a70264b51 | ||
|
|
6d612daf30 | ||
|
|
a0086554b1 | ||
|
|
5a3778a424 | ||
|
|
cb977979da | ||
|
|
64c57e9141 | ||
|
|
d8dba27fb2 | ||
|
|
d77728265b | ||
|
|
8c4acb82fe | ||
|
|
fba8cfc215 | ||
|
|
299b72483c | ||
|
|
c512cb77fb | ||
|
|
ca4cc72eea | ||
|
|
77e578085a | ||
|
|
06cdf4141f | ||
|
|
5207d14daa | ||
|
|
09831dbb7f | ||
|
|
a02b6c3ec8 | ||
|
|
4aea2be103 | ||
|
|
0cdc6246c4 | ||
|
|
1625907380 | ||
|
|
899bf3afa5 | ||
|
|
20fcf06f51 | ||
|
|
ca88ee7a0b | ||
|
|
15de81dd2c | ||
|
|
b8ba9e4626 | ||
|
|
7eeed85c96 | ||
|
|
a694570dd1 | ||
|
|
f22d14e439 | ||
|
|
4552f2e703 | ||
|
|
e568ebde61 | ||
|
|
8668e58c30 | ||
|
|
fbf044f240 | ||
|
|
6219698a39 | ||
|
|
d7fbec1177 | ||
|
|
4c442b8cf2 | ||
|
|
fd801455f0 | ||
|
|
8ad3650dd3 | ||
|
|
7a0f3f4b98 | ||
|
|
1b3509b20f | ||
|
|
5ed5665a54 | ||
|
|
bc019cadf5 |
No files matched your search
@@ -59,3 +59,8 @@ frontend/e2e/*.png
|
||||
backup/
|
||||
.claude
|
||||
CLAUDE.md
|
||||
|
||||
# 运行期上传物(公司 logo 等):与构建产物隔离,不入版本库
|
||||
backend/uploads/
|
||||
# 数据库备份导出目录(⑨ 备份脚本产物)
|
||||
db/backups/
|
||||
+45
-2
@@ -1,12 +1,13 @@
|
||||
# 后端
|
||||
|
||||
> AI摘要:衍水集团营销人员工资管理系统的后端服务。FastAPI + SQLAlchemy(同步)+ MySQL + Redis,Python 3.12 由 uv 锁定。六层结构 `api / services / repositories / models / schemas / core`。当前实现登录鉴权与系统管理(用户/角色/操作日志/日志查询),业务模块待需求澄清后开发。
|
||||
> AI摘要:衍水集团营销人员工资管理系统的后端服务。FastAPI + SQLAlchemy(同步)+ MySQL + Redis,Python 3.12 由 uv 锁定。六层结构 `api / services / repositories / models / schemas / core`。已实现登录鉴权、系统管理(用户/角色/操作日志/日志查询)与 M1 参数体系(岗位角色管理、计提参数版本化/留痕/对比/预览/导出,2026-10-13);业务模块(基础/业务数据、核算、报表)按路线图推进。
|
||||
|
||||
## 职责
|
||||
|
||||
- 提供 REST 接口(统一前缀 `/api`)
|
||||
- 登录鉴权:图形验证码、JWT、登录限流、登出黑名单、登录日志
|
||||
- 系统管理(需求 2.5.1):用户管理、角色管理、操作日志(自动审计)、操作与登录日志查询
|
||||
- 系统管理(需求 2.5.1):用户管理、角色管理、岗位角色(#28 可扩展+公式模板绑定)、操作日志(自动审计)、操作与登录日志查询
|
||||
- 计提参数体系(需求 #28):16 项参数目录、按生效日期版本化(回款到账日取值)、变更批次留痕/对比/导出、计算预览
|
||||
- 后续承担:基础数据、业务数据、绩效核算、报表统计、T+ 数据同步
|
||||
|
||||
## 技术栈与版本
|
||||
@@ -70,6 +71,41 @@ app/
|
||||
| GET | `/api/v1/system/operation-logs/{id}` | 操作日志详情(含已脱敏的请求参数,展开行懒加载) |
|
||||
| GET | `/api/v1/system/login-logs` | 登录日志查询(用户名/IP/结果/时间范围) |
|
||||
|
||||
### 基础数据接口(需求 2.1,登录即可 —— 业务操作不要求管理员)
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
| --- | --- | --- |
|
||||
| GET / POST | `/api/v1/base/personnel` | 人员列表(姓名模糊/状态/岗位筛选,附岗位与经理名)/ 新增(岗位须启用;经理非自己且在职) |
|
||||
| GET / PUT / DELETE | `/api/v1/base/personnel/{id}` | 详情(附区域与计划)/ 编辑 / 删除(被团队成员或客户归属引用 → 400 引导改离职) |
|
||||
| PUT | `/api/v1/base/personnel/{id}/status` | 在职 / 离职切换 |
|
||||
| PUT | `/api/v1/base/personnel/{id}/regions` | 辐射区域全量替换(空列表即清空) |
|
||||
| PUT | `/api/v1/base/personnel/{id}/plans` | 市场拓展计划全量替换 |
|
||||
| GET / POST | `/api/v1/base/products` | 产品列表(名称/规格模糊、类别/状态筛选)/ 新增(类别值域校验;名称+规格组合唯一) |
|
||||
| GET / PUT / DELETE | `/api/v1/base/products/{id}` | 详情 / 编辑 / 删除(被业务明细引用保护在业务表就位后生效) |
|
||||
| PUT | `/api/v1/base/products/{id}/status` | 启用 / 停用 |
|
||||
| GET / POST | `/api/v1/base/customers` | 客户列表(公司/负责人模糊、分类/归属筛选)/ 新增(分类值域;公司名+负责人唯一) |
|
||||
| GET / PUT / DELETE | `/api/v1/base/customers/{id}` | 详情 / 编辑(**不触归属**)/ 删除 |
|
||||
| PUT | `/api/v1/base/customers/{id}/ownership` | 归属变更(同事务写留痕;只影响变更后核算,不回溯历史 #19) |
|
||||
| GET | `/api/v1/base/customers/{id}/ownership-logs` | 归属变更留痕分页(join 人员出姓名) |
|
||||
|
||||
### 业务数据接口(需求 2.2,登录即可)
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
| --- | --- | --- |
|
||||
| GET / POST | `/api/v1/business/businesses` | 业务列表(编号/公司名模糊、状态/客户/归属/日期筛选)/ 创建(编号 `YW{日期}-{序号}` 自动生成;明细 ≥1 行;销售额服务层固化) |
|
||||
| GET / PUT / DELETE | `/api/v1/business/businesses/{id}` | 详情(附明细)/ 编辑(明细全量替换 + 五项汇总重算;**归属不在此端点**)/ 删除(有发货或回款 → 400 引导改已终止) |
|
||||
| PUT | `/api/v1/business/businesses/{id}/status` | 状态流转(1→2/3;终态不可再变更;终止必填原因;写状态留痕) |
|
||||
| PUT | `/api/v1/business/businesses/{id}/ownership` | 负责/协助归属变更(同事务写留痕,owner_type=2) |
|
||||
| GET | `/api/v1/business/businesses/{id}/ownership-logs` | 业务归属变更留痕分页 |
|
||||
| GET | `/api/v1/business/businesses/{id}/status-logs` | 状态流转时间线(创建写首条 old=new=1) |
|
||||
| GET | `/api/v1/business/businesses/{id}/gross-profit` | **毛利润数据视图**(只读实时计算,不落库:行级率/折算额 + 类别汇总;不含运费 #2;阈值按 `as_of` 取参数快照;成本缺失行标注无法计算) |
|
||||
| GET / POST | `/api/v1/business/shipments` | 发货单列表 / 创建(编号 `SH…`;业务须执行中;行金额服务层固化;业务级发货/运费汇总回写) |
|
||||
| GET / PUT / DELETE | `/api/v1/business/shipments/{id}` | 详情 / 编辑(终态业务禁改)/ 删除(被回款批次指定 → 400) |
|
||||
| GET / POST | `/api/v1/business/receipts` | 回款列表(含 **payment_days 派生**:发货日首日=第 1 天 #1)/ 新增(编号 `HK…`;**shipment_id 同业务强校验**;业务须执行中) |
|
||||
| GET / PUT / DELETE | `/api/v1/business/receipts/{id}` | 详情 / 编辑 / 删除(**已核算回款禁改禁删**——M3 防重锚点) |
|
||||
| GET / POST | `/api/v1/business/rating-grades` | 评级等级全量列表(sort_order 升序)/ 新增(区间值域 + **与既有等级重叠 → 400**) |
|
||||
| PUT / DELETE | `/api/v1/business/rating-grades/{id}` | 编辑(重叠判定)/ 删除(无下游引用,允许清空) |
|
||||
|
||||
全部写操作自动写入操作日志(成功与失败都记,机制见下)。
|
||||
|
||||
统一响应 `{code, message, data}`,分页为 `list/total/pageNum/pageSize`。
|
||||
@@ -153,6 +189,13 @@ bcrypt 5.0 起对超过 72 字节的密码**直接抛 ValueError**(此前是
|
||||
|
||||
**角色管理保护规则**(后端是唯一防线,前端按钮禁用只是体验):admin 角色禁删禁停;有用户绑定的角色禁删(`user_roles` 外键是 CASCADE;删除前走 `SELECT ... FOR UPDATE` 锁行,堵住并发绑定窗口);`role_code` 创建后不可改;**停用角色不可再分配**(`_resolve_roles` 校验 status,停用只影响新分配、不影响既有授权)。
|
||||
|
||||
### M2 业务数据的四个关键约定(2026-10-13 定稿,改动前先读)
|
||||
|
||||
- **单据编号**(`services/no_generator.py`):`{前缀}{YYYYMMDD}-{当日4位序号}`,业务 YW / 发货 SH / 回款 HK(`core/constants.py` 的 `NO_PREFIX_*`)。`SELECT MAX ... FOR UPDATE` 锁当日区间防并发重号;残余竞态以唯一键 1062 冲突**重试一次**兜底(无限重试会掩盖死锁)。序号超 4 位按实际位数输出(VARCHAR(32) 余量足够)。
|
||||
- **五项汇总冗余**(`businesses.total_*`):明细/发货/回款的任何写路径统一收口到 `business_service._recalc_totals` 单点重算,禁止各处手写 SUM 回写;发货与回款服务写操作前**必须 `get_by_id(for_update=True)` 锁业务行**(防两模块并发写同一业务的丢失更新)。毛利润率/折算额**不落库**——它们是明细金额 + 时点化阈值的派生值,落库会在成本调整或参数改版后漂移;视图接口(`/gross-profit`)实时算,M3 核算台账才是法定固化点。
|
||||
- **留痕表的固化设计**:`ownership_change_logs` 与 `business_status_logs` 对客户/业务/人员 ID 均**无外键**(冗余固化,被引用方删除后记录仍完整可读);RESTRICT 外键反而会把删除逼成 500。删除保护全部由服务层检查承担(人员→团队成员/客户归属引用;客户→业务引用;业务→发货/回款记录)。两张留痕表 append-only、不继承 TimestampMixin。
|
||||
- **金额契约**:schema 入参出参一律 `str`,小数超两位直接拒绝(不静默舍入);服务层 `Decimal`,比率 `Fraction`;毛利润率出参为分数原样字符串(`"997/1000"`,同 M1 计算预览口径),前端原样展示禁止转 float。
|
||||
|
||||
## 常见问题
|
||||
|
||||
**起服务报 `APP_SECRET_KEY` 相关错误** —— `backend/.env` 未填或不足 32 字符。这是刻意的 fail-fast:空密钥签发 JWT 是安全问题,必须启动即失败。
|
||||
|
||||
@@ -0,0 +1,436 @@
|
||||
"""V6 系统设置/二次分配/审批表与角色参数种子
|
||||
|
||||
Revision ID: 79bcc5aa98d4
|
||||
Revises: 8efc189b131f
|
||||
Create Date: 2026-10-15 15:42:13.467447
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
from datetime import date
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import mysql
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "79bcc5aa98d4"
|
||||
down_revision: str | Sequence[str] | None = "8efc189b131f"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""应用迁移。"""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table(
|
||||
"system_settings",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"company_name",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="公司名称(登录页与导出页眉展示)",
|
||||
),
|
||||
sa.Column(
|
||||
"logo_path",
|
||||
sa.String(length=255),
|
||||
nullable=True,
|
||||
comment="logo 相对路径(文件存 uploads/logo/,null=未上传使用默认)",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_system_settings")),
|
||||
comment="系统设置表(公司信息,全系统单行)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_table(
|
||||
"approval_orders",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"order_no",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="审批单号,自动生成 AP{YYYYMMDD}-{4位当日序号}",
|
||||
),
|
||||
sa.Column(
|
||||
"order_type",
|
||||
mysql.TINYINT(),
|
||||
nullable=False,
|
||||
comment="审批对象类型:1二次分配方案 2月度结算(预留)",
|
||||
),
|
||||
sa.Column(
|
||||
"ref_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="引用对象ID(order_type=1 时为 businesses.id;固化无外键,删除保护由服务层承担)",
|
||||
),
|
||||
sa.Column(
|
||||
"refer_no",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="引用对象单号(冗余固化,列表页免联查)",
|
||||
),
|
||||
sa.Column(
|
||||
"status",
|
||||
mysql.TINYINT(),
|
||||
server_default="1",
|
||||
nullable=False,
|
||||
comment="审批状态:1待财务复核 2待领导审核 3已通过 4已驳回 5已撤回",
|
||||
),
|
||||
sa.Column(
|
||||
"submitter_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="提交人ID(账号删除后置空)",
|
||||
),
|
||||
sa.Column(
|
||||
"submitter_name",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="提交人用户名(冗余固化)",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["submitter_id"],
|
||||
["users.id"],
|
||||
name=op.f("fk_approval_orders_submitter_id"),
|
||||
ondelete="SET NULL",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_approval_orders")),
|
||||
sa.UniqueConstraint("order_no", name=op.f("uk_approval_orders_order_no")),
|
||||
comment="审批单表(营销后勤提交→财务复核→领导审核;开关关闭时自动通过留痕)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
"idx_approval_orders_type_status", "approval_orders", ["order_type", "status"], unique=False
|
||||
)
|
||||
op.create_table(
|
||||
"approval_steps",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"order_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="审批单ID(approval_orders.id;单删记录随删)",
|
||||
),
|
||||
sa.Column(
|
||||
"node",
|
||||
mysql.TINYINT(),
|
||||
nullable=False,
|
||||
comment="审批节点:0撤回留痕 1财务复核 2领导审核",
|
||||
),
|
||||
sa.Column(
|
||||
"action", mysql.TINYINT(), nullable=False, comment="动作:1通过 2驳回 3自动通过 4撤回"
|
||||
),
|
||||
sa.Column(
|
||||
"opinion", sa.String(length=255), nullable=True, comment="审批意见(驳回时填写)"
|
||||
),
|
||||
sa.Column(
|
||||
"operator_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="操作人ID(自动通过/系统动作置空)",
|
||||
),
|
||||
sa.Column(
|
||||
"operator_name",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="操作人用户名(冗余固化;系统动作记「系统」)",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["operator_id"],
|
||||
["users.id"],
|
||||
name=op.f("fk_approval_steps_operator_id"),
|
||||
ondelete="SET NULL",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["order_id"],
|
||||
["approval_orders.id"],
|
||||
name=op.f("fk_approval_steps_order_id"),
|
||||
ondelete="CASCADE",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_approval_steps")),
|
||||
comment="审批节点记录表(append-only;自动通过/撤回均有留痕)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index("idx_approval_steps_order_id", "approval_steps", ["order_id"], unique=False)
|
||||
op.create_table(
|
||||
"business_secondary_allocations",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"business_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="业务ID(businesses.id;业务删除随删)",
|
||||
),
|
||||
sa.Column(
|
||||
"personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="参与业务员ID(personnel.id;被方案引用禁删)",
|
||||
),
|
||||
sa.Column(
|
||||
"personnel_name",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="参与业务员姓名(冗余固化,离职后回显有名)",
|
||||
),
|
||||
sa.Column(
|
||||
"ratio",
|
||||
sa.Numeric(precision=5, scale=2),
|
||||
nullable=False,
|
||||
comment="分摊比例(0-100 两位小数;不要求合计满额,余额归属待澄清#2)",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["business_id"],
|
||||
["businesses.id"],
|
||||
name=op.f("fk_business_secondary_allocations_business_id"),
|
||||
ondelete="CASCADE",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["personnel_id"],
|
||||
["personnel.id"],
|
||||
name=op.f("fk_business_secondary_allocations_personnel_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_business_secondary_allocations")),
|
||||
comment="业务二次分配方案明细表(合同建立时录入;比例不要求合计满额,余额归属待澄清)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
"idx_business_secondary_allocations_business_id",
|
||||
"business_secondary_allocations",
|
||||
["business_id"],
|
||||
unique=False,
|
||||
)
|
||||
op.create_index(
|
||||
"idx_business_secondary_allocations_personnel_id",
|
||||
"business_secondary_allocations",
|
||||
["personnel_id"],
|
||||
unique=False,
|
||||
)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
# ---- 种子数据(生产与开发同源;写法沿用 V1/V3 迁移先例)----
|
||||
|
||||
# 三个审批职能登录角色(2026-10-15 复核审批补充需求;roles 表无 is_builtin
|
||||
# 列,内置保护由 role_service 的 BUILTIN_ROLE_CODES 白名单承担)
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"roles",
|
||||
sa.column("role_code", sa.String),
|
||||
sa.column("role_name", sa.String),
|
||||
sa.column("description", sa.String),
|
||||
sa.column("sort_order", sa.Integer),
|
||||
),
|
||||
[
|
||||
{
|
||||
"role_code": "marketing_ops",
|
||||
"role_name": "营销后勤",
|
||||
"description": "提交与录入(审批链第一节点:月结/二次分配提交)",
|
||||
"sort_order": 3,
|
||||
},
|
||||
{
|
||||
"role_code": "finance",
|
||||
"role_name": "财务",
|
||||
"description": "复核(审批链第二节点)",
|
||||
"sort_order": 4,
|
||||
},
|
||||
{
|
||||
"role_code": "leader",
|
||||
"role_name": "领导",
|
||||
"description": "审核(审批链第三节点;全览只读)",
|
||||
"sort_order": 5,
|
||||
},
|
||||
],
|
||||
)
|
||||
|
||||
# 审批开关参数定义(param_definitions id 沿用 V3 种子的显式 id 方案接续 17/18)
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"param_definitions",
|
||||
sa.column("id", sa.BigInteger),
|
||||
sa.column("param_code", sa.String),
|
||||
sa.column("param_name", sa.String),
|
||||
sa.column("param_group", sa.String),
|
||||
sa.column("value_type", sa.String),
|
||||
sa.column("unit", sa.String),
|
||||
sa.column("dimension_type", sa.String),
|
||||
sa.column("options_text", sa.String),
|
||||
sa.column("default_value", sa.String),
|
||||
sa.column("value_min", sa.String),
|
||||
sa.column("value_max", sa.String),
|
||||
sa.column("description", sa.String),
|
||||
sa.column("sort_order", sa.Integer),
|
||||
sa.column("status", sa.Integer),
|
||||
),
|
||||
[
|
||||
{
|
||||
"id": 17,
|
||||
"param_code": "approval.secondary_allocation.enabled",
|
||||
"param_name": "二次分配审批开关",
|
||||
"param_group": "审批开关",
|
||||
"value_type": "BOOL",
|
||||
"unit": None,
|
||||
"dimension_type": "NONE",
|
||||
"options_text": None,
|
||||
"default_value": "0",
|
||||
"value_min": None,
|
||||
"value_max": None,
|
||||
"description": (
|
||||
"0=二次分配方案提交即生效(系统自动通过全节点留痕,留痕不断链);"
|
||||
"1=提交后进入财务复核→领导审核审批流(2026-10-15 复核审批补充需求)"
|
||||
),
|
||||
"sort_order": 17,
|
||||
"status": 1,
|
||||
},
|
||||
{
|
||||
"id": 18,
|
||||
"param_code": "approval.monthly_settlement.enabled",
|
||||
"param_name": "月度结算审批开关",
|
||||
"param_group": "审批开关",
|
||||
"value_type": "BOOL",
|
||||
"unit": None,
|
||||
"dimension_type": "NONE",
|
||||
"options_text": None,
|
||||
"default_value": "0",
|
||||
"value_min": None,
|
||||
"value_max": None,
|
||||
"description": (
|
||||
"预留参数:月度结算审批链开关(M3 ④ 月结子块接入时消费);"
|
||||
"0=结算生成即生效,1=走财务复核→领导审核审批流"
|
||||
),
|
||||
"sort_order": 18,
|
||||
"status": 1,
|
||||
},
|
||||
],
|
||||
)
|
||||
|
||||
# 审批开关联动批次条目(batch_id=1 即 V3 的「初始版本」批次;BOOL 无维度行,
|
||||
# 生效日期 2026-01-01 对齐其他支付环节种子)
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"param_values",
|
||||
sa.column("id", sa.BigInteger),
|
||||
sa.column("param_id", sa.BigInteger),
|
||||
sa.column("dimension_value", sa.String),
|
||||
sa.column("effective_date", sa.Date),
|
||||
sa.column("value_text", sa.String),
|
||||
sa.column("batch_id", sa.BigInteger),
|
||||
),
|
||||
[
|
||||
{
|
||||
"id": 20,
|
||||
"param_id": 17,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "0",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 21,
|
||||
"param_id": 18,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "0",
|
||||
"batch_id": 1,
|
||||
},
|
||||
],
|
||||
)
|
||||
|
||||
# 公司信息单行(system_settings 恒为一行,id=1 由迁移保底)
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"system_settings",
|
||||
sa.column("id", sa.BigInteger),
|
||||
sa.column("company_name", sa.String),
|
||||
sa.column("logo_path", sa.String),
|
||||
),
|
||||
[
|
||||
{"id": 1, "company_name": "衍水集团", "logo_path": None},
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""回滚迁移。
|
||||
|
||||
整表回滚只保留 `op.drop_table` —— DROP TABLE 会连带删除索引与外键。
|
||||
autogenerate 原样输出的逐个 `op.drop_index` 会失败:idx_approval_steps_order_id
|
||||
与 idx_business_secondary_allocations_personnel_id 分别是外键的唯一支撑索引,
|
||||
单独删除被 MySQL 拒绝(errno 1553),回滚会中断在半途。
|
||||
删除顺序:先删引用方(approval_steps/二次分配),再删被引用方。
|
||||
行级种子反向清理:roles/param_definitions/param_values 三表由 V1/V3 建、
|
||||
本迁移只插行(roles 三角色、参数 17/18 及其版本条目),drop_table
|
||||
不会带走,须显式 DELETE,否则重放 upgrade 时唯一键冲突。
|
||||
"""
|
||||
op.drop_table("business_secondary_allocations")
|
||||
op.drop_table("approval_steps")
|
||||
op.drop_table("approval_orders")
|
||||
op.drop_table("system_settings")
|
||||
op.execute("DELETE FROM param_values WHERE id IN (20, 21)")
|
||||
op.execute("DELETE FROM param_definitions WHERE id IN (17, 18)")
|
||||
op.execute("DELETE FROM roles WHERE role_code IN ('marketing_ops', 'finance', 'leader')")
|
||||
@@ -0,0 +1,696 @@
|
||||
"""业务数据管理七表:业务/业务明细/状态留痕/发货单/发货明细/回款/评级等级配置(M2)
|
||||
|
||||
- businesses:业务编号自动生成(报表 2.4.1「合同编号」),五项汇总冗余列
|
||||
由服务层事务内维护;毛利润相关值不落库(派生值,M3 台账才是固化点)
|
||||
- business_items:行级 product_category 为折算锚点(对照表 #14),指导价
|
||||
人工录入、T+ 同步不覆盖
|
||||
- business_status_logs:append-only,创建时写首条(old=new=1)
|
||||
- shipments/shipment_items:发货日为回款天数基准日(对照表 #1)
|
||||
- receipts:手动指定发货批次(#18);settlement_status 为 M3 核算防重锚点
|
||||
- customer_rating_grades:等级映射可配置,种子四条随迁移初始化
|
||||
|
||||
Revision ID: 8efc189b131f
|
||||
Revises: e1133a7c670a
|
||||
Create Date: 2026-10-13 11:14:17.545320
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import mysql
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "8efc189b131f"
|
||||
down_revision: str | Sequence[str] | None = "e1133a7c670a"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
# 评级等级种子(与 init-dev.sql 双写一致;口径见模型 docstring)
|
||||
_GRADE_SEED = [
|
||||
{"grade_name": "A", "min_score": 90, "max_score": 100, "sort_order": 1, "remark": "优秀"},
|
||||
{"grade_name": "B", "min_score": 75, "max_score": 89, "sort_order": 2, "remark": "良好"},
|
||||
{"grade_name": "C", "min_score": 60, "max_score": 74, "sort_order": 3, "remark": "合格"},
|
||||
{"grade_name": "D", "min_score": 0, "max_score": 59, "sort_order": 4, "remark": "待改进"},
|
||||
]
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""应用迁移。"""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table(
|
||||
"customer_rating_grades",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"grade_name", sa.String(length=32), nullable=False, comment="等级名称(如 A/优秀)"
|
||||
),
|
||||
sa.Column(
|
||||
"min_score",
|
||||
sa.Numeric(precision=5, scale=1),
|
||||
nullable=False,
|
||||
comment="总分下限(含);判定=按 sort_order 升序首个 min_score ≤ 总分",
|
||||
),
|
||||
sa.Column(
|
||||
"max_score",
|
||||
sa.Numeric(precision=5, scale=1),
|
||||
nullable=False,
|
||||
comment="总分上限(展示用)",
|
||||
),
|
||||
sa.Column(
|
||||
"sort_order",
|
||||
sa.Integer(),
|
||||
server_default="0",
|
||||
nullable=False,
|
||||
comment="排序(判定顺序,升序)",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="说明"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_customer_rating_grades")),
|
||||
sa.UniqueConstraint("grade_name", name=op.f("uk_customer_rating_grades_grade_name")),
|
||||
comment="客户评级等级配置表(等级映射可配置;判定按 sort_order 升序首个 min_score≤总分)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_table(
|
||||
"business_status_logs",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"business_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="业务ID(固化,无外键;删除保护由服务层承担)",
|
||||
),
|
||||
sa.Column(
|
||||
"old_status", mysql.TINYINT(), nullable=False, comment="变更前状态(创建首条为 1)"
|
||||
),
|
||||
sa.Column("new_status", mysql.TINYINT(), nullable=False, comment="变更后状态"),
|
||||
sa.Column(
|
||||
"change_reason", sa.String(length=255), nullable=True, comment="变更原因(终止时必填)"
|
||||
),
|
||||
sa.Column(
|
||||
"operator_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="操作人ID(账号删除后置空)",
|
||||
),
|
||||
sa.Column(
|
||||
"operator_name",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="操作人用户名(冗余固化)",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["operator_id"],
|
||||
["users.id"],
|
||||
name=op.f("fk_business_status_logs_operator_id"),
|
||||
ondelete="SET NULL",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_business_status_logs")),
|
||||
comment="业务状态变更记录表(append-only)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
"idx_business_status_logs_business_id",
|
||||
"business_status_logs",
|
||||
["business_id"],
|
||||
unique=False,
|
||||
)
|
||||
op.create_index(
|
||||
"idx_business_status_logs_create_time",
|
||||
"business_status_logs",
|
||||
["create_time"],
|
||||
unique=False,
|
||||
)
|
||||
op.create_table(
|
||||
"businesses",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"business_no",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="业务编号,自动生成 YW{YYYYMMDD}-{4位当日序号}(报表合同编号)",
|
||||
),
|
||||
sa.Column(
|
||||
"customer_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="客户ID(customers.id)",
|
||||
),
|
||||
sa.Column("business_date", sa.Date(), nullable=True, comment="业务日期(T+ 同步口径)"),
|
||||
sa.Column(
|
||||
"status",
|
||||
mysql.TINYINT(),
|
||||
server_default="1",
|
||||
nullable=False,
|
||||
comment="业务状态:1执行中 2已完成 3已终止(终态不可变更;T+同步不覆盖)",
|
||||
),
|
||||
sa.Column(
|
||||
"owner_personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="负责营销人员ID(核算归属锚点;NULL=待指定,M3 核算前置校验非空;变更留痕不回溯)",
|
||||
),
|
||||
sa.Column(
|
||||
"assistant_personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="协助营销人员ID(一期核算不使用,对照表 #15;仅记录事实)",
|
||||
),
|
||||
sa.Column(
|
||||
"is_special",
|
||||
mysql.TINYINT(),
|
||||
server_default="0",
|
||||
nullable=False,
|
||||
comment="特殊业务标记:1是 0否(公司参与等)",
|
||||
),
|
||||
sa.Column("special_note", sa.String(length=255), nullable=True, comment="特殊业务说明"),
|
||||
sa.Column(
|
||||
"total_sale_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
server_default="0",
|
||||
nullable=True,
|
||||
comment="销售额合计(明细行汇总冗余,服务层事务内维护,禁手工直改;不含运费口径)",
|
||||
),
|
||||
sa.Column(
|
||||
"total_cost_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
server_default="0",
|
||||
nullable=True,
|
||||
comment="成本合计(明细行汇总冗余,服务层事务内维护,禁手工直改)",
|
||||
),
|
||||
sa.Column(
|
||||
"total_ship_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
server_default="0",
|
||||
nullable=True,
|
||||
comment="发货金额合计(发货明细汇总冗余,服务层事务内维护,禁手工直改)",
|
||||
),
|
||||
sa.Column(
|
||||
"total_received_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
server_default="0",
|
||||
nullable=True,
|
||||
comment="回款合计(回款记录汇总冗余,服务层事务内维护;M3 起付判定直接消费)",
|
||||
),
|
||||
sa.Column(
|
||||
"total_freight_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
server_default="0",
|
||||
nullable=True,
|
||||
comment="运费合计(发货单汇总冗余,仅记录展示;不计入毛利润口径,对照表 #2)",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="备注"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.Column(
|
||||
"source_no",
|
||||
sa.String(length=64),
|
||||
nullable=True,
|
||||
comment="T+ 原始单据号(同步幂等去重锚点;唯一键待 IT 定键后升级)",
|
||||
),
|
||||
sa.Column("t_plus_id", sa.String(length=64), nullable=True, comment="T+ 系统内部标识"),
|
||||
sa.Column(
|
||||
"sync_batch_no",
|
||||
sa.String(length=32),
|
||||
nullable=True,
|
||||
comment="同步批次号(同步模块写入)",
|
||||
),
|
||||
sa.Column("synced_at", sa.DateTime(), nullable=True, comment="最近同步时间"),
|
||||
sa.ForeignKeyConstraint(
|
||||
["assistant_personnel_id"],
|
||||
["personnel.id"],
|
||||
name=op.f("fk_businesses_assistant_personnel_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["customer_id"],
|
||||
["customers.id"],
|
||||
name=op.f("fk_businesses_customer_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["owner_personnel_id"],
|
||||
["personnel.id"],
|
||||
name=op.f("fk_businesses_owner_personnel_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_businesses")),
|
||||
sa.UniqueConstraint("business_no", name=op.f("uk_businesses_business_no")),
|
||||
comment="业务表(业务编号自动生成;T+同步不覆盖业务状态)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index("idx_businesses_business_date", "businesses", ["business_date"], unique=False)
|
||||
op.create_index("idx_businesses_customer_id", "businesses", ["customer_id"], unique=False)
|
||||
op.create_index(
|
||||
"idx_businesses_owner_personnel_id", "businesses", ["owner_personnel_id"], unique=False
|
||||
)
|
||||
op.create_index(op.f("idx_businesses_source_no"), "businesses", ["source_no"], unique=False)
|
||||
op.create_index("idx_businesses_status", "businesses", ["status"], unique=False)
|
||||
op.create_table(
|
||||
"business_items",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"business_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="业务ID(businesses.id)",
|
||||
),
|
||||
sa.Column(
|
||||
"product_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="产品ID(products.id;NULL=自由录入,未入产品库)",
|
||||
),
|
||||
sa.Column(
|
||||
"product_name",
|
||||
sa.String(length=128),
|
||||
nullable=False,
|
||||
comment="产品名称(引用产品时冗余固化)",
|
||||
),
|
||||
sa.Column(
|
||||
"spec_model",
|
||||
sa.String(length=128),
|
||||
server_default="",
|
||||
nullable=False,
|
||||
comment="规格型号(冗余固化;空串对齐 products 组合唯一键口径)",
|
||||
),
|
||||
sa.Column("unit", sa.String(length=16), nullable=True, comment="计量单位"),
|
||||
sa.Column(
|
||||
"product_category",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="产品类别(行级折算锚点,混合业务按产品逐条计算,对照表 #14;值域同 PRODUCT_CATEGORIES)",
|
||||
),
|
||||
sa.Column(
|
||||
"quantity", sa.Numeric(precision=14, scale=2), nullable=False, comment="数量(>0)"
|
||||
),
|
||||
sa.Column(
|
||||
"sale_price",
|
||||
sa.Numeric(precision=14, scale=4),
|
||||
nullable=True,
|
||||
comment="销售单价(元;T+ 同步或人工)",
|
||||
),
|
||||
sa.Column(
|
||||
"sale_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
nullable=False,
|
||||
comment="销售额 = 数量×销售单价(服务层计算固化;不含运费口径,毛利润率分母)",
|
||||
),
|
||||
sa.Column(
|
||||
"cost_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
nullable=True,
|
||||
comment="成本额(T+ 同步或人工录入,来源待 T+ 确认;毛利润额 = 销售额 − 成本额)",
|
||||
),
|
||||
sa.Column(
|
||||
"guided_price",
|
||||
sa.Numeric(precision=14, scale=4),
|
||||
nullable=True,
|
||||
comment="指导价(人工录入;T+同步不覆盖,需规 2.2.1/2.2.4)",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="备注"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["business_id"],
|
||||
["businesses.id"],
|
||||
name=op.f("fk_business_items_business_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["product_id"],
|
||||
["products.id"],
|
||||
name=op.f("fk_business_items_product_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_business_items")),
|
||||
comment="业务产品明细表(毛利润行级源数据;指导价 T+同步不覆盖)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
"idx_business_items_business_id", "business_items", ["business_id"], unique=False
|
||||
)
|
||||
op.create_index(
|
||||
"idx_business_items_product_category", "business_items", ["product_category"], unique=False
|
||||
)
|
||||
op.create_index("idx_business_items_product_id", "business_items", ["product_id"], unique=False)
|
||||
op.create_table(
|
||||
"shipments",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"shipment_no",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="发货单号,自动生成 SH{YYYYMMDD}-{4位当日序号}(内部追溯用)",
|
||||
),
|
||||
sa.Column(
|
||||
"business_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="业务ID(businesses.id;终态业务禁止新发货)",
|
||||
),
|
||||
sa.Column(
|
||||
"ship_date",
|
||||
sa.Date(),
|
||||
nullable=False,
|
||||
comment="发货日期(回款天数基准日,发货日首日=第 1 天)",
|
||||
),
|
||||
sa.Column(
|
||||
"freight_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
server_default="0",
|
||||
nullable=False,
|
||||
comment="运费金额(仅记录展示;不计入毛利润口径,对照表 #2)",
|
||||
),
|
||||
sa.Column(
|
||||
"total_amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
server_default="0",
|
||||
nullable=False,
|
||||
comment="发货总金额(明细行汇总冗余,服务层事务内维护,禁手工直改)",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="备注"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.Column(
|
||||
"source_no",
|
||||
sa.String(length=64),
|
||||
nullable=True,
|
||||
comment="T+ 原始单据号(同步幂等去重锚点;唯一键待 IT 定键后升级)",
|
||||
),
|
||||
sa.Column("t_plus_id", sa.String(length=64), nullable=True, comment="T+ 系统内部标识"),
|
||||
sa.Column(
|
||||
"sync_batch_no",
|
||||
sa.String(length=32),
|
||||
nullable=True,
|
||||
comment="同步批次号(同步模块写入)",
|
||||
),
|
||||
sa.Column("synced_at", sa.DateTime(), nullable=True, comment="最近同步时间"),
|
||||
sa.ForeignKeyConstraint(
|
||||
["business_id"],
|
||||
["businesses.id"],
|
||||
name=op.f("fk_shipments_business_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_shipments")),
|
||||
sa.UniqueConstraint("shipment_no", name=op.f("uk_shipments_shipment_no")),
|
||||
comment="发货单表(发货日为回款天数基准日,发货日首日计第 1 天)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index("idx_shipments_business_id", "shipments", ["business_id"], unique=False)
|
||||
op.create_index("idx_shipments_ship_date", "shipments", ["ship_date"], unique=False)
|
||||
op.create_index(op.f("idx_shipments_source_no"), "shipments", ["source_no"], unique=False)
|
||||
op.create_table(
|
||||
"receipts",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"receipt_batch_no",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="回款批次号,自动生成 HK{YYYYMMDD}-{4位当日序号}(系统内唯一;T+ 同步回款以 source_no 幂等)",
|
||||
),
|
||||
sa.Column(
|
||||
"business_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="业务ID(businesses.id)",
|
||||
),
|
||||
sa.Column(
|
||||
"shipment_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="发货单ID(shipments.id;手动指定的回款对应批次,须与本行业务一致;NULL=暂未指定)",
|
||||
),
|
||||
sa.Column(
|
||||
"receipt_date",
|
||||
sa.Date(),
|
||||
nullable=False,
|
||||
comment="回款到账日(M3 按此日匹配参数版本,对照表 #11)",
|
||||
),
|
||||
sa.Column(
|
||||
"amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
nullable=False,
|
||||
comment="回款金额(≥0;一期禁负数/红字)",
|
||||
),
|
||||
sa.Column(
|
||||
"is_barter",
|
||||
mysql.TINYINT(),
|
||||
server_default="0",
|
||||
nullable=False,
|
||||
comment="以物抵顶标记:1是 0否(M3 核算按应发绩效×barter.discount 折算,M2 仅标记)",
|
||||
),
|
||||
sa.Column(
|
||||
"settlement_status",
|
||||
mysql.TINYINT(),
|
||||
server_default="0",
|
||||
nullable=False,
|
||||
comment="绩效核算状态:0未核算 1已核算(M3 核算防重锚点;已核算回款禁改禁删)",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="备注"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.Column(
|
||||
"source_no",
|
||||
sa.String(length=64),
|
||||
nullable=True,
|
||||
comment="T+ 原始单据号(同步幂等去重锚点;唯一键待 IT 定键后升级)",
|
||||
),
|
||||
sa.Column("t_plus_id", sa.String(length=64), nullable=True, comment="T+ 系统内部标识"),
|
||||
sa.Column(
|
||||
"sync_batch_no",
|
||||
sa.String(length=32),
|
||||
nullable=True,
|
||||
comment="同步批次号(同步模块写入)",
|
||||
),
|
||||
sa.Column("synced_at", sa.DateTime(), nullable=True, comment="最近同步时间"),
|
||||
sa.ForeignKeyConstraint(
|
||||
["business_id"],
|
||||
["businesses.id"],
|
||||
name=op.f("fk_receipts_business_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["shipment_id"],
|
||||
["shipments.id"],
|
||||
name=op.f("fk_receipts_shipment_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_receipts")),
|
||||
sa.UniqueConstraint("receipt_batch_no", name=op.f("uk_receipts_receipt_batch_no")),
|
||||
comment="回款表(手动指定发货批次;已核算回款禁改禁删)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index("idx_receipts_business_id", "receipts", ["business_id"], unique=False)
|
||||
op.create_index("idx_receipts_receipt_date", "receipts", ["receipt_date"], unique=False)
|
||||
op.create_index(
|
||||
"idx_receipts_settlement_status", "receipts", ["settlement_status"], unique=False
|
||||
)
|
||||
op.create_index("idx_receipts_shipment_id", "receipts", ["shipment_id"], unique=False)
|
||||
op.create_index(op.f("idx_receipts_source_no"), "receipts", ["source_no"], unique=False)
|
||||
op.create_table(
|
||||
"shipment_items",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"shipment_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="发货单ID(shipments.id)",
|
||||
),
|
||||
sa.Column(
|
||||
"product_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="产品ID(products.id;NULL=自由录入)",
|
||||
),
|
||||
sa.Column(
|
||||
"product_name",
|
||||
sa.String(length=128),
|
||||
nullable=False,
|
||||
comment="产品名称(引用产品时冗余固化)",
|
||||
),
|
||||
sa.Column(
|
||||
"spec_model",
|
||||
sa.String(length=128),
|
||||
server_default="",
|
||||
nullable=False,
|
||||
comment="规格型号(冗余固化;空串对齐 products 组合唯一键口径)",
|
||||
),
|
||||
sa.Column("unit", sa.String(length=16), nullable=True, comment="计量单位"),
|
||||
sa.Column(
|
||||
"quantity", sa.Numeric(precision=14, scale=2), nullable=False, comment="发货数量(>0)"
|
||||
),
|
||||
sa.Column(
|
||||
"sale_price",
|
||||
sa.Numeric(precision=14, scale=4),
|
||||
nullable=True,
|
||||
comment="发货单价(元;T+ 同步或人工,口径待 IT 确认)",
|
||||
),
|
||||
sa.Column(
|
||||
"amount",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
nullable=False,
|
||||
comment="行金额 = 数量×单价(服务层计算固化,不信任前端传值)",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["product_id"],
|
||||
["products.id"],
|
||||
name=op.f("fk_shipment_items_product_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["shipment_id"],
|
||||
["shipments.id"],
|
||||
name=op.f("fk_shipment_items_shipment_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_shipment_items")),
|
||||
comment="发货产品明细表",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index("idx_shipment_items_product_id", "shipment_items", ["product_id"], unique=False)
|
||||
op.create_index(
|
||||
"idx_shipment_items_shipment_id", "shipment_items", ["shipment_id"], unique=False
|
||||
)
|
||||
# ### end Alembic commands ###
|
||||
# 评级等级种子(等级映射可配置;双轨:init-dev.sql 同步写入)
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"customer_rating_grades",
|
||||
sa.column("grade_name", sa.String),
|
||||
sa.column("min_score", sa.Numeric),
|
||||
sa.column("max_score", sa.Numeric),
|
||||
sa.column("sort_order", sa.Integer),
|
||||
sa.column("remark", sa.String),
|
||||
),
|
||||
_GRADE_SEED,
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""回滚迁移。
|
||||
|
||||
**注意(autogenerate 不会替你处理)**:生成的 `op.drop_index` 与
|
||||
`op.drop_table` 顺序需人工检查 —— 若某索引是外键的唯一支撑索引,
|
||||
单独 drop_index 会报 MySQL 1553(needed in a foreign key constraint)。
|
||||
**整表回滚应只保留 `op.drop_table`**,DROP TABLE 会连带删除索引与外键。
|
||||
"""
|
||||
# 整表回滚只保留 drop_table(DROP TABLE 连带删除索引与外键);
|
||||
# 逐条 drop_index 会先于 drop_table 摘掉外键支撑索引而报 MySQL 1553
|
||||
op.drop_table("shipment_items")
|
||||
op.drop_table("receipts")
|
||||
op.drop_table("shipments")
|
||||
op.drop_table("business_items")
|
||||
op.drop_table("businesses")
|
||||
op.drop_table("business_status_logs")
|
||||
op.drop_table("customer_rating_grades")
|
||||
@@ -0,0 +1,810 @@
|
||||
"""新增岗位角色与计提参数四表
|
||||
|
||||
Revision ID: bfbda9c3191d
|
||||
Revises: a45a8087831b
|
||||
Create Date: 2026-10-12 16:01:48.760620
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
from datetime import date
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import mysql
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "bfbda9c3191d"
|
||||
down_revision: str | Sequence[str] | None = "a45a8087831b"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""应用迁移。"""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table(
|
||||
"business_roles",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"role_code",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="岗位编码:salesperson营销员 sales_manager营销经理 info_officer信息员,创建后不可修改",
|
||||
),
|
||||
sa.Column("role_name", sa.String(length=64), nullable=False, comment="岗位名称"),
|
||||
sa.Column(
|
||||
"calc_template",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="计提公式模板编码(以代码内模板注册表为准)",
|
||||
),
|
||||
sa.Column("description", sa.String(length=255), nullable=True, comment="岗位说明"),
|
||||
sa.Column(
|
||||
"sort_order", sa.Integer(), server_default="0", nullable=False, comment="显示排序"
|
||||
),
|
||||
sa.Column(
|
||||
"status",
|
||||
mysql.TINYINT(),
|
||||
server_default="1",
|
||||
nullable=False,
|
||||
comment="状态:1启用 0禁用",
|
||||
),
|
||||
sa.Column(
|
||||
"is_builtin",
|
||||
mysql.TINYINT(),
|
||||
server_default="0",
|
||||
nullable=False,
|
||||
comment="是否内置岗位:1内置(禁删禁停) 0自定义",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_business_roles")),
|
||||
sa.UniqueConstraint("role_code", name=op.f("uk_business_roles_role_code")),
|
||||
comment="业务岗位角色表(与登录角色roles区分,决定计提公式与参数)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_table(
|
||||
"param_definitions",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"param_code",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="参数编码,如 salesperson.rate.slope",
|
||||
),
|
||||
sa.Column("param_name", sa.String(length=64), nullable=False, comment="参数名称"),
|
||||
sa.Column(
|
||||
"param_group",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="参数分组:业务员个人户/经理分成/企业户/信息员/支付环节/产品阈值/月工资口径",
|
||||
),
|
||||
sa.Column(
|
||||
"value_type",
|
||||
sa.String(length=16),
|
||||
nullable=False,
|
||||
comment="值类型:DECIMAL/INT/BOOL/ENUM/TEXT",
|
||||
),
|
||||
sa.Column(
|
||||
"unit", sa.String(length=16), nullable=True, comment="展示单位:‰/%/元/天,无单位为空"
|
||||
),
|
||||
sa.Column(
|
||||
"dimension_type",
|
||||
sa.String(length=32),
|
||||
server_default="NONE",
|
||||
nullable=False,
|
||||
comment="维度类型:NONE/PRODUCT_CATEGORY/BUSINESS_ROLE",
|
||||
),
|
||||
sa.Column(
|
||||
"options_text",
|
||||
sa.String(length=255),
|
||||
nullable=True,
|
||||
comment="枚举选项(竖线分隔),仅 ENUM 使用",
|
||||
),
|
||||
sa.Column(
|
||||
"default_value",
|
||||
sa.String(length=64),
|
||||
nullable=True,
|
||||
comment="系统默认值(Fraction 可解析字符串)",
|
||||
),
|
||||
sa.Column(
|
||||
"value_min", sa.String(length=64), nullable=True, comment="取值下限(含),校验用"
|
||||
),
|
||||
sa.Column(
|
||||
"value_max", sa.String(length=64), nullable=True, comment="取值上限(含),校验用"
|
||||
),
|
||||
sa.Column(
|
||||
"description", sa.String(length=255), nullable=True, comment="口径说明(配置页展示)"
|
||||
),
|
||||
sa.Column(
|
||||
"sort_order", sa.Integer(), server_default="0", nullable=False, comment="显示排序"
|
||||
),
|
||||
sa.Column(
|
||||
"status",
|
||||
mysql.TINYINT(),
|
||||
server_default="1",
|
||||
nullable=False,
|
||||
comment="状态:1启用 0停用",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_param_definitions")),
|
||||
sa.UniqueConstraint("param_code", name=op.f("uk_param_definitions_param_code")),
|
||||
comment="计提参数定义表",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_table(
|
||||
"param_change_batches",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"version_no", sa.String(length=32), nullable=False, comment="版本号,如 P20261012-01"
|
||||
),
|
||||
sa.Column("effective_date", sa.Date(), nullable=False, comment="生效日期(业务日期口径)"),
|
||||
sa.Column(
|
||||
"change_type",
|
||||
mysql.TINYINT(),
|
||||
nullable=False,
|
||||
comment="生效方式:1立即生效 2指定日期生效",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="变更说明"),
|
||||
sa.Column(
|
||||
"operator_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="操作人ID(账号删除后置空)",
|
||||
),
|
||||
sa.Column(
|
||||
"operator_name",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="操作人用户名(冗余固化)",
|
||||
),
|
||||
sa.Column(
|
||||
"item_count", sa.Integer(), server_default="0", nullable=False, comment="变更参数项数"
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["operator_id"],
|
||||
["users.id"],
|
||||
name=op.f("fk_param_change_batches_operator_id"),
|
||||
ondelete="SET NULL",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_param_change_batches")),
|
||||
sa.UniqueConstraint("version_no", name=op.f("uk_param_change_batches_version_no")),
|
||||
comment="参数变更批次表",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_table(
|
||||
"param_values",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"param_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="参数定义ID(param_definitions.id)",
|
||||
),
|
||||
sa.Column(
|
||||
"dimension_value",
|
||||
sa.String(length=32),
|
||||
server_default=sa.text("''"),
|
||||
nullable=False,
|
||||
comment="维度取值:NONE维度为空串;产品类别/岗位编码为具体值",
|
||||
),
|
||||
sa.Column(
|
||||
"effective_date", sa.Date(), nullable=False, comment="生效日期(按业务日期时点化取值)"
|
||||
),
|
||||
sa.Column(
|
||||
"value_text",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="参数值(Fraction 可解析字符串/枚举码/开关)",
|
||||
),
|
||||
sa.Column(
|
||||
"old_value_text", sa.String(length=64), nullable=True, comment="变更前值(留痕)"
|
||||
),
|
||||
sa.Column(
|
||||
"batch_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="变更批次ID(param_change_batches.id)",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["batch_id"],
|
||||
["param_change_batches.id"],
|
||||
name=op.f("fk_param_values_batch_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["param_id"],
|
||||
["param_definitions.id"],
|
||||
name=op.f("fk_param_values_param_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_param_values")),
|
||||
comment="参数版本条目表(append-only,按生效日期时点化取值)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index("idx_param_values_batch_id", "param_values", ["batch_id"], unique=False)
|
||||
op.create_index(
|
||||
"idx_param_values_effective_date", "param_values", ["effective_date"], unique=False
|
||||
)
|
||||
op.create_index(
|
||||
"idx_param_values_param_id_dimension_value_effective_date",
|
||||
"param_values",
|
||||
["param_id", "dimension_value", "effective_date"],
|
||||
unique=False,
|
||||
)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
# ---- 种子数据(生产与开发同源;口径依据 2026-10-12 业务裁决对照表)----
|
||||
# 显式指定 id:四张表均为本迁移新建、应用时必为空表,id 稳定可控;
|
||||
# param_values 按 param_id 引用定义,无法依赖自增(bulk_insert 取不回自增值)。
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"business_roles",
|
||||
sa.column("id", sa.BigInteger),
|
||||
sa.column("role_code", sa.String),
|
||||
sa.column("role_name", sa.String),
|
||||
sa.column("calc_template", sa.String),
|
||||
sa.column("description", sa.String),
|
||||
sa.column("sort_order", sa.Integer),
|
||||
sa.column("is_builtin", sa.Integer),
|
||||
),
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"role_code": "salesperson",
|
||||
"role_name": "营销员",
|
||||
"calc_template": "TPL_SALESPERSON_DECAY",
|
||||
"description": "业务员个人户:回款天数线性递减(10‰ − 天数×4/360‰,361 天起固定 4‰)",
|
||||
"sort_order": 1,
|
||||
"is_builtin": 1,
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"role_code": "sales_manager",
|
||||
"role_name": "营销经理",
|
||||
"calc_template": "TPL_MANAGER_SHARE",
|
||||
"description": "经理绩效:∑本团队业务员绩效×12.5% + ∑全公司业务员绩效×5%",
|
||||
"sort_order": 2,
|
||||
"is_builtin": 1,
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"role_code": "info_officer",
|
||||
"role_name": "信息员",
|
||||
"calc_template": "TPL_INFO_SALES_FIXED",
|
||||
"description": "信息员绩效:本人销售额×1‰",
|
||||
"sort_order": 3,
|
||||
"is_builtin": 1,
|
||||
},
|
||||
],
|
||||
)
|
||||
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"param_change_batches",
|
||||
sa.column("id", sa.BigInteger),
|
||||
sa.column("version_no", sa.String),
|
||||
sa.column("effective_date", sa.Date),
|
||||
sa.column("change_type", sa.Integer),
|
||||
sa.column("remark", sa.String),
|
||||
sa.column("operator_name", sa.String),
|
||||
sa.column("item_count", sa.Integer),
|
||||
),
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"version_no": "P20260101-00",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"change_type": 1,
|
||||
"remark": "初始版本(系统初始化种子,口径依据 2026-10-12 业务裁决)",
|
||||
"operator_name": "system",
|
||||
"item_count": 19,
|
||||
}
|
||||
],
|
||||
)
|
||||
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"param_definitions",
|
||||
sa.column("id", sa.BigInteger),
|
||||
sa.column("param_code", sa.String),
|
||||
sa.column("param_name", sa.String),
|
||||
sa.column("param_group", sa.String),
|
||||
sa.column("value_type", sa.String),
|
||||
sa.column("unit", sa.String),
|
||||
sa.column("dimension_type", sa.String),
|
||||
sa.column("options_text", sa.String),
|
||||
sa.column("default_value", sa.String),
|
||||
sa.column("value_min", sa.String),
|
||||
sa.column("value_max", sa.String),
|
||||
sa.column("description", sa.String),
|
||||
sa.column("sort_order", sa.Integer),
|
||||
),
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"param_code": "salesperson.rate.start",
|
||||
"param_name": "业务员起始计提比例",
|
||||
"param_group": "业务员个人户",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "‰",
|
||||
"dimension_type": "BUSINESS_ROLE",
|
||||
"options_text": None,
|
||||
"default_value": "10",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "线性递减段起始值:比例 = 起始 − 回款天数 × 斜率(≤分界天数)",
|
||||
"sort_order": 1,
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"param_code": "salesperson.rate.slope",
|
||||
"param_name": "业务员日递减斜率",
|
||||
"param_group": "业务员个人户",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "‰/天",
|
||||
"dimension_type": "BUSINESS_ROLE",
|
||||
"options_text": None,
|
||||
"default_value": "4/360",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "精确分数 4/360‰/天(=1/90),禁止按 0.011111 截断存储",
|
||||
"sort_order": 2,
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"param_code": "salesperson.rate.floor",
|
||||
"param_name": "业务员计提下限",
|
||||
"param_group": "业务员个人户",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "‰",
|
||||
"dimension_type": "BUSINESS_ROLE",
|
||||
"options_text": None,
|
||||
"default_value": "4",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "回款天数超过分界天数后固定取此比例(≥361 天 = 4‰)",
|
||||
"sort_order": 3,
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"param_code": "salesperson.days.boundary",
|
||||
"param_name": "线性递减分界天数",
|
||||
"param_group": "业务员个人户",
|
||||
"value_type": "INT",
|
||||
"unit": "天",
|
||||
"dimension_type": "BUSINESS_ROLE",
|
||||
"options_text": None,
|
||||
"default_value": "360",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "≤分界天数按公式线性递减(360 天=6‰);超过则取下限",
|
||||
"sort_order": 4,
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"param_code": "manager.share.team",
|
||||
"param_name": "经理本团队分成比例",
|
||||
"param_group": "经理分成",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "%",
|
||||
"dimension_type": "BUSINESS_ROLE",
|
||||
"options_text": None,
|
||||
"default_value": "12.5",
|
||||
"value_min": "0",
|
||||
"value_max": "100",
|
||||
"description": "∑本人带领业务员绩效 × 此比例(限本团队)",
|
||||
"sort_order": 5,
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"param_code": "manager.share.company",
|
||||
"param_name": "经理全公司分成比例",
|
||||
"param_group": "经理分成",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "%",
|
||||
"dimension_type": "BUSINESS_ROLE",
|
||||
"options_text": None,
|
||||
"default_value": "5",
|
||||
"value_min": "0",
|
||||
"value_max": "100",
|
||||
"description": "∑全部业务员绩效 × 此比例(全公司)",
|
||||
"sort_order": 6,
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"param_code": "enterprise.rate",
|
||||
"param_name": "企业户计提比例",
|
||||
"param_group": "企业户",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "‰",
|
||||
"dimension_type": "PRODUCT_CATEGORY",
|
||||
"options_text": None,
|
||||
"default_value": "3",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "所有企业户适用;2026-08-13 起由 2‰ 提高至 3‰",
|
||||
"sort_order": 7,
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"param_code": "info.rate",
|
||||
"param_name": "信息员计提比例",
|
||||
"param_group": "信息员",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "‰",
|
||||
"dimension_type": "BUSINESS_ROLE",
|
||||
"options_text": None,
|
||||
"default_value": "1",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "信息员绩效 = 本人销售额 × 此比例",
|
||||
"sort_order": 8,
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"param_code": "prepay.rate",
|
||||
"param_name": "预付款计提比例",
|
||||
"param_group": "支付环节",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "‰",
|
||||
"dimension_type": "NONE",
|
||||
"options_text": None,
|
||||
"default_value": "10",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "预付款统一按此比例计提",
|
||||
"sort_order": 9,
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
"param_code": "barter.discount",
|
||||
"param_name": "以物抵顶折算比例",
|
||||
"param_group": "支付环节",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "%",
|
||||
"dimension_type": "NONE",
|
||||
"options_text": None,
|
||||
"default_value": "80",
|
||||
"value_min": "0",
|
||||
"value_max": "100",
|
||||
"description": "以物抵顶回款绩效按应发绩效的此比例折算",
|
||||
"sort_order": 10,
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
"param_code": "payment.start.ratio",
|
||||
"param_name": "支付起付比例",
|
||||
"param_group": "支付环节",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "%",
|
||||
"dimension_type": "NONE",
|
||||
"options_text": None,
|
||||
"default_value": "60",
|
||||
"value_min": "0",
|
||||
"value_max": "100",
|
||||
"description": "单项业务回款额达销售额(不含运费)此比例后起付;达标前累计",
|
||||
"sort_order": 11,
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
"param_code": "payment.weight.mode",
|
||||
"param_name": "支付权重应用方式",
|
||||
"param_group": "支付环节",
|
||||
"value_type": "ENUM",
|
||||
"unit": None,
|
||||
"dimension_type": "NONE",
|
||||
"options_text": "FULL|BALANCE",
|
||||
"default_value": "FULL",
|
||||
"value_min": None,
|
||||
"value_max": None,
|
||||
"description": "FULL=按 R×R 乘当月全额应发绩效;BALANCE=乘余额(语义待 M3 前确认)",
|
||||
"sort_order": 12,
|
||||
},
|
||||
{
|
||||
"id": 13,
|
||||
"param_code": "product.threshold",
|
||||
"param_name": "折算毛利润额阈值",
|
||||
"param_group": "产品阈值",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "%",
|
||||
"dimension_type": "PRODUCT_CATEGORY",
|
||||
"options_text": None,
|
||||
"default_value": "30",
|
||||
"value_min": "0",
|
||||
"value_max": "100",
|
||||
"description": "折算毛利润额 = 销售额 ×(毛利润率 − 阈值);市政水利 30%、轨交 20%",
|
||||
"sort_order": 13,
|
||||
},
|
||||
{
|
||||
"id": 14,
|
||||
"param_code": "salary.basic.mode",
|
||||
"param_name": "月工资基本工资口径",
|
||||
"param_group": "月工资口径",
|
||||
"value_type": "ENUM",
|
||||
"unit": None,
|
||||
"dimension_type": "BUSINESS_ROLE",
|
||||
"options_text": "INCLUDE|DEDUCT|EXCLUDE",
|
||||
"default_value": "INCLUDE",
|
||||
"value_min": None,
|
||||
"value_max": None,
|
||||
"description": "INCLUDE含基本工资 / DEDUCT扣除基本工资 / EXCLUDE不计",
|
||||
"sort_order": 14,
|
||||
},
|
||||
{
|
||||
"id": 15,
|
||||
"param_code": "probation.annual.threshold",
|
||||
"param_name": "试用期年累计结算阈值",
|
||||
"param_group": "月工资口径",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "元",
|
||||
"dimension_type": "NONE",
|
||||
"options_text": None,
|
||||
"default_value": "18000",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "试用期年累计绩效超过此值部分年底一次性结算",
|
||||
"sort_order": 15,
|
||||
},
|
||||
{
|
||||
"id": 16,
|
||||
"param_code": "probation.salary.basic",
|
||||
"param_name": "试用期基本工资标准",
|
||||
"param_group": "月工资口径",
|
||||
"value_type": "DECIMAL",
|
||||
"unit": "元",
|
||||
"dimension_type": "NONE",
|
||||
"options_text": None,
|
||||
"default_value": "3000",
|
||||
"value_min": "0",
|
||||
"value_max": None,
|
||||
"description": "试用期仅发基本工资、不发放绩效(归属待 M2 复核)",
|
||||
"sort_order": 16,
|
||||
},
|
||||
],
|
||||
)
|
||||
|
||||
op.bulk_insert(
|
||||
sa.table(
|
||||
"param_values",
|
||||
sa.column("id", sa.BigInteger),
|
||||
sa.column("param_id", sa.BigInteger),
|
||||
sa.column("dimension_value", sa.String),
|
||||
sa.column("effective_date", sa.Date),
|
||||
sa.column("value_text", sa.String),
|
||||
sa.column("batch_id", sa.BigInteger),
|
||||
),
|
||||
[
|
||||
# 业务员个人户(2026-02-17 折算公式执行日起)
|
||||
{
|
||||
"id": 1,
|
||||
"param_id": 1,
|
||||
"dimension_value": "salesperson",
|
||||
"effective_date": date(2026, 2, 17),
|
||||
"value_text": "10",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"param_id": 2,
|
||||
"dimension_value": "salesperson",
|
||||
"effective_date": date(2026, 2, 17),
|
||||
"value_text": "4/360",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"param_id": 3,
|
||||
"dimension_value": "salesperson",
|
||||
"effective_date": date(2026, 2, 17),
|
||||
"value_text": "4",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"param_id": 4,
|
||||
"dimension_value": "salesperson",
|
||||
"effective_date": date(2026, 2, 17),
|
||||
"value_text": "360",
|
||||
"batch_id": 1,
|
||||
},
|
||||
# 经理与信息员(2026-08-13 执行日起)
|
||||
{
|
||||
"id": 5,
|
||||
"param_id": 5,
|
||||
"dimension_value": "sales_manager",
|
||||
"effective_date": date(2026, 8, 13),
|
||||
"value_text": "12.5",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"param_id": 6,
|
||||
"dimension_value": "sales_manager",
|
||||
"effective_date": date(2026, 8, 13),
|
||||
"value_text": "5",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"param_id": 7,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 2, 17),
|
||||
"value_text": "2",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"param_id": 7,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 8, 13),
|
||||
"value_text": "3",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"param_id": 8,
|
||||
"dimension_value": "info_officer",
|
||||
"effective_date": date(2026, 8, 13),
|
||||
"value_text": "1",
|
||||
"batch_id": 1,
|
||||
},
|
||||
# 支付环节与通用口径(需规默认值,无历史冲突)
|
||||
{
|
||||
"id": 10,
|
||||
"param_id": 9,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "10",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
"param_id": 10,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "80",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
"param_id": 11,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "60",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 13,
|
||||
"param_id": 12,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "FULL",
|
||||
"batch_id": 1,
|
||||
},
|
||||
# 产品阈值(按产品类别维度)
|
||||
{
|
||||
"id": 14,
|
||||
"param_id": 13,
|
||||
"dimension_value": "municipal_water",
|
||||
"effective_date": date(2026, 2, 17),
|
||||
"value_text": "30",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 15,
|
||||
"param_id": 13,
|
||||
"dimension_value": "rail_transit",
|
||||
"effective_date": date(2026, 2, 17),
|
||||
"value_text": "20",
|
||||
"batch_id": 1,
|
||||
},
|
||||
# 月工资口径(按岗位维度)
|
||||
{
|
||||
"id": 16,
|
||||
"param_id": 14,
|
||||
"dimension_value": "salesperson",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "INCLUDE",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 17,
|
||||
"param_id": 14,
|
||||
"dimension_value": "sales_manager",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "DEDUCT",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 18,
|
||||
"param_id": 15,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "18000",
|
||||
"batch_id": 1,
|
||||
},
|
||||
{
|
||||
"id": 19,
|
||||
"param_id": 16,
|
||||
"dimension_value": "",
|
||||
"effective_date": date(2026, 1, 1),
|
||||
"value_text": "3000",
|
||||
"batch_id": 1,
|
||||
},
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""回滚迁移。
|
||||
|
||||
**注意(autogenerate 不会替你处理)**:生成的 `op.drop_index` 与
|
||||
`op.drop_table` 顺序需人工检查 —— 若某索引是外键的唯一支撑索引,
|
||||
单独 drop_index 会报 MySQL 1553(needed in a foreign key constraint)。
|
||||
**整表回滚应只保留 `op.drop_table`**,DROP TABLE 会连带删除索引与外键。
|
||||
"""
|
||||
# 整表回滚只保留 drop_table —— DROP TABLE 会连带删除索引与外键。
|
||||
# 原 autogenerate 输出的逐个 drop_index 会失败:组合索引最左列 param_id 与
|
||||
# idx_param_values_batch_id 分别是两个外键的唯一支撑索引(MySQL errno 1553)。
|
||||
# 删除顺序:先删引用方 param_values,再删被引用方。
|
||||
op.drop_table("param_values")
|
||||
op.drop_table("param_change_batches")
|
||||
op.drop_table("param_definitions")
|
||||
op.drop_table("business_roles")
|
||||
@@ -0,0 +1,490 @@
|
||||
"""基础数据管理六表:人员/辐射区域/拓展计划/产品/客户/归属变更留痕(M2)
|
||||
|
||||
- personnel / personnel_regions / personnel_plans:人员档案及其 1:N 子表
|
||||
- products:产品主数据(类别锚定折算阈值参数)
|
||||
- customers:客户档案(公司名称+负责人为业务唯一标识)
|
||||
- ownership_change_logs:归属变更留痕(append-only,不回溯历史)
|
||||
- 六张表的 T+ 同步预留列(source_no 等)全部可空、不设唯一键(对照表 #26)
|
||||
|
||||
Revision ID: e1133a7c670a
|
||||
Revises: bfbda9c3191d
|
||||
Create Date: 2026-10-13 09:36:02.219248
|
||||
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import mysql
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "e1133a7c670a"
|
||||
down_revision: str | Sequence[str] | None = "bfbda9c3191d"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""应用迁移。"""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table(
|
||||
"products",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column("product_name", sa.String(length=128), nullable=False, comment="产品名称"),
|
||||
sa.Column(
|
||||
"spec_model",
|
||||
sa.String(length=128),
|
||||
server_default="",
|
||||
nullable=False,
|
||||
comment="规格型号(空串而非 NULL:参与组合唯一键,MySQL 组合索引对 NULL 不去重)",
|
||||
),
|
||||
sa.Column("unit", sa.String(length=16), nullable=True, comment="计量单位"),
|
||||
sa.Column(
|
||||
"stock_quantity",
|
||||
sa.Numeric(precision=14, scale=2),
|
||||
nullable=True,
|
||||
comment="数量(T+ 同步原样存储,语义待 IT 确认)",
|
||||
),
|
||||
sa.Column(
|
||||
"sale_price",
|
||||
sa.Numeric(precision=14, scale=4),
|
||||
nullable=True,
|
||||
comment="销售单价(元,T+ 同步)",
|
||||
),
|
||||
sa.Column(
|
||||
"product_category",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="产品类别:municipal_water市政水利 rail_transit轨道交通(决定折算阈值 30%/20%;T+同步不覆盖)",
|
||||
),
|
||||
sa.Column(
|
||||
"status",
|
||||
mysql.TINYINT(),
|
||||
server_default="1",
|
||||
nullable=False,
|
||||
comment="状态:1启用 0停用",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="备注"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.Column(
|
||||
"source_no",
|
||||
sa.String(length=64),
|
||||
nullable=True,
|
||||
comment="T+ 原始单据号(同步幂等去重锚点;唯一键待 IT 定键后升级)",
|
||||
),
|
||||
sa.Column("t_plus_id", sa.String(length=64), nullable=True, comment="T+ 系统内部标识"),
|
||||
sa.Column(
|
||||
"sync_batch_no",
|
||||
sa.String(length=32),
|
||||
nullable=True,
|
||||
comment="同步批次号(同步模块写入)",
|
||||
),
|
||||
sa.Column("synced_at", sa.DateTime(), nullable=True, comment="最近同步时间"),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_products")),
|
||||
sa.UniqueConstraint("product_name", "spec_model", name="uk_products_name_spec"),
|
||||
comment="产品表(类别锚定折算阈值参数;T+同步不覆盖产品类别)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(op.f("idx_products_source_no"), "products", ["source_no"], unique=False)
|
||||
op.create_table(
|
||||
"ownership_change_logs",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"owner_type", mysql.TINYINT(), nullable=False, comment="归属类型:1客户归属 2业务归属"
|
||||
),
|
||||
sa.Column(
|
||||
"customer_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="客户ID(固化,owner_type=1 时非空)",
|
||||
),
|
||||
sa.Column(
|
||||
"business_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="业务ID(固化,owner_type=2 时非空)",
|
||||
),
|
||||
sa.Column(
|
||||
"old_owner_personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="变更前负责营销人员ID(固化)",
|
||||
),
|
||||
sa.Column(
|
||||
"new_owner_personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="变更后负责营销人员ID(固化)",
|
||||
),
|
||||
sa.Column(
|
||||
"old_assistant_personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="变更前协助营销人员ID(固化,仅业务归属使用)",
|
||||
),
|
||||
sa.Column(
|
||||
"new_assistant_personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="变更后协助营销人员ID(固化,仅业务归属使用)",
|
||||
),
|
||||
sa.Column("change_reason", sa.String(length=255), nullable=True, comment="变更原因"),
|
||||
sa.Column(
|
||||
"operator_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="操作人ID(账号删除后置空)",
|
||||
),
|
||||
sa.Column(
|
||||
"operator_name",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="操作人用户名(冗余固化)",
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["operator_id"],
|
||||
["users.id"],
|
||||
name=op.f("fk_ownership_change_logs_operator_id"),
|
||||
ondelete="SET NULL",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_ownership_change_logs")),
|
||||
comment="归属变更记录表(append-only;客户/业务归属变更留痕,不回溯历史)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
op.f("idx_ownership_change_logs_customer_id"),
|
||||
"ownership_change_logs",
|
||||
["customer_id"],
|
||||
unique=False,
|
||||
)
|
||||
op.create_index(
|
||||
op.f("idx_ownership_change_logs_business_id"),
|
||||
"ownership_change_logs",
|
||||
["business_id"],
|
||||
unique=False,
|
||||
)
|
||||
op.create_index(
|
||||
op.f("idx_ownership_change_logs_create_time"),
|
||||
"ownership_change_logs",
|
||||
["create_time"],
|
||||
unique=False,
|
||||
)
|
||||
op.create_table(
|
||||
"personnel",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column("personnel_name", sa.String(length=64), nullable=False, comment="姓名"),
|
||||
sa.Column(
|
||||
"business_role_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="岗位角色ID(决定计提公式模板;T+同步不覆盖)",
|
||||
),
|
||||
sa.Column(
|
||||
"manager_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="直属营销经理ID(NULL=经理本人或未分配;团队成员关系锚点)",
|
||||
),
|
||||
sa.Column("phone", sa.String(length=20), nullable=True, comment="联系电话"),
|
||||
sa.Column("hire_date", sa.Date(), nullable=True, comment="入职日期"),
|
||||
sa.Column(
|
||||
"is_probation",
|
||||
mysql.TINYINT(),
|
||||
server_default="0",
|
||||
nullable=False,
|
||||
comment="是否试用期:1是 0否(试用期绩效照算不发放)",
|
||||
),
|
||||
sa.Column(
|
||||
"salary_standard",
|
||||
sa.Numeric(precision=12, scale=2),
|
||||
nullable=True,
|
||||
comment="月工资标准(元;T+同步不覆盖)",
|
||||
),
|
||||
sa.Column(
|
||||
"status",
|
||||
mysql.TINYINT(),
|
||||
server_default="1",
|
||||
nullable=False,
|
||||
comment="状态:1在职 0离职(离职人员不可再被业务/客户归属引用)",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="备注"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.Column(
|
||||
"source_no",
|
||||
sa.String(length=64),
|
||||
nullable=True,
|
||||
comment="T+ 原始单据号(同步幂等去重锚点;唯一键待 IT 定键后升级)",
|
||||
),
|
||||
sa.Column("t_plus_id", sa.String(length=64), nullable=True, comment="T+ 系统内部标识"),
|
||||
sa.Column(
|
||||
"sync_batch_no",
|
||||
sa.String(length=32),
|
||||
nullable=True,
|
||||
comment="同步批次号(同步模块写入)",
|
||||
),
|
||||
sa.Column("synced_at", sa.DateTime(), nullable=True, comment="最近同步时间"),
|
||||
sa.ForeignKeyConstraint(
|
||||
["business_role_id"],
|
||||
["business_roles.id"],
|
||||
name=op.f("fk_personnel_business_role_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["manager_id"],
|
||||
["personnel.id"],
|
||||
name=op.f("fk_personnel_manager_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_personnel")),
|
||||
comment="营销人员表(T+同步不覆盖岗位与工资标准)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
op.f("idx_personnel_business_role_id"), "personnel", ["business_role_id"], unique=False
|
||||
)
|
||||
op.create_index(op.f("idx_personnel_manager_id"), "personnel", ["manager_id"], unique=False)
|
||||
op.create_index(op.f("idx_personnel_source_no"), "personnel", ["source_no"], unique=False)
|
||||
op.create_table(
|
||||
"customers",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column("company_name", sa.String(length=128), nullable=False, comment="公司名称"),
|
||||
sa.Column(
|
||||
"owner_name",
|
||||
sa.String(length=64),
|
||||
nullable=False,
|
||||
comment="客户负责人姓名(客户公司负责人的人名,非系统人员)",
|
||||
),
|
||||
sa.Column("contact_person", sa.String(length=64), nullable=True, comment="联系人"),
|
||||
sa.Column("contact_phone", sa.String(length=20), nullable=True, comment="联系电话"),
|
||||
sa.Column("address", sa.String(length=255), nullable=True, comment="地址"),
|
||||
sa.Column("industry", sa.String(length=64), nullable=True, comment="所属行业(自由文本)"),
|
||||
sa.Column(
|
||||
"customer_type",
|
||||
sa.String(length=32),
|
||||
server_default="personal",
|
||||
nullable=False,
|
||||
comment="客户分类:personal个人户 manager_personal经理个人户 enterprise企业户(计提规则匹配锚点;T+同步不覆盖)",
|
||||
),
|
||||
sa.Column(
|
||||
"owner_personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=True,
|
||||
comment="归属负责营销人员ID(手动修改不回溯历史,变更留痕见 ownership_change_logs)",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="备注"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.Column(
|
||||
"source_no",
|
||||
sa.String(length=64),
|
||||
nullable=True,
|
||||
comment="T+ 原始单据号(同步幂等去重锚点;唯一键待 IT 定键后升级)",
|
||||
),
|
||||
sa.Column("t_plus_id", sa.String(length=64), nullable=True, comment="T+ 系统内部标识"),
|
||||
sa.Column(
|
||||
"sync_batch_no",
|
||||
sa.String(length=32),
|
||||
nullable=True,
|
||||
comment="同步批次号(同步模块写入)",
|
||||
),
|
||||
sa.Column("synced_at", sa.DateTime(), nullable=True, comment="最近同步时间"),
|
||||
sa.ForeignKeyConstraint(
|
||||
["owner_personnel_id"],
|
||||
["personnel.id"],
|
||||
name=op.f("fk_customers_owner_personnel_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_customers")),
|
||||
sa.UniqueConstraint("company_name", "owner_name", name="uk_customers_company_owner"),
|
||||
comment="客户表(公司名称+负责人为业务唯一标识;T+同步不覆盖客户分类)",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
op.f("idx_customers_customer_type"), "customers", ["customer_type"], unique=False
|
||||
)
|
||||
op.create_index(
|
||||
op.f("idx_customers_owner_personnel_id"), "customers", ["owner_personnel_id"], unique=False
|
||||
)
|
||||
op.create_index(op.f("idx_customers_source_no"), "customers", ["source_no"], unique=False)
|
||||
op.create_table(
|
||||
"personnel_plans",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="人员ID(personnel.id)",
|
||||
),
|
||||
sa.Column(
|
||||
"plan_period",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
comment="计划期间(如 2026Q1、2026-05)",
|
||||
),
|
||||
sa.Column("plan_content", sa.String(length=500), nullable=False, comment="计划内容"),
|
||||
sa.Column(
|
||||
"target_desc", sa.String(length=255), nullable=True, comment="指标说明(文字描述)"
|
||||
),
|
||||
sa.Column(
|
||||
"source_no", sa.String(length=64), nullable=True, comment="T+ 原始条目号(预留)"
|
||||
),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["personnel_id"],
|
||||
["personnel.id"],
|
||||
name=op.f("fk_personnel_plans_personnel_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_personnel_plans")),
|
||||
comment="市场拓展计划表",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
op.f("idx_personnel_plans_personnel_id"), "personnel_plans", ["personnel_id"], unique=False
|
||||
)
|
||||
op.create_table(
|
||||
"personnel_regions",
|
||||
sa.Column(
|
||||
"id", mysql.BIGINT(unsigned=True), autoincrement=True, nullable=False, comment="主键ID"
|
||||
),
|
||||
sa.Column(
|
||||
"personnel_id",
|
||||
mysql.BIGINT(unsigned=True),
|
||||
nullable=False,
|
||||
comment="人员ID(personnel.id)",
|
||||
),
|
||||
sa.Column(
|
||||
"region_name",
|
||||
sa.String(length=128),
|
||||
nullable=False,
|
||||
comment="区域名称(产品辐射地理范围)",
|
||||
),
|
||||
sa.Column("remark", sa.String(length=255), nullable=True, comment="备注"),
|
||||
sa.Column(
|
||||
"create_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="创建时间",
|
||||
),
|
||||
sa.Column(
|
||||
"update_time",
|
||||
sa.DateTime(),
|
||||
server_default=sa.text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
|
||||
nullable=False,
|
||||
comment="更新时间",
|
||||
),
|
||||
sa.ForeignKeyConstraint(
|
||||
["personnel_id"],
|
||||
["personnel.id"],
|
||||
name=op.f("fk_personnel_regions_personnel_id"),
|
||||
ondelete="RESTRICT",
|
||||
),
|
||||
sa.PrimaryKeyConstraint("id", name=op.f("pk_personnel_regions")),
|
||||
comment="产品辐射区域表",
|
||||
mysql_charset="utf8mb4",
|
||||
mysql_collate="utf8mb4_general_ci",
|
||||
mysql_engine="InnoDB",
|
||||
)
|
||||
op.create_index(
|
||||
op.f("idx_personnel_regions_personnel_id"),
|
||||
"personnel_regions",
|
||||
["personnel_id"],
|
||||
unique=False,
|
||||
)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""回滚迁移。
|
||||
|
||||
**注意(autogenerate 不会替你处理)**:生成的 `op.drop_index` 与
|
||||
`op.drop_table` 顺序需人工检查 —— 若某索引是外键的唯一支撑索引,
|
||||
单独 drop_index 会报 MySQL 1553(needed in a foreign key constraint)。
|
||||
**整表回滚应只保留 `op.drop_table`**,DROP TABLE 会连带删除索引与外键。
|
||||
"""
|
||||
op.drop_table("personnel_regions")
|
||||
op.drop_table("personnel_plans")
|
||||
op.drop_table("customers")
|
||||
op.drop_table("personnel")
|
||||
op.drop_table("ownership_change_logs")
|
||||
op.drop_table("products")
|
||||
@@ -113,3 +113,22 @@ def require_admin(current_user: Annotated[User, Depends(get_current_user)]) -> U
|
||||
|
||||
|
||||
AdminUser = Annotated[User, Depends(require_admin)]
|
||||
|
||||
|
||||
def require_roles(*role_codes: str):
|
||||
"""要求当前用户具备任一指定角色(依赖工厂)。
|
||||
|
||||
与 require_admin 的差别:admin 不是天然放行——传入集合里显式含
|
||||
ROLE_ADMIN 才可见。用于审批等模块的粗粒度准入;节点级准入仍由
|
||||
service 按单据状态二次校验(双层:模块可见 ≠ 可操作)。
|
||||
|
||||
:raises ForbiddenError: 已登录但不具备任一指定角色(403)
|
||||
"""
|
||||
|
||||
def _checker(current_user: Annotated[User, Depends(get_current_user)]) -> User:
|
||||
codes = set(user_repository.get_role_codes(current_user))
|
||||
if not codes & set(role_codes):
|
||||
raise ForbiddenError("无权访问审批管理")
|
||||
return current_user
|
||||
|
||||
return _checker
|
||||
@@ -8,8 +8,19 @@ from fastapi import APIRouter
|
||||
|
||||
from app.api import health
|
||||
from app.api.v1 import auth
|
||||
from app.api.v1.base import customers as base_customers
|
||||
from app.api.v1.base import personnel as base_personnel
|
||||
from app.api.v1.base import products as base_products
|
||||
from app.api.v1.business import businesses as business_businesses
|
||||
from app.api.v1.business import ratings as business_ratings
|
||||
from app.api.v1.business import receipts as business_receipts
|
||||
from app.api.v1.business import shipments as business_shipments
|
||||
from app.api.v1.system import approvals as system_approvals
|
||||
from app.api.v1.system import business_roles as system_business_roles
|
||||
from app.api.v1.system import logs as system_logs
|
||||
from app.api.v1.system import params as system_params
|
||||
from app.api.v1.system import roles as system_roles
|
||||
from app.api.v1.system import settings as system_settings
|
||||
from app.api.v1.system import users as system_users
|
||||
|
||||
api_router = APIRouter()
|
||||
@@ -25,8 +36,27 @@ v1_router.include_router(auth.router)
|
||||
system_router = APIRouter(prefix="/system")
|
||||
system_router.include_router(system_users.router)
|
||||
system_router.include_router(system_roles.router)
|
||||
system_router.include_router(system_business_roles.router)
|
||||
system_router.include_router(system_params.router)
|
||||
system_router.include_router(system_settings.router)
|
||||
system_router.include_router(system_approvals.router)
|
||||
system_router.include_router(system_logs.operation_router)
|
||||
system_router.include_router(system_logs.login_router)
|
||||
v1_router.include_router(system_router)
|
||||
|
||||
# 基础数据(需求 2.1):/api/v1/base/*,业务操作登录即可访问
|
||||
base_router = APIRouter(prefix="/base")
|
||||
base_router.include_router(base_personnel.router)
|
||||
base_router.include_router(base_products.router)
|
||||
base_router.include_router(base_customers.router)
|
||||
v1_router.include_router(base_router)
|
||||
|
||||
# 业务数据(需求 2.2):/api/v1/business/*,业务操作登录即可访问
|
||||
business_router = APIRouter(prefix="/business")
|
||||
business_router.include_router(business_businesses.router)
|
||||
business_router.include_router(business_shipments.router)
|
||||
business_router.include_router(business_receipts.router)
|
||||
business_router.include_router(business_ratings.router)
|
||||
v1_router.include_router(business_router)
|
||||
|
||||
api_router.include_router(v1_router)
|
||||
@@ -0,0 +1,8 @@
|
||||
"""基础数据管理接口(需求 2.1)。
|
||||
|
||||
挂载于 `/api/v1/base/*`,含人员管理、辐射区域、拓展计划等基础数据的维护入口。
|
||||
|
||||
与 `api/v1/system` 的权限分工:基础数据是**业务操作**,登录即可访问
|
||||
(不要求管理员);写操作同样经 `RequestMetaDep` 带入请求元信息,
|
||||
由 service 层写入操作日志。
|
||||
"""
|
||||
@@ -0,0 +1,142 @@
|
||||
"""客户管理接口(需求 2.1.3)。
|
||||
|
||||
归属调整有专属端点 ``PUT /{id}/ownership``:它是唯一写归属留痕的入口,
|
||||
编辑端点的 schema 不含归属字段 —— 防止出现「改了归属却无留痕」的旁路
|
||||
(原因详见 `schemas.customer.CustomerUpdateIn`)。
|
||||
|
||||
与 `api/v1/system` 的权限分工:基础数据是**业务操作**,登录即可访问
|
||||
(不要求管理员);写操作同样经 `RequestMetaDep` 带入请求元信息,
|
||||
由 service 层写入操作日志。
|
||||
"""
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Query
|
||||
|
||||
from app.api.deps import DbSession, RequestMetaDep, get_current_user
|
||||
from app.core.response import ApiResponse, PageQuery, PageResult, ok
|
||||
from app.models import User
|
||||
from app.schemas.customer import (
|
||||
CustomerCreateIn,
|
||||
CustomerOut,
|
||||
CustomerOwnershipIn,
|
||||
CustomerQuery,
|
||||
CustomerUpdateIn,
|
||||
OwnershipChangeLogOut,
|
||||
)
|
||||
from app.services import customer_service
|
||||
|
||||
router = APIRouter(prefix="/customers", tags=["客户管理"])
|
||||
|
||||
# 基础数据不要求管理员(见模块 docstring),登录用户即可操作
|
||||
CurrentUser = Annotated[User, Depends(get_current_user)]
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PageResult[CustomerOut]], summary="客户列表")
|
||||
def list_customers(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
query: Annotated[CustomerQuery, Query()],
|
||||
) -> ApiResponse[PageResult[CustomerOut]]:
|
||||
"""分页查询客户(keyword 对公司名称/客户负责人模糊匹配,附归属人员姓名)。"""
|
||||
return ok(customer_service.list_customers(session, query))
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[CustomerOut], summary="新增客户")
|
||||
def create_customer(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
payload: CustomerCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[CustomerOut]:
|
||||
"""新增客户。客户分类须在注册表内;「公司名称+负责人」组合唯一。"""
|
||||
return ok(
|
||||
customer_service.create_customer(session, payload, operator=current_user, meta=meta),
|
||||
message="客户已创建",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/{customer_id}", response_model=ApiResponse[CustomerOut], summary="客户详情")
|
||||
def get_customer(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
customer_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[CustomerOut]:
|
||||
"""按主键查询客户详情。"""
|
||||
return ok(customer_service.get_customer(session, customer_id))
|
||||
|
||||
|
||||
@router.put("/{customer_id}", response_model=ApiResponse[CustomerOut], summary="编辑客户")
|
||||
def update_customer(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
customer_id: Annotated[int, Path(ge=1)],
|
||||
payload: CustomerUpdateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[CustomerOut]:
|
||||
"""编辑客户档案。
|
||||
|
||||
**不含归属** —— 归属调整统一走 ``PUT /{id}/ownership``;编辑表单即使
|
||||
提交 ownerPersonnelId 也会被忽略,归属以归属端点为准。
|
||||
"""
|
||||
return ok(
|
||||
customer_service.update_customer(
|
||||
session, customer_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{customer_id}", response_model=ApiResponse[None], summary="删除客户")
|
||||
def delete_customer(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
customer_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""删除客户(物理删除)。
|
||||
|
||||
已存在关联业务时返回 400(先处理相关业务单据)。
|
||||
"""
|
||||
customer_service.delete_customer(session, customer_id, operator=current_user, meta=meta)
|
||||
return ok(message="客户已删除")
|
||||
|
||||
|
||||
@router.put(
|
||||
"/{customer_id}/ownership",
|
||||
response_model=ApiResponse[CustomerOut],
|
||||
summary="归属变更",
|
||||
)
|
||||
def change_ownership(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
customer_id: Annotated[int, Path(ge=1)],
|
||||
payload: CustomerOwnershipIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[CustomerOut]:
|
||||
"""调整客户归属(唯一写归属留痕的入口)。
|
||||
|
||||
只影响变更后核算,不回溯历史(对照表 #19);新旧归属人员ID任一为 null
|
||||
表示清空归属。新旧归属相同报「归属未变化」。
|
||||
"""
|
||||
return ok(
|
||||
customer_service.change_ownership(
|
||||
session, customer_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="归属已调整",
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{customer_id}/ownership-logs",
|
||||
response_model=ApiResponse[PageResult[OwnershipChangeLogOut]],
|
||||
summary="归属变更留痕",
|
||||
)
|
||||
def list_ownership_logs(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
customer_id: Annotated[int, Path(ge=1)],
|
||||
query: Annotated[PageQuery, Query()],
|
||||
) -> ApiResponse[PageResult[OwnershipChangeLogOut]]:
|
||||
"""查某客户的归属变更留痕(分页,按变更时间倒序,附新旧归属人员姓名)。"""
|
||||
return ok(customer_service.list_ownership_logs(session, customer_id, query))
|
||||
@@ -0,0 +1,143 @@
|
||||
"""人员管理接口(需求 2.1.1:人员档案 + 辐射区域 + 拓展计划)。
|
||||
|
||||
基础数据属业务操作,**登录即可访问**(不要求管理员,对照系统管理模块)。
|
||||
校验规则(岗位/经理合法性、删除保护、子表全量替换的防御写法)见
|
||||
`personnel_service` 模块 docstring —— 前端提示之外,后端校验是唯一防线。
|
||||
|
||||
写操作经 `RequestMetaDep` 带入请求元信息由 service 层写入操作日志。
|
||||
"""
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Query
|
||||
|
||||
from app.api.deps import DbSession, RequestMetaDep, get_current_user
|
||||
from app.core.response import ApiResponse, PageResult, ok
|
||||
from app.models import User
|
||||
from app.schemas.personnel import (
|
||||
PersonnelCreateIn,
|
||||
PersonnelDetailOut,
|
||||
PersonnelOut,
|
||||
PersonnelQuery,
|
||||
PersonnelStatusIn,
|
||||
PlanReplaceIn,
|
||||
RegionReplaceIn,
|
||||
)
|
||||
from app.services import personnel_service
|
||||
|
||||
# 基础数据是业务操作:登录即可,不要求管理员(区别于系统管理的 AdminUser)
|
||||
CurrentUser = Annotated[User, Depends(get_current_user)]
|
||||
|
||||
router = APIRouter(prefix="/personnel", tags=["人员管理"])
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PageResult[PersonnelOut]], summary="人员列表")
|
||||
def list_personnel(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
query: Annotated[PersonnelQuery, Query()],
|
||||
) -> ApiResponse[PageResult[PersonnelOut]]:
|
||||
"""分页查询人员(含离职)。姓名模糊匹配,可按状态与岗位筛选。"""
|
||||
return ok(personnel_service.list_personnel(session, query))
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[PersonnelOut], summary="新增人员")
|
||||
def create_personnel(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
payload: PersonnelCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[PersonnelOut]:
|
||||
"""新增人员,默认在职。岗位须存在且启用;直属经理不能是自己且须在职。"""
|
||||
return ok(
|
||||
personnel_service.create_personnel(session, payload, operator=current_user, meta=meta),
|
||||
message="人员已创建",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/{personnel_id}", response_model=ApiResponse[PersonnelDetailOut], summary="人员详情")
|
||||
def get_personnel(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
personnel_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[PersonnelDetailOut]:
|
||||
"""人员详情,附辐射区域与拓展计划,供编辑抽屉一次回显。"""
|
||||
return ok(personnel_service.get_detail(session, personnel_id))
|
||||
|
||||
|
||||
@router.put("/{personnel_id}", response_model=ApiResponse[PersonnelOut], summary="编辑人员")
|
||||
def update_personnel(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
personnel_id: Annotated[int, Path(ge=1)],
|
||||
payload: PersonnelCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[PersonnelOut]:
|
||||
"""编辑人员(全量提交,不含状态)。校验规则同新增。"""
|
||||
return ok(
|
||||
personnel_service.update_personnel(
|
||||
session, personnel_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{personnel_id}", response_model=ApiResponse[None], summary="删除人员")
|
||||
def delete_personnel(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
personnel_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""删除人员。被团队成员或客户归属引用时禁删,应改为离职。"""
|
||||
personnel_service.delete_personnel(session, personnel_id, operator=current_user, meta=meta)
|
||||
return ok(message="人员已删除")
|
||||
|
||||
|
||||
@router.put(
|
||||
"/{personnel_id}/status",
|
||||
response_model=ApiResponse[PersonnelOut],
|
||||
summary="设为在职/离职",
|
||||
)
|
||||
def set_status(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
personnel_id: Annotated[int, Path(ge=1)],
|
||||
payload: PersonnelStatusIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[PersonnelOut]:
|
||||
"""在职/离职切换。离职人员不可再被业务与客户归属引用。"""
|
||||
result = personnel_service.set_status(
|
||||
session, personnel_id, payload.status, operator=current_user, meta=meta
|
||||
)
|
||||
return ok(result, message="已设为在职" if payload.status == 1 else "已设为离职")
|
||||
|
||||
|
||||
@router.put("/{personnel_id}/regions", response_model=ApiResponse[None], summary="维护辐射区域")
|
||||
def replace_regions(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
personnel_id: Annotated[int, Path(ge=1)],
|
||||
payload: RegionReplaceIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""全量替换辐射区域,空列表即清空。"""
|
||||
personnel_service.replace_regions(
|
||||
session, personnel_id, payload, operator=current_user, meta=meta
|
||||
)
|
||||
return ok(message="已保存")
|
||||
|
||||
|
||||
@router.put("/{personnel_id}/plans", response_model=ApiResponse[None], summary="维护拓展计划")
|
||||
def replace_plans(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
personnel_id: Annotated[int, Path(ge=1)],
|
||||
payload: PlanReplaceIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""全量替换拓展计划,空列表即清空。"""
|
||||
personnel_service.replace_plans(
|
||||
session, personnel_id, payload, operator=current_user, meta=meta
|
||||
)
|
||||
return ok(message="已保存")
|
||||
@@ -0,0 +1,112 @@
|
||||
"""产品管理接口(需求 2.1.2:产品主数据维护)。
|
||||
|
||||
产品是折算阈值的行级锚点(product_category 决定 30%/20% 折算阈值),
|
||||
类别值域由后端校验 —— 前端下拉只是展示约束,后端校验是唯一防线。
|
||||
|
||||
**数据提取(POST /products/extract)暂不提供**:它依赖业务明细表
|
||||
(V5 迁移),待业务管理任务完成后补充。
|
||||
|
||||
基础数据属业务操作,登录用户即可访问(区别于系统管理模块的 AdminUser);
|
||||
写操作经 RequestMetaDep 带入请求元信息,由 service 层写入操作日志。
|
||||
"""
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Query
|
||||
|
||||
from app.api.deps import DbSession, RequestMetaDep, get_current_user
|
||||
from app.core.response import ApiResponse, PageResult, ok
|
||||
from app.models import User
|
||||
from app.schemas.product import (
|
||||
ProductCreateIn,
|
||||
ProductOut,
|
||||
ProductQuery,
|
||||
ProductStatusIn,
|
||||
ProductUpdateIn,
|
||||
)
|
||||
from app.services import product_service
|
||||
|
||||
CurrentUser = Annotated[User, Depends(get_current_user)]
|
||||
|
||||
router = APIRouter(prefix="/products", tags=["产品管理"])
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PageResult[ProductOut]], summary="产品列表")
|
||||
def list_products(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
query: Annotated[ProductQuery, Query()],
|
||||
) -> ApiResponse[PageResult[ProductOut]]:
|
||||
"""分页查询产品(含停用)。keyword 对名称或规格模糊匹配。"""
|
||||
return ok(product_service.list_products(session, query))
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[ProductOut], summary="新增产品")
|
||||
def create_product(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
payload: ProductCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[ProductOut]:
|
||||
"""新增产品。类别须在合法值域内;新产品默认启用。"""
|
||||
return ok(
|
||||
product_service.create_product(session, payload, operator=current_user, meta=meta),
|
||||
message="产品已创建",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/{product_id}", response_model=ApiResponse[ProductOut], summary="产品详情")
|
||||
def get_product(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
product_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[ProductOut]:
|
||||
"""按主键查询产品详情。"""
|
||||
return ok(product_service.get_product(session, product_id))
|
||||
|
||||
|
||||
@router.put("/{product_id}", response_model=ApiResponse[ProductOut], summary="编辑产品")
|
||||
def update_product(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
product_id: Annotated[int, Path(ge=1)],
|
||||
payload: ProductUpdateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[ProductOut]:
|
||||
"""编辑产品基本信息(全量替换,不含状态;启用/停用走独立端点)。"""
|
||||
return ok(
|
||||
product_service.update_product(
|
||||
session, product_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{product_id}", response_model=ApiResponse[None], summary="删除产品")
|
||||
def delete_product(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
product_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""物理删除产品(仅限误录数据,常规下架用停用)。
|
||||
|
||||
被业务明细/发货明细引用时返回 400(引导改走停用)。
|
||||
"""
|
||||
product_service.delete_product(session, product_id, operator=current_user, meta=meta)
|
||||
return ok(message="产品已删除")
|
||||
|
||||
|
||||
@router.put("/{product_id}/status", response_model=ApiResponse[ProductOut], summary="启用/停用产品")
|
||||
def set_status(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
product_id: Annotated[int, Path(ge=1)],
|
||||
payload: ProductStatusIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[ProductOut]:
|
||||
"""启用或停用产品(1启用 0停用)。"""
|
||||
result = product_service.set_status(
|
||||
session, product_id, payload.status, operator=current_user, meta=meta
|
||||
)
|
||||
return ok(result, message="已启用" if payload.status == 1 else "已停用")
|
||||
@@ -0,0 +1,8 @@
|
||||
"""业务数据管理接口(需求 2.2)。
|
||||
|
||||
挂载于 `/api/v1/business/*`,含业务单据维护、客户评级等级配置等业务数据入口。
|
||||
|
||||
与 `api/v1/system` 的权限分工:业务数据是**业务操作**,登录即可访问
|
||||
(不要求管理员);写操作同样经 `RequestMetaDep` 带入请求元信息,
|
||||
由 service 层写入操作日志。
|
||||
"""
|
||||
@@ -0,0 +1,177 @@
|
||||
"""业务管理接口(需求 2.2.1/2.2.4)。
|
||||
|
||||
校验规则(编号生成、状态机、归属留痕、汇总重算)见 `business_service`
|
||||
模块 docstring;基础数据属业务操作,登录即可访问。
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Query
|
||||
|
||||
from app.api.deps import DbSession, RequestMetaDep, get_current_user
|
||||
from app.core.response import ApiResponse, PageQuery, PageResult, ok
|
||||
from app.models import User
|
||||
from app.schemas.business import (
|
||||
BusinessCreateIn,
|
||||
BusinessDetailOut,
|
||||
BusinessOut,
|
||||
BusinessOwnershipIn,
|
||||
BusinessQuery,
|
||||
BusinessStatusIn,
|
||||
BusinessStatusLogOut,
|
||||
BusinessUpdateIn,
|
||||
GrossProfitOut,
|
||||
OwnershipChangeLogOut,
|
||||
)
|
||||
from app.services import business_service
|
||||
|
||||
# 基础数据是业务操作:登录即可,不要求管理员(区别于系统管理的 AdminUser)
|
||||
CurrentUser = Annotated[User, Depends(get_current_user)]
|
||||
|
||||
router = APIRouter(prefix="/businesses", tags=["业务管理"])
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PageResult[BusinessOut]], summary="业务列表")
|
||||
def list_businesses(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
query: Annotated[BusinessQuery, Query()],
|
||||
) -> ApiResponse[PageResult[BusinessOut]]:
|
||||
"""分页查询业务。编号/公司名称模糊,可按状态/客户/归属人员/日期范围筛选。"""
|
||||
return ok(business_service.list_businesses(session, query))
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[BusinessOut], summary="创建业务")
|
||||
def create_business(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
payload: BusinessCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[BusinessOut]:
|
||||
"""创建业务 + 明细行(≥1)。业务编号自动生成;创建写首条状态留痕。"""
|
||||
return ok(
|
||||
business_service.create_business(session, payload, operator=current_user, meta=meta),
|
||||
message="业务已创建",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/{business_id}", response_model=ApiResponse[BusinessDetailOut], summary="业务详情")
|
||||
def get_business(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
business_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[BusinessDetailOut]:
|
||||
"""业务详情,附产品明细行,供编辑抽屉一次回显。"""
|
||||
return ok(business_service.get_detail(session, business_id))
|
||||
|
||||
|
||||
@router.put("/{business_id}", response_model=ApiResponse[BusinessOut], summary="编辑业务")
|
||||
def update_business(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
business_id: Annotated[int, Path(ge=1)],
|
||||
payload: BusinessUpdateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[BusinessOut]:
|
||||
"""编辑业务(明细全量替换并重算汇总)。归属不在此端点调整,走 /ownership。"""
|
||||
return ok(
|
||||
business_service.update_business(
|
||||
session, business_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{business_id}", response_model=ApiResponse[None], summary="删除业务")
|
||||
def delete_business(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
business_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""删除业务。有发货或回款记录时禁删,应改为已终止。"""
|
||||
business_service.delete_business(session, business_id, operator=current_user, meta=meta)
|
||||
return ok(message="业务已删除")
|
||||
|
||||
|
||||
@router.put("/{business_id}/status", response_model=ApiResponse[BusinessOut], summary="状态流转")
|
||||
def change_status(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
business_id: Annotated[int, Path(ge=1)],
|
||||
payload: BusinessStatusIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[BusinessOut]:
|
||||
"""状态流转:执行中→已完成/已终止;终态不可再变更;终止必填原因。"""
|
||||
return ok(
|
||||
business_service.change_status(
|
||||
session, business_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="状态已变更",
|
||||
)
|
||||
|
||||
|
||||
@router.put("/{business_id}/ownership", response_model=ApiResponse[BusinessOut], summary="调整归属")
|
||||
def change_ownership(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
business_id: Annotated[int, Path(ge=1)],
|
||||
payload: BusinessOwnershipIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[BusinessOut]:
|
||||
"""调整负责/协助营销人员,同事务写归属变更留痕(不回溯历史)。"""
|
||||
return ok(
|
||||
business_service.change_ownership(
|
||||
session, business_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="归属已调整",
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{business_id}/ownership-logs",
|
||||
response_model=ApiResponse[PageResult[OwnershipChangeLogOut]],
|
||||
summary="归属变更记录",
|
||||
)
|
||||
def list_ownership_logs(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
business_id: Annotated[int, Path(ge=1)],
|
||||
query: Annotated[PageQuery, Query()],
|
||||
) -> ApiResponse[PageResult[OwnershipChangeLogOut]]:
|
||||
"""某业务的归属变更留痕(分页,按时间倒序)。"""
|
||||
return ok(business_service.list_ownership_logs(session, business_id, query))
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{business_id}/status-logs",
|
||||
response_model=ApiResponse[PageResult[BusinessStatusLogOut]],
|
||||
summary="状态流转记录",
|
||||
)
|
||||
def list_status_logs(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
business_id: Annotated[int, Path(ge=1)],
|
||||
query: Annotated[PageQuery, Query()],
|
||||
) -> ApiResponse[PageResult[BusinessStatusLogOut]]:
|
||||
"""某业务的状态流转时间线(分页,按时间正序,从创建起展示)。"""
|
||||
return ok(business_service.list_status_logs(session, business_id, query))
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{business_id}/gross-profit",
|
||||
response_model=ApiResponse[GrossProfitOut],
|
||||
summary="毛利润数据视图",
|
||||
)
|
||||
def gross_profit(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
business_id: Annotated[int, Path(ge=1)],
|
||||
as_of: Annotated[date | None, Query()] = None,
|
||||
) -> ApiResponse[GrossProfitOut]:
|
||||
"""按产品逐行实时计算毛利润与折算额(不含运费口径,对照表 #2)。
|
||||
|
||||
阈值按 asOf(默认今日)取参数快照;M3 核算实际按回款到账日取参。
|
||||
"""
|
||||
return ok(business_service.gross_profit(session, business_id, as_of))
|
||||
@@ -0,0 +1,74 @@
|
||||
"""客户评级等级配置接口(需求 2.2.5)。
|
||||
|
||||
评级计算器的等级映射判定表:判定按 sort_order 升序取首个 min_score ≤ 总分
|
||||
的等级,max_score 仅展示。区间合法(0≤min≤max≤100)与互不重叠由后端校验
|
||||
—— 前端表单只是展示约束,后端校验是唯一防线。
|
||||
|
||||
列表不分页全量返回:等级映射是判定表,数量个位数,分页无意义。
|
||||
业务数据属业务操作,登录用户即可访问(区别于系统管理模块的 AdminUser);
|
||||
写操作经 RequestMetaDep 带入请求元信息,由 service 层写入操作日志。
|
||||
"""
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path
|
||||
|
||||
from app.api.deps import DbSession, RequestMetaDep, get_current_user
|
||||
from app.core.response import ApiResponse, ok
|
||||
from app.models import User
|
||||
from app.schemas.rating import RatingGradeCreateIn, RatingGradeOut, RatingGradeUpdateIn
|
||||
from app.services import rating_service
|
||||
|
||||
CurrentUser = Annotated[User, Depends(get_current_user)]
|
||||
|
||||
router = APIRouter(prefix="/rating-grades", tags=["客户评级"])
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[list[RatingGradeOut]], summary="评级等级列表")
|
||||
def list_grades(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
) -> ApiResponse[list[RatingGradeOut]]:
|
||||
"""全量等级列表,按判定顺序(sort_order 升序)返回,不分页。"""
|
||||
return ok(rating_service.list_grades(session))
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[RatingGradeOut], summary="新增评级等级")
|
||||
def create_grade(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
payload: RatingGradeCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[RatingGradeOut]:
|
||||
"""新增评级等级。区间须 0≤min≤max≤100 且与既有等级不重叠。"""
|
||||
return ok(
|
||||
rating_service.create_grade(session, payload, operator=current_user, meta=meta),
|
||||
message="评级等级已创建",
|
||||
)
|
||||
|
||||
|
||||
@router.put("/{grade_id}", response_model=ApiResponse[RatingGradeOut], summary="编辑评级等级")
|
||||
def update_grade(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
grade_id: Annotated[int, Path(ge=1)],
|
||||
payload: RatingGradeUpdateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[RatingGradeOut]:
|
||||
"""编辑评级等级(全量替换)。区间须合法且与其他等级不重叠。"""
|
||||
return ok(
|
||||
rating_service.update_grade(session, grade_id, payload, operator=current_user, meta=meta),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{grade_id}", response_model=ApiResponse[None], summary="删除评级等级")
|
||||
def delete_grade(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
grade_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""物理删除评级等级(等级表无下游引用,允许清空,理由见 service 说明)。"""
|
||||
rating_service.delete_grade(session, grade_id, operator=current_user, meta=meta)
|
||||
return ok(message="评级等级已删除")
|
||||
@@ -0,0 +1,89 @@
|
||||
"""回款管理接口(需求 2.2.3)。
|
||||
|
||||
回款按业务登记到账款项,批次号自动生成(HK 前缀)。校验规则(发货
|
||||
批次同业务强校验、已核算禁改禁删、汇总重算)见 `receipt_service` 模块
|
||||
docstring;基础数据属业务操作,登录即可访问。
|
||||
"""
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Query
|
||||
|
||||
from app.api.deps import DbSession, RequestMetaDep, get_current_user
|
||||
from app.core.response import ApiResponse, PageResult, ok
|
||||
from app.models import User
|
||||
from app.schemas.receipt import (
|
||||
ReceiptCreateIn,
|
||||
ReceiptOut,
|
||||
ReceiptQuery,
|
||||
ReceiptUpdateIn,
|
||||
)
|
||||
from app.services import receipt_service
|
||||
|
||||
# 基础数据是业务操作:登录即可,不要求管理员(区别于系统管理的 AdminUser)
|
||||
CurrentUser = Annotated[User, Depends(get_current_user)]
|
||||
|
||||
router = APIRouter(prefix="/receipts", tags=["回款管理"])
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PageResult[ReceiptOut]], summary="回款列表")
|
||||
def list_receipts(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
query: Annotated[ReceiptQuery, Query()],
|
||||
) -> ApiResponse[PageResult[ReceiptOut]]:
|
||||
"""分页查询回款。附业务号/发货单号与回款天数派生值,可按业务/日期/抵顶/核算状态筛选。"""
|
||||
return ok(receipt_service.list_receipts(session, query))
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[ReceiptOut], summary="新增回款")
|
||||
def create_receipt(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
payload: ReceiptCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[ReceiptOut]:
|
||||
"""新增回款。批次号自动生成;发货批次须与本回款同属一个业务;业务须执行中。"""
|
||||
return ok(
|
||||
receipt_service.create_receipt(session, payload, operator=current_user, meta=meta),
|
||||
message="回款已登记",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/{receipt_id}", response_model=ApiResponse[ReceiptOut], summary="回款详情")
|
||||
def get_receipt(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
receipt_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[ReceiptOut]:
|
||||
"""回款详情(含回款天数派生值,未指定发货批次时为空)。"""
|
||||
return ok(receipt_service.get_detail(session, receipt_id))
|
||||
|
||||
|
||||
@router.put("/{receipt_id}", response_model=ApiResponse[ReceiptOut], summary="编辑回款")
|
||||
def update_receipt(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
receipt_id: Annotated[int, Path(ge=1)],
|
||||
payload: ReceiptUpdateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[ReceiptOut]:
|
||||
"""编辑回款(全量替换并重算合计)。已核算回款禁止修改;发货批次重新校验同业务。"""
|
||||
return ok(
|
||||
receipt_service.update_receipt(
|
||||
session, receipt_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{receipt_id}", response_model=ApiResponse[None], summary="删除回款")
|
||||
def delete_receipt(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
receipt_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""删除回款。已核算回款禁止删除;业务已完成或已终止时禁删。"""
|
||||
receipt_service.delete_receipt(session, receipt_id, operator=current_user, meta=meta)
|
||||
return ok(message="回款已删除")
|
||||
@@ -0,0 +1,89 @@
|
||||
"""发货管理接口(需求 2.2.2)。
|
||||
|
||||
校验规则(状态门槛、行金额固化、双重汇总回写、删除保护)见
|
||||
`shipment_service` 模块 docstring;业务数据属业务操作,登录即可访问。
|
||||
"""
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Query
|
||||
|
||||
from app.api.deps import DbSession, RequestMetaDep, get_current_user
|
||||
from app.core.response import ApiResponse, PageResult, ok
|
||||
from app.models import User
|
||||
from app.schemas.shipment import (
|
||||
ShipmentCreateIn,
|
||||
ShipmentDetailOut,
|
||||
ShipmentOut,
|
||||
ShipmentQuery,
|
||||
ShipmentUpdateIn,
|
||||
)
|
||||
from app.services import shipment_service
|
||||
|
||||
# 基础数据是业务操作:登录即可,不要求管理员(区别于系统管理的 AdminUser)
|
||||
CurrentUser = Annotated[User, Depends(get_current_user)]
|
||||
|
||||
router = APIRouter(prefix="/shipments", tags=["发货管理"])
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PageResult[ShipmentOut]], summary="发货单列表")
|
||||
def list_shipments(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
query: Annotated[ShipmentQuery, Query()],
|
||||
) -> ApiResponse[PageResult[ShipmentOut]]:
|
||||
"""分页查询发货单(附业务编号),可按业务/发货日期范围筛选。"""
|
||||
return ok(shipment_service.list_shipments(session, query))
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[ShipmentOut], summary="创建发货单")
|
||||
def create_shipment(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
payload: ShipmentCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[ShipmentOut]:
|
||||
"""创建发货单(明细 ≥1)。业务须处于执行中;锁业务行后生成 SH 编号。"""
|
||||
return ok(
|
||||
shipment_service.create_shipment(session, payload, operator=current_user, meta=meta),
|
||||
message="发货单已创建",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/{shipment_id}", response_model=ApiResponse[ShipmentDetailOut], summary="发货单详情")
|
||||
def get_shipment(
|
||||
session: DbSession,
|
||||
_: CurrentUser,
|
||||
shipment_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[ShipmentDetailOut]:
|
||||
"""发货单详情,附产品明细行,供编辑抽屉一次回显。"""
|
||||
return ok(shipment_service.get_detail(session, shipment_id))
|
||||
|
||||
|
||||
@router.put("/{shipment_id}", response_model=ApiResponse[ShipmentOut], summary="编辑发货单")
|
||||
def update_shipment(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
shipment_id: Annotated[int, Path(ge=1)],
|
||||
payload: ShipmentUpdateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[ShipmentOut]:
|
||||
"""编辑发货单(明细全量替换并重算汇总)。终态业务的发货单禁改。"""
|
||||
return ok(
|
||||
shipment_service.update_shipment(
|
||||
session, shipment_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{shipment_id}", response_model=ApiResponse[None], summary="删除发货单")
|
||||
def delete_shipment(
|
||||
session: DbSession,
|
||||
current_user: CurrentUser,
|
||||
shipment_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""删除发货单(连带明细行并回写业务汇总)。被回款批次指定时禁删。"""
|
||||
shipment_service.delete_shipment(session, shipment_id, operator=current_user, meta=meta)
|
||||
return ok(message="发货单已删除")
|
||||
@@ -0,0 +1,67 @@
|
||||
"""审批管理接口(2026-10-15 复核审批补充需求)。
|
||||
|
||||
准入:admin/财务/领导可见(营销后勤暂不可见——权限清单待澄清 #6,
|
||||
答复后放开为「提交人可见本人单据」)。节点级准入由 service 按单据
|
||||
状态二次校验(status=1 仅财务、status=2 仅领导,admin 不代办)。
|
||||
提单不经本模块:由业务写路径(创建/编辑带二次分配方案)自动触发。
|
||||
"""
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Query
|
||||
|
||||
from app.api.deps import DbSession, RequestMetaDep, require_roles
|
||||
from app.core.constants import ROLE_ADMIN, ROLE_FINANCE, ROLE_LEADER
|
||||
from app.core.response import ApiResponse, PageResult, ok
|
||||
from app.models import User
|
||||
from app.schemas.approval import (
|
||||
ApprovalActionIn,
|
||||
ApprovalOrderDetailOut,
|
||||
ApprovalOrderOut,
|
||||
ApprovalQuery,
|
||||
)
|
||||
from app.services import approval_service
|
||||
|
||||
router = APIRouter(prefix="/approvals", tags=["系统管理 · 审批管理"])
|
||||
|
||||
# 模块准入:可见集合(节点准入在 service 层按状态二次判定)
|
||||
_ApprovalUser = Annotated[User, Depends(require_roles(ROLE_ADMIN, ROLE_FINANCE, ROLE_LEADER))]
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PageResult[ApprovalOrderOut]], summary="审批单列表")
|
||||
def list_orders(
|
||||
session: DbSession,
|
||||
_: _ApprovalUser,
|
||||
query: Annotated[ApprovalQuery, Query()],
|
||||
) -> ApiResponse[PageResult[ApprovalOrderOut]]:
|
||||
"""分页查询审批单。"""
|
||||
return ok(approval_service.list_orders(session, query))
|
||||
|
||||
|
||||
@router.get("/{order_id}", response_model=ApiResponse[ApprovalOrderDetailOut], summary="审批详情")
|
||||
def get_order(
|
||||
session: DbSession,
|
||||
_: _ApprovalUser,
|
||||
order_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[ApprovalOrderDetailOut]:
|
||||
"""审批单详情(含节点时间线)。"""
|
||||
return ok(approval_service.get_order(session, order_id))
|
||||
|
||||
|
||||
@router.post(
|
||||
"/{order_id}/action",
|
||||
response_model=ApiResponse[ApprovalOrderDetailOut],
|
||||
summary="节点动作(通过/驳回)",
|
||||
)
|
||||
def act_on_order(
|
||||
payload: ApprovalActionIn,
|
||||
session: DbSession,
|
||||
current_user: _ApprovalUser,
|
||||
meta: RequestMetaDep,
|
||||
order_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[ApprovalOrderDetailOut]:
|
||||
"""财务复核 / 领导审核;一驳全驳,驳回须填意见。"""
|
||||
return ok(
|
||||
approval_service.act(session, order_id, payload, operator=current_user, meta=meta),
|
||||
message="已提交",
|
||||
)
|
||||
@@ -0,0 +1,122 @@
|
||||
"""业务岗位角色管理接口(需求 #28:岗位可扩展 + 绑定公式模板)。
|
||||
|
||||
保护规则(内置岗位禁删禁停、编码不可改、模板须在注册表内)见
|
||||
`business_role_service` 模块 docstring。前端会禁用相应按钮,但**后端校验是唯一防线**。
|
||||
|
||||
全部要求管理员权限;写操作经 `RequestMetaDep` 带入请求元信息由 service
|
||||
层写入操作日志。
|
||||
"""
|
||||
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Path, Query
|
||||
|
||||
from app.api.deps import AdminUser, DbSession, RequestMetaDep
|
||||
from app.core.response import ApiResponse, PageResult, ok
|
||||
from app.schemas.business_role import (
|
||||
BusinessRoleCreateIn,
|
||||
BusinessRoleOut,
|
||||
BusinessRoleQuery,
|
||||
BusinessRoleStatusIn,
|
||||
BusinessRoleUpdateIn,
|
||||
TemplateOptionOut,
|
||||
)
|
||||
from app.services import business_role_service
|
||||
|
||||
router = APIRouter(prefix="/business-roles", tags=["系统管理 · 岗位角色"])
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[PageResult[BusinessRoleOut]], summary="岗位列表")
|
||||
def list_roles(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
query: Annotated[BusinessRoleQuery, Query()],
|
||||
) -> ApiResponse[PageResult[BusinessRoleOut]]:
|
||||
"""分页查询业务岗位角色(含停用)。"""
|
||||
return ok(business_role_service.list_roles(session, query))
|
||||
|
||||
|
||||
@router.post("", response_model=ApiResponse[BusinessRoleOut], summary="新增岗位")
|
||||
def create_role(
|
||||
session: DbSession,
|
||||
current_user: AdminUser,
|
||||
payload: BusinessRoleCreateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[BusinessRoleOut]:
|
||||
"""新增岗位。编码全局唯一、创建后不可修改;模板须在注册表内;新岗位默认启用。"""
|
||||
return ok(
|
||||
business_role_service.create_role(session, payload, operator=current_user, meta=meta),
|
||||
message="岗位已创建",
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/meta/templates",
|
||||
response_model=ApiResponse[list[TemplateOptionOut]],
|
||||
summary="公式模板下拉",
|
||||
)
|
||||
def list_template_options(session: DbSession, _: AdminUser) -> ApiResponse[list[TemplateOptionOut]]:
|
||||
"""取公式模板下拉(含声明参数,供岗位表单展示)。
|
||||
|
||||
定义在 `/{role_id}` 之前:静态路径优先,避免 "meta" 被当作路径参数解析。
|
||||
"""
|
||||
return ok(business_role_service.list_template_options())
|
||||
|
||||
|
||||
@router.get("/{role_id}", response_model=ApiResponse[BusinessRoleOut], summary="岗位详情")
|
||||
def get_role(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
role_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[BusinessRoleOut]:
|
||||
"""按主键查询岗位详情。"""
|
||||
return ok(business_role_service.get_role(session, role_id))
|
||||
|
||||
|
||||
@router.put("/{role_id}", response_model=ApiResponse[BusinessRoleOut], summary="编辑岗位")
|
||||
def update_role(
|
||||
session: DbSession,
|
||||
current_user: AdminUser,
|
||||
role_id: Annotated[int, Path(ge=1)],
|
||||
payload: BusinessRoleUpdateIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[BusinessRoleOut]:
|
||||
"""编辑岗位名称/模板/说明/排序。
|
||||
|
||||
**不含 role_code** —— 编码是参数维度值与模板绑定的锚点。
|
||||
"""
|
||||
return ok(
|
||||
business_role_service.update_role(
|
||||
session, role_id, payload, operator=current_user, meta=meta
|
||||
),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.put(
|
||||
"/{role_id}/status", response_model=ApiResponse[BusinessRoleOut], summary="启用/禁用岗位"
|
||||
)
|
||||
def set_status(
|
||||
session: DbSession,
|
||||
current_user: AdminUser,
|
||||
role_id: Annotated[int, Path(ge=1)],
|
||||
payload: BusinessRoleStatusIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[BusinessRoleOut]:
|
||||
"""启用或禁用岗位。内置岗位不可停用。"""
|
||||
result = business_role_service.set_status(
|
||||
session, role_id, payload.status, operator=current_user, meta=meta
|
||||
)
|
||||
return ok(result, message="已启用" if payload.status == 1 else "已禁用")
|
||||
|
||||
|
||||
@router.delete("/{role_id}", response_model=ApiResponse[None], summary="删除岗位")
|
||||
def delete_role(
|
||||
session: DbSession,
|
||||
current_user: AdminUser,
|
||||
role_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""删除岗位。内置岗位不可删除;有人员引用的岗位不可删除。"""
|
||||
business_role_service.delete_role(session, role_id, operator=current_user, meta=meta)
|
||||
return ok(message="岗位已删除")
|
||||
@@ -0,0 +1,147 @@
|
||||
"""计提参数管理接口(需求 #28:参数配置化 + 版本管理 + 留痕)。
|
||||
|
||||
全部要求管理员权限(开放问题 #5 的当前默认,后续可放宽只读);
|
||||
写操作(提交/撤回)经 `RequestMetaDep` 带入请求元信息写入操作日志,
|
||||
变更批次本身另行留痕(变更人/时间/项/旧值/新值/生效日期)——双保险。
|
||||
导出为文件流(非统一信封),前端以 blob 接收。
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Path, Query
|
||||
from fastapi.responses import StreamingResponse
|
||||
|
||||
from app.api.deps import AdminUser, DbSession, RequestMetaDep
|
||||
from app.core.response import ApiResponse, PageResult, ok
|
||||
from app.schemas.param import (
|
||||
ParamBatchDetailOut,
|
||||
ParamBatchOut,
|
||||
ParamBatchQuery,
|
||||
ParamCatalogItemOut,
|
||||
ParamChangeBatchOut,
|
||||
ParamChangeIn,
|
||||
ParamDiffOut,
|
||||
ParamHistoryOut,
|
||||
ParamHistoryQuery,
|
||||
ParamPreviewIn,
|
||||
ParamPreviewOut,
|
||||
)
|
||||
from app.services import param_service
|
||||
|
||||
router = APIRouter(prefix="/params", tags=["系统管理 · 计提参数"])
|
||||
|
||||
|
||||
@router.get(
|
||||
"", response_model=ApiResponse[list[ParamCatalogItemOut]], summary="参数目录(含当前生效值)"
|
||||
)
|
||||
def get_catalog(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
as_of: Annotated[date | None, Query(description="业务日期,默认今日")] = None,
|
||||
) -> ApiResponse[list[ParamCatalogItemOut]]:
|
||||
"""全部启用参数的定义元数据与截至 asOf 的生效值(前端按分组展示)。"""
|
||||
return ok(param_service.get_catalog(session, as_of=as_of))
|
||||
|
||||
|
||||
@router.post("/changes", response_model=ApiResponse[ParamChangeBatchOut], summary="提交变更批次")
|
||||
def submit_change(
|
||||
session: DbSession,
|
||||
current_user: AdminUser,
|
||||
payload: ParamChangeIn,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[ParamChangeBatchOut]:
|
||||
"""提交一批参数变更(1~50 项),返回版本号;立即生效或指定日期生效。"""
|
||||
return ok(
|
||||
param_service.submit_change(session, payload, operator=current_user, meta=meta),
|
||||
message="变更已提交",
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/changes", response_model=ApiResponse[PageResult[ParamBatchOut]], summary="变更记录分页"
|
||||
)
|
||||
def list_changes(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
query: Annotated[ParamBatchQuery, Query()],
|
||||
) -> ApiResponse[PageResult[ParamBatchOut]]:
|
||||
"""按生效日期区间分页查询变更批次(创建时间倒序)。"""
|
||||
return ok(param_service.list_batches(session, query))
|
||||
|
||||
|
||||
@router.get(
|
||||
"/changes/{batch_id}", response_model=ApiResponse[ParamBatchDetailOut], summary="批次明细"
|
||||
)
|
||||
def get_batch(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
batch_id: Annotated[int, Path(ge=1)],
|
||||
) -> ApiResponse[ParamBatchDetailOut]:
|
||||
"""批次头 + 逐项旧值 → 新值。"""
|
||||
return ok(param_service.get_batch_detail(session, batch_id))
|
||||
|
||||
|
||||
@router.delete("/changes/{batch_id}", response_model=ApiResponse[None], summary="撤回未生效批次")
|
||||
def withdraw_batch(
|
||||
session: DbSession,
|
||||
current_user: AdminUser,
|
||||
batch_id: Annotated[int, Path(ge=1)],
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[None]:
|
||||
"""撤回尚未生效的批次;已生效批次不可撤回。"""
|
||||
param_service.withdraw_batch(session, batch_id, operator=current_user, meta=meta)
|
||||
return ok(message="批次已撤回")
|
||||
|
||||
|
||||
@router.get("/compare", response_model=ApiResponse[list[ParamDiffOut]], summary="两日期快照对比")
|
||||
def compare(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
from_date: Annotated[date, Query(description="起始业务日期(含)")],
|
||||
to_date: Annotated[date, Query(description="截止业务日期(含)")],
|
||||
) -> ApiResponse[list[ParamDiffOut]]:
|
||||
"""两个业务日期的全量参数快照逐项对比,changed 标记是否变化。"""
|
||||
return ok(param_service.compare(session, from_date=from_date, to_date=to_date))
|
||||
|
||||
|
||||
@router.get("/export", summary="导出变更记录 Excel")
|
||||
def export_changes(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
start_date: Annotated[date | None, Query(description="生效日期起(含)")] = None,
|
||||
end_date: Annotated[date | None, Query(description="生效日期止(含)")] = None,
|
||||
) -> StreamingResponse:
|
||||
"""变更记录导出为 Excel 文件流(非统一信封,前端以 blob 接收)。"""
|
||||
content = param_service.export_changes(session, start_date=start_date, end_date=end_date)
|
||||
filename = f"param_changes_{date.today():%Y%m%d}.xlsx"
|
||||
return StreamingResponse(
|
||||
iter([content]),
|
||||
media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
||||
headers={"Content-Disposition": f'attachment; filename="{filename}"'},
|
||||
)
|
||||
|
||||
|
||||
@router.post("/preview", response_model=ApiResponse[ParamPreviewOut], summary="计算预览")
|
||||
def preview(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
payload: ParamPreviewIn,
|
||||
) -> ApiResponse[ParamPreviewOut]:
|
||||
"""输入业务场景(岗位/产品/发货/回款/金额),按回款到账日取参数实时试算。"""
|
||||
return ok(param_service.preview(session, payload))
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{param_code}/history",
|
||||
response_model=ApiResponse[PageResult[ParamHistoryOut]],
|
||||
summary="参数版本历史",
|
||||
)
|
||||
def get_history(
|
||||
session: DbSession,
|
||||
_: AdminUser,
|
||||
param_code: Annotated[str, Path(max_length=64)],
|
||||
query: Annotated[ParamHistoryQuery, Query()],
|
||||
) -> ApiResponse[PageResult[ParamHistoryOut]]:
|
||||
"""单参数的版本历史(含版本号、变更人与旧值 → 新值),最新在前。"""
|
||||
return ok(param_service.get_history(session, param_code, query))
|
||||
@@ -0,0 +1,75 @@
|
||||
"""系统设置接口(公司信息)。
|
||||
|
||||
`GET /public` 与 `GET /logo/public` **无鉴权**:登录页渲染公司名/logo 时
|
||||
尚无令牌。响应经 `SettingPublicOut` 白名单收敛(见 schemas/setting.py),
|
||||
仅暴露两个非敏感展示字段。
|
||||
|
||||
`/logo/public` 返回文件流而非统一信封——与参数导出同一例外口径
|
||||
(二进制响应套 JSON 信封无意义)。
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Response, UploadFile
|
||||
from fastapi.responses import FileResponse
|
||||
|
||||
from app.api.deps import AdminUser, DbSession, RequestMetaDep
|
||||
from app.core.response import ApiResponse, ok
|
||||
from app.schemas.setting import SettingOut, SettingPublicOut, SettingUpdateIn
|
||||
from app.services import system_setting_service as service
|
||||
|
||||
router = APIRouter(prefix="/settings", tags=["系统管理 · 公司信息"])
|
||||
|
||||
_LOGO_MEDIA_TYPE = {"png": "image/png", "jpg": "image/jpeg"}
|
||||
|
||||
|
||||
@router.get("", response_model=ApiResponse[SettingOut], summary="公司信息")
|
||||
def get_settings(session: DbSession, _: AdminUser) -> ApiResponse[SettingOut]:
|
||||
"""取公司信息(管理端)。"""
|
||||
return ok(service.to_out(service.get_setting(session)))
|
||||
|
||||
|
||||
@router.put("", response_model=ApiResponse[SettingOut], summary="更新公司名称")
|
||||
def update_settings(
|
||||
payload: SettingUpdateIn,
|
||||
session: DbSession,
|
||||
current_user: AdminUser,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[SettingOut]:
|
||||
"""更新公司名称(审计留痕)。"""
|
||||
return ok(
|
||||
service.update_company(session, payload, operator=current_user, meta=meta),
|
||||
message="已保存",
|
||||
)
|
||||
|
||||
|
||||
@router.post("/logo", response_model=ApiResponse[SettingOut], summary="上传 logo")
|
||||
async def upload_logo(
|
||||
file: UploadFile,
|
||||
session: DbSession,
|
||||
current_user: AdminUser,
|
||||
meta: RequestMetaDep,
|
||||
) -> ApiResponse[SettingOut]:
|
||||
"""上传公司 logo(png/jpg ≤2MB;固定名覆盖,旧扩展名文件清理)。"""
|
||||
content = await file.read()
|
||||
ext = (file.filename or "").rsplit(".", 1)[-1]
|
||||
return ok(
|
||||
service.save_logo(session, content, ext, operator=current_user, meta=meta),
|
||||
message="logo 已更新",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/public", response_model=ApiResponse[SettingPublicOut], summary="公司信息(匿名)")
|
||||
def get_settings_public(session: DbSession, response: Response) -> ApiResponse[SettingPublicOut]:
|
||||
"""公司信息(登录页消费,无鉴权)。短缓存减轻匿名端点压力。"""
|
||||
response.headers["Cache-Control"] = "public, max-age=300"
|
||||
return ok(service.to_public_out(service.get_setting(session)))
|
||||
|
||||
|
||||
@router.get("/logo/public", summary="logo 图片(匿名)")
|
||||
def get_logo_public(session: DbSession) -> FileResponse:
|
||||
"""logo 文件流(无鉴权)。no-cache:图片替换后由版本参数破缓存兜底。"""
|
||||
path, ext = service.read_logo(session)
|
||||
return FileResponse(
|
||||
path,
|
||||
media_type=_LOGO_MEDIA_TYPE.get(ext, "application/octet-stream"),
|
||||
headers={"Cache-Control": "no-cache"},
|
||||
)
|
||||
@@ -92,6 +92,15 @@ class Settings(BaseSettings):
|
||||
auth = f":{self.redis_password}@" if self.redis_password else ""
|
||||
return f"redis://{auth}{self.redis_host}:{self.redis_port}/{self.redis_db}"
|
||||
|
||||
@property
|
||||
def upload_dir(self) -> Path:
|
||||
"""上传文件根目录(公司 logo 等):backend/uploads/。
|
||||
|
||||
不叫 static/ 是刻意的:静态目录将来可能整体交给前端构建产物,
|
||||
运行期上传物必须与之隔离;该目录不入版本库(.gitignore)。
|
||||
"""
|
||||
return BACKEND_DIR / "uploads"
|
||||
|
||||
|
||||
@lru_cache
|
||||
def get_settings() -> Settings:
|
||||
|
||||
@@ -25,6 +25,19 @@ TOKEN_TYPE_BEARER = "Bearer"
|
||||
# ===== 角色编码(与 db/migration 初始化数据保持一致)=====
|
||||
ROLE_ADMIN = "admin"
|
||||
ROLE_USER = "user"
|
||||
# 2026-10-15 复核审批补充需求新增职能登录角色:营销后勤(提交+录入)、
|
||||
# 财务(复核)、领导(审核)。roles 表无 is_builtin 列,内置保护用代码
|
||||
# 白名单判定(role_service 两处内置校验改查此集合);
|
||||
# permissions/role_permissions 细粒度激活待业务权限清单(待澄清 #6)。
|
||||
ROLE_MARKETING_OPS = "marketing_ops"
|
||||
ROLE_FINANCE = "finance"
|
||||
ROLE_LEADER = "leader"
|
||||
BUILTIN_ROLE_CODES = {
|
||||
ROLE_ADMIN,
|
||||
ROLE_MARKETING_OPS,
|
||||
ROLE_FINANCE,
|
||||
ROLE_LEADER,
|
||||
}
|
||||
|
||||
# ===== 密码策略 =====
|
||||
# bcrypt 5.0 起对超过 72 字节的密码由「静默截断」改为「抛 ValueError」,
|
||||
@@ -37,10 +50,49 @@ PASSWORD_MAX_BYTES = 72
|
||||
CAPTCHA_CHARSET = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ"
|
||||
CAPTCHA_LENGTH = 4
|
||||
|
||||
# ===== 业务岗位编码(与 db/migration 种子一致,business_roles.role_code)=====
|
||||
BUSINESS_ROLE_SALESPERSON = "salesperson"
|
||||
BUSINESS_ROLE_SALES_MANAGER = "sales_manager"
|
||||
BUSINESS_ROLE_INFO_OFFICER = "info_officer"
|
||||
|
||||
# ===== 产品类别码(与 param_values.dimension_value 口径一致)=====
|
||||
PRODUCT_CATEGORY_MUNICIPAL_WATER = "municipal_water"
|
||||
PRODUCT_CATEGORY_RAIL_TRANSIT = "rail_transit"
|
||||
PRODUCT_CATEGORIES = {PRODUCT_CATEGORY_MUNICIPAL_WATER, PRODUCT_CATEGORY_RAIL_TRANSIT}
|
||||
|
||||
# ===== 客户分类码(customers.customer_type,计提规则匹配锚点)=====
|
||||
CUSTOMER_TYPE_PERSONAL = "personal"
|
||||
CUSTOMER_TYPE_MANAGER_PERSONAL = "manager_personal"
|
||||
CUSTOMER_TYPE_ENTERPRISE = "enterprise"
|
||||
CUSTOMER_TYPES = {
|
||||
CUSTOMER_TYPE_PERSONAL,
|
||||
CUSTOMER_TYPE_MANAGER_PERSONAL,
|
||||
CUSTOMER_TYPE_ENTERPRISE,
|
||||
}
|
||||
|
||||
# ===== 操作日志词表(operation_logs 的 module / action 取值)=====
|
||||
# 集中定义避免各处硬编码导致日志值漂移;前端筛选下拉项与此保持一致
|
||||
MODULE_USER = "用户管理"
|
||||
MODULE_ROLE = "角色管理"
|
||||
MODULE_BUSINESS_ROLE = "岗位角色"
|
||||
MODULE_PARAM = "计提参数"
|
||||
MODULE_PERSONNEL = "人员管理"
|
||||
MODULE_PRODUCT = "产品管理"
|
||||
MODULE_CUSTOMER = "客户管理"
|
||||
MODULE_BUSINESS = "业务管理"
|
||||
MODULE_SHIPMENT = "发货管理"
|
||||
MODULE_RECEIPT = "回款管理"
|
||||
MODULE_RATING = "客户评级"
|
||||
MODULE_SYSTEM_SETTINGS = "系统设置"
|
||||
MODULE_APPROVAL = "审批管理"
|
||||
|
||||
# ===== 单据编号前缀({前缀}{YYYYMMDD}-{当日4位序号},序号按自然日重置)=====
|
||||
# 一期为代码常量(业务未提出配置诉求);如需可配置,走 M1 参数体系新增参数组
|
||||
NO_PREFIX_BUSINESS = "YW"
|
||||
NO_PREFIX_SHIPMENT = "SH"
|
||||
NO_PREFIX_RECEIPT = "HK"
|
||||
NO_PREFIX_PARAM = "P"
|
||||
NO_PREFIX_APPROVAL = "AP"
|
||||
|
||||
ACTION_CREATE = "新增"
|
||||
ACTION_UPDATE = "修改"
|
||||
@@ -48,3 +100,5 @@ ACTION_DELETE = "删除"
|
||||
ACTION_RESET_PASSWORD = "重置密码"
|
||||
ACTION_ENABLE = "启用"
|
||||
ACTION_DISABLE = "禁用"
|
||||
ACTION_APPROVE = "审批通过"
|
||||
ACTION_REJECT = "审批驳回"
|
||||
@@ -0,0 +1,18 @@
|
||||
"""数据库完整性错误的统一识别与翻译口径。
|
||||
|
||||
判断依据:pymysql 原生异常 ``orig.args`` 首位是 MySQL 错误码 —— 只有
|
||||
1062(ER_DUP_ENTRY,唯一键冲突)是「已存在」语义,可安全转 400 业务
|
||||
提示;其余完整性错误(外键 RESTRICT、数据截断等)原样上抛,由全局
|
||||
异常处理器收敛 500(程序缺陷或数据异常,均不应伪装成用户错误)。
|
||||
"""
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
# MySQL 唯一键冲突错误码(pymysql 原生异常 args 首位)
|
||||
ERR_DUP_ENTRY = 1062
|
||||
|
||||
|
||||
def is_duplicate_entry(exc: IntegrityError) -> bool:
|
||||
"""判断 IntegrityError 是否为 MySQL 唯一键冲突(错误码 1062)。"""
|
||||
args = getattr(exc.orig, "args", ())
|
||||
return bool(args) and args[0] == ERR_DUP_ENTRY
|
||||
@@ -12,6 +12,7 @@ import logging
|
||||
from fastapi import FastAPI, Request
|
||||
from fastapi.exceptions import RequestValidationError
|
||||
from fastapi.responses import JSONResponse
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from starlette.exceptions import HTTPException as StarletteHTTPException
|
||||
|
||||
from app.core.constants import CODE_BAD_REQUEST, CODE_SERVER_ERROR
|
||||
@@ -60,6 +61,19 @@ async def handle_http_exception(_: Request, exc: StarletteHTTPException) -> JSON
|
||||
return _build_response(exc.status_code, message)
|
||||
|
||||
|
||||
async def handle_integrity_error(_: Request, exc: IntegrityError) -> JSONResponse:
|
||||
"""完整性错误全局兜底为 400。
|
||||
|
||||
service 层已判别的 1062/引用冲突会自行翻译为业务提示,不会走到这里;
|
||||
本 handler 拦截的是「新增父表后某 service 漏补引用保护」一类的遗漏
|
||||
(e2e 撞见一个补一个的模式无法保证全覆盖):FK RESTRICT 等数据完整性
|
||||
冲突对用户表现为「这行数据被别处引用/冲突」,转 400 比 500 更贴近事实。
|
||||
完整异常记录日志供排查;不在此处 rollback —— 会话由请求级依赖统一关闭。
|
||||
"""
|
||||
logger.error("数据库完整性冲突(未在 service 层翻译)", exc_info=exc)
|
||||
return _build_response(CODE_BAD_REQUEST, "数据完整性冲突,操作被拒绝")
|
||||
|
||||
|
||||
async def handle_unexpected_exception(_: Request, exc: Exception) -> JSONResponse:
|
||||
"""兜底处理未预期异常。
|
||||
|
||||
@@ -77,4 +91,5 @@ def register_exception_handlers(app: FastAPI) -> None:
|
||||
app.add_exception_handler(AppException, handle_app_exception) # type: ignore[arg-type]
|
||||
app.add_exception_handler(RequestValidationError, handle_validation_error) # type: ignore[arg-type]
|
||||
app.add_exception_handler(StarletteHTTPException, handle_http_exception) # type: ignore[arg-type]
|
||||
app.add_exception_handler(IntegrityError, handle_integrity_error) # type: ignore[arg-type]
|
||||
app.add_exception_handler(Exception, handle_unexpected_exception)
|
||||
@@ -29,8 +29,8 @@ _SENSITIVE_RULES: tuple[tuple[re.Pattern[str], str], ...] = (
|
||||
),
|
||||
# Authorization: Bearer xxx
|
||||
(re.compile(r"(Bearer\s+)[A-Za-z0-9\-._~+/]+=*"), r"\1***"),
|
||||
# 手机号:138****8888
|
||||
(re.compile(r"\b(1[3-9]\d)\d{4}(\d{4})\b"), r"\1****\2"),
|
||||
# 手机号:138****8888(兼容带空格/横线分隔的写法,如 138 0013 8000)
|
||||
(re.compile(r"\b(1[3-9]\d)[-\s]?(\d{4})[-\s]?(\d{4})\b"), r"\1****\3"),
|
||||
# 18 位身份证:保留前 6 位与后 4 位
|
||||
(re.compile(r"\b(\d{6})\d{8}(\d{3}[\dXx])\b"), r"\1********\2"),
|
||||
)
|
||||
|
||||
@@ -9,19 +9,51 @@
|
||||
`Base.metadata` 包含全部表,漏掉一张就会生成「删除该表」的迁移。
|
||||
"""
|
||||
|
||||
from app.models.approval import ApprovalOrder, ApprovalStep
|
||||
from app.models.base import Base, TimestampMixin
|
||||
from app.models.business import Business, BusinessItem, BusinessStatusLog, SecondaryAllocation
|
||||
from app.models.business_role import BusinessRole
|
||||
from app.models.customer import Customer, OwnershipChangeLog
|
||||
from app.models.login_log import LoginLog
|
||||
from app.models.operation_log import OperationLog
|
||||
from app.models.param import ParamChangeBatch, ParamDefinition, ParamValue
|
||||
from app.models.personnel import Personnel, PersonnelPlan, PersonnelRegion
|
||||
from app.models.product import Product
|
||||
from app.models.rating import CustomerRatingGrade
|
||||
from app.models.receipt import Receipt
|
||||
from app.models.role import Permission, Role, RolePermission
|
||||
from app.models.shipment import Shipment, ShipmentItem
|
||||
from app.models.system_setting import SystemSetting
|
||||
from app.models.user import User, UserRole
|
||||
|
||||
__all__ = [
|
||||
"ApprovalOrder",
|
||||
"ApprovalStep",
|
||||
"Base",
|
||||
"Business",
|
||||
"BusinessItem",
|
||||
"BusinessRole",
|
||||
"BusinessStatusLog",
|
||||
"Customer",
|
||||
"CustomerRatingGrade",
|
||||
"LoginLog",
|
||||
"OperationLog",
|
||||
"OwnershipChangeLog",
|
||||
"ParamChangeBatch",
|
||||
"ParamDefinition",
|
||||
"ParamValue",
|
||||
"Permission",
|
||||
"Personnel",
|
||||
"PersonnelPlan",
|
||||
"PersonnelRegion",
|
||||
"Product",
|
||||
"Receipt",
|
||||
"Role",
|
||||
"RolePermission",
|
||||
"SecondaryAllocation",
|
||||
"Shipment",
|
||||
"ShipmentItem",
|
||||
"SystemSetting",
|
||||
"TimestampMixin",
|
||||
"User",
|
||||
"UserRole",
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
"""审批模型:审批单与节点记录(2026-10-15 复核审批补充需求)。
|
||||
|
||||
三级链路:营销后勤提交 → 财务复核 → 领导审核。行为由参数体系开关驱动
|
||||
(`approval.*.enabled` BOOL):关闭=提交即生成「自动通过」节点留痕,
|
||||
留痕不断链(开发计划 3.2(三));开启=按节点人工审核,一驳全驳。
|
||||
|
||||
依赖说明:节点准入按登录角色编码判定(ROLE_FINANCE/ROLE_LEADER),
|
||||
不动 `permissions`/`role_permissions` 闲置表 —— 细粒度权限清单待业务方
|
||||
答复(待澄清 #6)后再激活。
|
||||
|
||||
ref_id 为**固化无外键**(同 business_status_logs 先例):order_type=2
|
||||
(月结预留)将指向 ④ 尚未落地的表,外键无法统一指向;单据删除保护由
|
||||
服务层承担(详见 approval_service)。
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import DateTime, ForeignKey, Index, String, text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import BIGINT_UNSIGNED, TINYINT_TYPE, Base, TimestampMixin, mysql_table_args
|
||||
|
||||
# 审批单状态(approval_orders.status;流转机见 approval_service)
|
||||
APPROVAL_STATUS_PENDING_FINANCE = 1 # 待财务复核
|
||||
APPROVAL_STATUS_PENDING_LEADER = 2 # 待领导审核
|
||||
APPROVAL_STATUS_APPROVED = 3 # 已通过(终态)
|
||||
APPROVAL_STATUS_REJECTED = 4 # 已驳回(终态)
|
||||
APPROVAL_STATUS_WITHDRAWN = 5 # 已撤回(被引用方重新提交时旧在途单注销)
|
||||
|
||||
# 节点(approval_steps.node;0 仅用于撤回留痕)
|
||||
APPROVAL_NODE_FINANCE = 1
|
||||
APPROVAL_NODE_LEADER = 2
|
||||
APPROVAL_NODE_WITHDRAW = 0
|
||||
APPROVAL_NODES = {
|
||||
APPROVAL_STATUS_PENDING_FINANCE: APPROVAL_NODE_FINANCE,
|
||||
APPROVAL_STATUS_PENDING_LEADER: APPROVAL_NODE_LEADER,
|
||||
}
|
||||
|
||||
# 动作(approval_steps.action)
|
||||
APPROVAL_ACTION_APPROVE = 1 # 人工通过
|
||||
APPROVAL_ACTION_REJECT = 2 # 人工驳回
|
||||
APPROVAL_ACTION_AUTO_APPROVE = 3 # 系统自动通过(开关关闭时逐节点留痕)
|
||||
APPROVAL_ACTION_WITHDRAW = 4 # 撤回(业务重新提交时旧在途单注销)
|
||||
|
||||
# 审批对象类型(approval_orders.order_type;2 为 ④ 月结预留)
|
||||
APPROVAL_TYPE_SECONDARY_ALLOCATION = 1
|
||||
APPROVAL_TYPE_MONTHLY_SETTLEMENT = 2
|
||||
|
||||
|
||||
class ApprovalOrder(Base, TimestampMixin):
|
||||
"""审批单:一张待审对象一条审批流(状态可流转,含 update_time)。"""
|
||||
|
||||
__tablename__ = "approval_orders"
|
||||
__table_args__ = mysql_table_args(
|
||||
"审批单表(营销后勤提交→财务复核→领导审核;开关关闭时自动通过留痕)",
|
||||
Index("idx_approval_orders_type_status", "order_type", "status"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
order_no: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
unique=True,
|
||||
comment="审批单号,自动生成 AP{YYYYMMDD}-{4位当日序号}",
|
||||
)
|
||||
order_type: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="审批对象类型:1二次分配方案 2月度结算(预留)"
|
||||
)
|
||||
ref_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
comment="引用对象ID(order_type=1 时为 businesses.id;固化无外键,删除保护由服务层承担)",
|
||||
)
|
||||
refer_no: Mapped[str] = mapped_column(
|
||||
String(32), nullable=False, comment="引用对象单号(冗余固化,列表页免联查)"
|
||||
)
|
||||
status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="1",
|
||||
comment="审批状态:1待财务复核 2待领导审核 3已通过 4已驳回 5已撤回",
|
||||
)
|
||||
submitter_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
comment="提交人ID(账号删除后置空)",
|
||||
)
|
||||
submitter_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="提交人用户名(冗余固化)"
|
||||
)
|
||||
|
||||
|
||||
class ApprovalStep(Base):
|
||||
"""审批节点记录表(append-only):每次动作只增不改,构成时间线。
|
||||
|
||||
不继承 TimestampMixin(留痕无更新语义,同 business_status_logs 先例)。
|
||||
"""
|
||||
|
||||
__tablename__ = "approval_steps"
|
||||
__table_args__ = mysql_table_args(
|
||||
"审批节点记录表(append-only;自动通过/撤回均有留痕)",
|
||||
Index("idx_approval_steps_order_id", "order_id"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
order_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("approval_orders.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
comment="审批单ID(approval_orders.id;单删记录随删)",
|
||||
)
|
||||
node: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="审批节点:0撤回留痕 1财务复核 2领导审核"
|
||||
)
|
||||
action: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="动作:1通过 2驳回 3自动通过 4撤回"
|
||||
)
|
||||
opinion: Mapped[str | None] = mapped_column(String(255), comment="审批意见(驳回时填写)")
|
||||
operator_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
comment="操作人ID(自动通过/系统动作置空)",
|
||||
)
|
||||
operator_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="操作人用户名(冗余固化;系统动作记「系统」)"
|
||||
)
|
||||
create_time: Mapped[datetime] = mapped_column(
|
||||
DateTime, nullable=False, server_default=text("CURRENT_TIMESTAMP"), comment="创建时间"
|
||||
)
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import DateTime, MetaData, text
|
||||
from sqlalchemy import DateTime, MetaData, String, text
|
||||
from sqlalchemy.dialects.mysql import BIGINT, TINYINT
|
||||
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
||||
|
||||
@@ -28,7 +28,14 @@ BIGINT_UNSIGNED = BIGINT(unsigned=True)
|
||||
# 状态类字段统一用 TINYINT(0/1 或少量枚举值)
|
||||
TINYINT_TYPE = TINYINT
|
||||
|
||||
__all__ = ["BIGINT_UNSIGNED", "TINYINT_TYPE", "Base", "TimestampMixin", "mysql_table_args"]
|
||||
__all__ = [
|
||||
"BIGINT_UNSIGNED",
|
||||
"TINYINT_TYPE",
|
||||
"Base",
|
||||
"TPlusSyncMixin",
|
||||
"TimestampMixin",
|
||||
"mysql_table_args",
|
||||
]
|
||||
|
||||
|
||||
class Base(DeclarativeBase):
|
||||
@@ -62,6 +69,30 @@ class TimestampMixin:
|
||||
)
|
||||
|
||||
|
||||
class TPlusSyncMixin:
|
||||
"""T+(用友)数据同步预留列,六张业务主表共用。
|
||||
|
||||
对照表 #26:T+ 对接的字段映射与幂等键语义未定(IT 牵头),故四列全部
|
||||
可空、不设唯一键 —— 键语义未定就锁死唯一约束,对接时大概率返工;
|
||||
source_no 先建普通索引承担查询与去重,IT 定键后以小迁移升级唯一约束。
|
||||
|
||||
同步守则(M4 同步模块必须遵守):同步只写 T+ 侧字段与本组列,
|
||||
**不覆盖人工维护字段**(岗位/工资标准/归属/客户分类/业务状态等,
|
||||
各表注释已标注)。同步频率:一周一次定时 + 手动触发(对照表 #10)。
|
||||
"""
|
||||
|
||||
source_no: Mapped[str | None] = mapped_column(
|
||||
String(64),
|
||||
index=True,
|
||||
comment="T+ 原始单据号(同步幂等去重锚点;唯一键待 IT 定键后升级)",
|
||||
)
|
||||
t_plus_id: Mapped[str | None] = mapped_column(String(64), comment="T+ 系统内部标识")
|
||||
sync_batch_no: Mapped[str | None] = mapped_column(
|
||||
String(32), comment="同步批次号(同步模块写入)"
|
||||
)
|
||||
synced_at: Mapped[datetime | None] = mapped_column(DateTime, comment="最近同步时间")
|
||||
|
||||
|
||||
def mysql_table_args(comment: str, *extra: object) -> tuple[object, ...]:
|
||||
"""构造 MySQL 表的公共参数,返回可直接赋给 `__table_args__` 的元组。
|
||||
|
||||
|
||||
@@ -0,0 +1,270 @@
|
||||
"""业务数据模型:业务单、产品明细与状态流转留痕。
|
||||
|
||||
- 汇总冗余列(total_* 五列)由服务层在明细/发货/回款增删改时**事务内单点
|
||||
重算**,禁手工直改 —— 列表页与 M3 起付判定直接读冗余列,避免每次 JOIN
|
||||
聚合;代价是所有写路径必须重算(business_service 统一收口)
|
||||
- 毛利润相关值(毛利润额/毛利润率/折算毛利润额)**不落库**:它们是
|
||||
sale_amount/cost_amount + 时点化阈值参数的派生值,落库会在成本调整或
|
||||
参数改版后漂移出「假快照」;M2 以只读毛利润视图实时计算(复用
|
||||
formula.profit_rate/converted_profit),M3 核算台账才是法定固化点
|
||||
- product_category 存在明细行级:混合业务按产品逐条计算(对照表 #14)
|
||||
- 运费仅记录展示,不计入毛利润口径(对照表 #2);协助营销人员一期核算
|
||||
不使用(对照表 #15 剔除协助 25% 分成),字段保留仅记录事实(需规 2.2.1)
|
||||
"""
|
||||
|
||||
from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import Date, DateTime, ForeignKey, Index, Numeric, String, text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import (
|
||||
BIGINT_UNSIGNED,
|
||||
TINYINT_TYPE,
|
||||
Base,
|
||||
TimestampMixin,
|
||||
TPlusSyncMixin,
|
||||
mysql_table_args,
|
||||
)
|
||||
|
||||
# 业务状态(businesses.status,流转规则见 business_service:终态不可变更)
|
||||
BUSINESS_STATUS_ACTIVE = 1
|
||||
BUSINESS_STATUS_DONE = 2
|
||||
BUSINESS_STATUS_TERMINATED = 3
|
||||
|
||||
|
||||
class SecondaryAllocation(Base, TimestampMixin):
|
||||
"""二次分配方案明细表(2026-10-15 补充需求「二次分配方案」)。
|
||||
|
||||
口径(AI_CONTEXT 待澄清 #1/#2 未答复前的边界):
|
||||
- 只出现在合同刚建立时;修改在首次月结前留痕放行,月结后只读(月结在 ④,
|
||||
终态门槛先行承担「修改不影响已结算月份」)
|
||||
- 分配比例**不要求合计 100%**:余额归属未定(澄清 #2),存储只落参与人
|
||||
与比例,响应以 hint 提示合计/余额,不做强制校验
|
||||
- T+ 无二次分配数据(2026-10-15 回馈):参与人全为系统内人工维护
|
||||
- **分摊计算不在本期**(澄清 #1 分配标的三种口径结果不同):④ 核算时按
|
||||
核算时刻读「当前生效行」做快照,天然隔离历史版本,故无版本表
|
||||
|
||||
personnel 外键 **RESTRICT**:被方案引用的人员禁删——分摊金额待定的记录
|
||||
不允许静默失联(silently deleted)导致回档无法人工查验;personnel_name
|
||||
冗余固化,人离职后方案回显仍有名。uk 锁 (business_id, personnel_id),
|
||||
同一合同的同一参与人仅一行,重复提交在服务层聚合。
|
||||
"""
|
||||
|
||||
__tablename__ = "business_secondary_allocations"
|
||||
__table_args__ = mysql_table_args(
|
||||
# 表/列注释避开「%」字符:SHOW CREATE TABLE 经驱动参数化转义为「%%」,
|
||||
# 会与 ORM 侧 comment 字面断言失配(全库既有注释同此惯例)
|
||||
"业务二次分配方案明细表(合同建立时录入;比例不要求合计满额,余额归属待澄清)",
|
||||
Index("idx_business_secondary_allocations_business_id", "business_id"),
|
||||
Index("idx_business_secondary_allocations_personnel_id", "personnel_id"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
business_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("businesses.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
comment="业务ID(businesses.id;业务删除随删)",
|
||||
)
|
||||
personnel_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("personnel.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="参与业务员ID(personnel.id;被方案引用禁删)",
|
||||
)
|
||||
personnel_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="参与业务员姓名(冗余固化,离职后回显有名)"
|
||||
)
|
||||
ratio: Mapped[Decimal] = mapped_column(
|
||||
Numeric(5, 2),
|
||||
nullable=False,
|
||||
comment="分摊比例(0-100 两位小数;不要求合计满额,余额归属待澄清#2)",
|
||||
)
|
||||
|
||||
|
||||
class Business(Base, TimestampMixin, TPlusSyncMixin):
|
||||
"""业务表(需求 2.2.1):业务编号自动生成,即报表 2.4.1 的「合同编号」。"""
|
||||
|
||||
__tablename__ = "businesses"
|
||||
__table_args__ = mysql_table_args(
|
||||
"业务表(业务编号自动生成;T+同步不覆盖业务状态)",
|
||||
Index("idx_businesses_customer_id", "customer_id"),
|
||||
Index("idx_businesses_owner_personnel_id", "owner_personnel_id"),
|
||||
Index("idx_businesses_status", "status"),
|
||||
Index("idx_businesses_business_date", "business_date"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
business_no: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
unique=True,
|
||||
comment="业务编号,自动生成 YW{YYYYMMDD}-{4位当日序号}(报表合同编号)",
|
||||
)
|
||||
customer_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("customers.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="客户ID(customers.id)",
|
||||
)
|
||||
business_date: Mapped[date | None] = mapped_column(Date, comment="业务日期(T+ 同步口径)")
|
||||
status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="1",
|
||||
comment="业务状态:1执行中 2已完成 3已终止(终态不可变更;T+同步不覆盖)",
|
||||
)
|
||||
owner_personnel_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("personnel.id", ondelete="RESTRICT"),
|
||||
comment="负责营销人员ID(核算归属锚点;NULL=待指定,M3 核算前置校验非空;变更留痕不回溯)",
|
||||
)
|
||||
assistant_personnel_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("personnel.id", ondelete="RESTRICT"),
|
||||
comment="协助营销人员ID(一期核算不使用,对照表 #15;仅记录事实)",
|
||||
)
|
||||
is_special: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="0",
|
||||
comment="特殊业务标记:1是 0否(公司参与等)",
|
||||
)
|
||||
special_note: Mapped[str | None] = mapped_column(String(255), comment="特殊业务说明")
|
||||
total_sale_amount: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
server_default="0",
|
||||
comment="销售额合计(明细行汇总冗余,服务层事务内维护,禁手工直改;不含运费口径)",
|
||||
)
|
||||
total_cost_amount: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
server_default="0",
|
||||
comment="成本合计(明细行汇总冗余,服务层事务内维护,禁手工直改)",
|
||||
)
|
||||
total_ship_amount: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
server_default="0",
|
||||
comment="发货金额合计(发货明细汇总冗余,服务层事务内维护,禁手工直改)",
|
||||
)
|
||||
total_received_amount: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
server_default="0",
|
||||
comment="回款合计(回款记录汇总冗余,服务层事务内维护;M3 起付判定直接消费)",
|
||||
)
|
||||
total_freight_amount: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
server_default="0",
|
||||
comment="运费合计(发货单汇总冗余,仅记录展示;不计入毛利润口径,对照表 #2)",
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="备注")
|
||||
|
||||
|
||||
class BusinessItem(Base, TimestampMixin):
|
||||
"""业务产品明细表(需求 2.2.1/2.2.4):毛利润的行级源数据。
|
||||
|
||||
product_id 可空=自由录入产品(配合「数据提取」一键入产品库);
|
||||
产品名称/规格冗余固化,防产品改名影响历史业务。
|
||||
sale_amount 由服务层按 数量×单价 计算固化,不信任前端传值。
|
||||
cost_amount 来源待 T+ 对接确认(可空,人工可录先行)。
|
||||
"""
|
||||
|
||||
__tablename__ = "business_items"
|
||||
__table_args__ = mysql_table_args(
|
||||
"业务产品明细表(毛利润行级源数据;指导价 T+同步不覆盖)",
|
||||
Index("idx_business_items_business_id", "business_id"),
|
||||
Index("idx_business_items_product_id", "product_id"),
|
||||
Index("idx_business_items_product_category", "product_category"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
business_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("businesses.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="业务ID(businesses.id)",
|
||||
)
|
||||
product_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("products.id", ondelete="RESTRICT"),
|
||||
comment="产品ID(products.id;NULL=自由录入,未入产品库)",
|
||||
)
|
||||
product_name: Mapped[str] = mapped_column(
|
||||
String(128), nullable=False, comment="产品名称(引用产品时冗余固化)"
|
||||
)
|
||||
spec_model: Mapped[str] = mapped_column(
|
||||
String(128),
|
||||
nullable=False,
|
||||
server_default="''",
|
||||
comment="规格型号(冗余固化;空串对齐 products 组合唯一键口径)",
|
||||
)
|
||||
unit: Mapped[str | None] = mapped_column(String(16), comment="计量单位")
|
||||
product_category: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
comment="产品类别(行级折算锚点,混合业务按产品逐条计算,对照表 #14;值域同 PRODUCT_CATEGORIES)",
|
||||
)
|
||||
quantity: Mapped[Decimal] = mapped_column(Numeric(14, 2), nullable=False, comment="数量(>0)")
|
||||
sale_price: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 4), comment="销售单价(元;T+ 同步或人工)"
|
||||
)
|
||||
sale_amount: Mapped[Decimal] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
nullable=False,
|
||||
comment="销售额 = 数量×销售单价(服务层计算固化;不含运费口径,毛利润率分母)",
|
||||
)
|
||||
cost_amount: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
comment="成本额(T+ 同步或人工录入,来源待 T+ 确认;毛利润额 = 销售额 − 成本额)",
|
||||
)
|
||||
guided_price: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 4), comment="指导价(人工录入;T+同步不覆盖,需规 2.2.1/2.2.4)"
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="备注")
|
||||
|
||||
|
||||
class BusinessStatusLog(Base):
|
||||
"""业务状态变更记录表(append-only,需求 2.2.1「支持状态变更记录」)。
|
||||
|
||||
不继承 TimestampMixin(留痕无更新语义);business_id 为无外键的固化 ID
|
||||
(businesses 建表在本表之后的迁移批次内 —— 实为同批,但留痕统一口径:
|
||||
被引用方删除后记录仍完整可读,删除保护由服务层检查承担)。
|
||||
首条记录在业务创建时写入(old=new=1 执行中),详情页时间线从创建起展示。
|
||||
"""
|
||||
|
||||
__tablename__ = "business_status_logs"
|
||||
__table_args__ = mysql_table_args(
|
||||
"业务状态变更记录表(append-only)",
|
||||
Index("idx_business_status_logs_business_id", "business_id"),
|
||||
Index("idx_business_status_logs_create_time", "create_time"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
business_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
comment="业务ID(固化,无外键;删除保护由服务层承担)",
|
||||
)
|
||||
old_status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="变更前状态(创建首条为 1)"
|
||||
)
|
||||
new_status: Mapped[int] = mapped_column(TINYINT_TYPE, nullable=False, comment="变更后状态")
|
||||
change_reason: Mapped[str | None] = mapped_column(String(255), comment="变更原因(终止时必填)")
|
||||
operator_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
comment="操作人ID(账号删除后置空)",
|
||||
)
|
||||
operator_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="操作人用户名(冗余固化)"
|
||||
)
|
||||
create_time: Mapped[datetime] = mapped_column(
|
||||
DateTime, nullable=False, server_default=text("CURRENT_TIMESTAMP"), comment="创建时间"
|
||||
)
|
||||
@@ -0,0 +1,46 @@
|
||||
"""业务岗位角色模型。
|
||||
|
||||
与系统登录角色(`roles`,权限维度)严格区分:本表是**业务岗位**维度,
|
||||
决定人员适用的计提公式模板与参数。需求 #28 要求岗位角色可增删、
|
||||
新增岗位时在系统设置中绑定公式与参数(无需改代码),故模板编码
|
||||
存于本表、公式实现留在代码内注册表(一期不引入规则引擎)。
|
||||
"""
|
||||
|
||||
from sqlalchemy import Integer, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import BIGINT_UNSIGNED, TINYINT_TYPE, Base, TimestampMixin, mysql_table_args
|
||||
|
||||
|
||||
class BusinessRole(Base, TimestampMixin):
|
||||
"""业务岗位角色表。内置三个岗位(营销员/营销经理/信息员)随迁移初始化。"""
|
||||
|
||||
__tablename__ = "business_roles"
|
||||
__table_args__ = mysql_table_args("业务岗位角色表(与登录角色roles区分,决定计提公式与参数)")
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
role_code: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
unique=True,
|
||||
comment="岗位编码:salesperson营销员 sales_manager营销经理 info_officer信息员,创建后不可修改",
|
||||
)
|
||||
role_name: Mapped[str] = mapped_column(String(64), nullable=False, comment="岗位名称")
|
||||
calc_template: Mapped[str] = mapped_column(
|
||||
String(32), nullable=False, comment="计提公式模板编码(以代码内模板注册表为准)"
|
||||
)
|
||||
description: Mapped[str | None] = mapped_column(String(255), comment="岗位说明")
|
||||
sort_order: Mapped[int] = mapped_column(
|
||||
Integer, nullable=False, server_default="0", comment="显示排序"
|
||||
)
|
||||
status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, server_default="1", comment="状态:1启用 0禁用"
|
||||
)
|
||||
is_builtin: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="0",
|
||||
comment="是否内置岗位:1内置(禁删禁停) 0自定义",
|
||||
)
|
||||
@@ -0,0 +1,121 @@
|
||||
"""客户模型:客户档案与归属变更留痕。
|
||||
|
||||
- 「公司名称 + 负责人」是业务唯一标识(需规 2.1.3);负责人是客户公司的
|
||||
负责人**人名**(字符串),不是系统内的营销人员 —— 系统内归属另用
|
||||
owner_personnel_id 外键表达,两者语义不同
|
||||
- 归属变更只改主表当前值 + 插一条留痕,**不回溯历史**(对照表 #19):
|
||||
历史核算结果在 M3 台账已固化,无需 effective_date 时点化设计
|
||||
- 留痕表(OwnershipChangeLog)对客户/业务/人员 ID 均为**无外键的冗余固化**:
|
||||
留痕是历史记录,被引用方被删除后记录仍须完整可读;RESTRICT 外键反而会
|
||||
把「删除客户」逼成 500。业务实体删除保护由服务层检查承担
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import DateTime, ForeignKey, Index, String, UniqueConstraint, text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import (
|
||||
BIGINT_UNSIGNED,
|
||||
TINYINT_TYPE,
|
||||
Base,
|
||||
TimestampMixin,
|
||||
TPlusSyncMixin,
|
||||
mysql_table_args,
|
||||
)
|
||||
|
||||
# 归属类型(ownership_change_logs.owner_type)
|
||||
OWNER_TYPE_CUSTOMER = 1
|
||||
OWNER_TYPE_BUSINESS = 2
|
||||
|
||||
|
||||
class Customer(Base, TimestampMixin, TPlusSyncMixin):
|
||||
"""客户表(需求 2.1.3)。customer_type 是计提规则匹配锚点(M3 消费)。"""
|
||||
|
||||
__tablename__ = "customers"
|
||||
__table_args__ = mysql_table_args(
|
||||
"客户表(公司名称+负责人为业务唯一标识;T+同步不覆盖客户分类)",
|
||||
UniqueConstraint("company_name", "owner_name", name="uk_customers_company_owner"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
company_name: Mapped[str] = mapped_column(String(128), nullable=False, comment="公司名称")
|
||||
owner_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="客户负责人姓名(客户公司负责人的人名,非系统人员)"
|
||||
)
|
||||
contact_person: Mapped[str | None] = mapped_column(String(64), comment="联系人")
|
||||
contact_phone: Mapped[str | None] = mapped_column(String(20), comment="联系电话")
|
||||
address: Mapped[str | None] = mapped_column(String(255), comment="地址")
|
||||
industry: Mapped[str | None] = mapped_column(String(64), comment="所属行业(自由文本)")
|
||||
customer_type: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
server_default="personal",
|
||||
index=True,
|
||||
comment="客户分类:personal个人户 manager_personal经理个人户 enterprise企业户(计提规则匹配锚点;T+同步不覆盖)",
|
||||
)
|
||||
owner_personnel_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("personnel.id", ondelete="RESTRICT"),
|
||||
index=True,
|
||||
comment="归属负责营销人员ID(手动修改不回溯历史,变更留痕见 ownership_change_logs)",
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="备注")
|
||||
|
||||
|
||||
class OwnershipChangeLog(Base):
|
||||
"""归属变更记录表(append-only,需求 2.1.3 + 对照表 #19)。
|
||||
|
||||
owner_type 区分客户归属/业务归属:1 → customer_id 非空,2 → business_id
|
||||
非空,由应用层校验(无外键,见模块 docstring 的固化论证)。
|
||||
前后值冗余固化(无外键):人员被删除后留痕仍可读。
|
||||
"""
|
||||
|
||||
__tablename__ = "ownership_change_logs"
|
||||
__table_args__ = mysql_table_args(
|
||||
"归属变更记录表(append-only;客户/业务归属变更留痕,不回溯历史)",
|
||||
Index("idx_ownership_change_logs_customer_id", "customer_id"),
|
||||
Index("idx_ownership_change_logs_business_id", "business_id"),
|
||||
Index("idx_ownership_change_logs_create_time", "create_time"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
owner_type: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="归属类型:1客户归属 2业务归属"
|
||||
)
|
||||
customer_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
comment="客户ID(固化,owner_type=1 时非空)",
|
||||
)
|
||||
business_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
comment="业务ID(固化,owner_type=2 时非空)",
|
||||
)
|
||||
old_owner_personnel_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED, comment="变更前负责营销人员ID(固化)"
|
||||
)
|
||||
new_owner_personnel_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED, comment="变更后负责营销人员ID(固化)"
|
||||
)
|
||||
old_assistant_personnel_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED, comment="变更前协助营销人员ID(固化,仅业务归属使用)"
|
||||
)
|
||||
new_assistant_personnel_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED, comment="变更后协助营销人员ID(固化,仅业务归属使用)"
|
||||
)
|
||||
change_reason: Mapped[str | None] = mapped_column(String(255), comment="变更原因")
|
||||
operator_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
comment="操作人ID(账号删除后置空)",
|
||||
)
|
||||
operator_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="操作人用户名(冗余固化)"
|
||||
)
|
||||
create_time: Mapped[datetime] = mapped_column(
|
||||
DateTime, nullable=False, server_default=text("CURRENT_TIMESTAMP"), comment="创建时间"
|
||||
)
|
||||
@@ -0,0 +1,159 @@
|
||||
"""计提参数模型:定义、变更批次与版本条目。
|
||||
|
||||
存储设计(M1 评审定稿):
|
||||
- 参数值按**生效日期时点化**存储(逐项版本条目,append-only),核算按业务
|
||||
日期回溯取值(对照表 #11:按回款到账日匹配参数版本),禁读「当前值」算历史
|
||||
- 「版本」由变更批次承载:一次保存 = 一个批次 = 一条变更记录;条目逐项留痕
|
||||
(旧值/新值),满足 #28 版本管理与留痕(需规 2.3.1 四)
|
||||
- 值一律为 Fraction 可解析字符串(如 "4/360",禁 0.011111),解析不经 float
|
||||
- **不设 (param_id, dimension_value, effective_date) 唯一键**:同日多次修正
|
||||
是合法留痕,解析取 (effective_date, id) 最新一条;唯一键会把同日二次变更
|
||||
逼成覆盖写、丢失中间值
|
||||
- 批次与条目均为 append-only(仅 create_time、无 update_time,同 login_logs
|
||||
先例):带 ON UPDATE 的列会让「未改也被刷新」造成留痕假象
|
||||
"""
|
||||
|
||||
from datetime import date, datetime
|
||||
|
||||
from sqlalchemy import Date, DateTime, ForeignKey, Index, Integer, String, text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import BIGINT_UNSIGNED, TINYINT_TYPE, Base, TimestampMixin, mysql_table_args
|
||||
|
||||
|
||||
class ParamDefinition(Base, TimestampMixin):
|
||||
"""计提参数定义表。目录元数据(类型/单位/维度/取值域),随迁移种子初始化。"""
|
||||
|
||||
__tablename__ = "param_definitions"
|
||||
__table_args__ = mysql_table_args("计提参数定义表")
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
param_code: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, unique=True, comment="参数编码,如 salesperson.rate.slope"
|
||||
)
|
||||
param_name: Mapped[str] = mapped_column(String(64), nullable=False, comment="参数名称")
|
||||
param_group: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
comment="参数分组:业务员个人户/经理分成/企业户/信息员/支付环节/产品阈值/月工资口径",
|
||||
)
|
||||
value_type: Mapped[str] = mapped_column(
|
||||
String(16), nullable=False, comment="值类型:DECIMAL/INT/BOOL/ENUM/TEXT"
|
||||
)
|
||||
unit: Mapped[str | None] = mapped_column(String(16), comment="展示单位:‰/%/元/天,无单位为空")
|
||||
dimension_type: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
server_default="NONE",
|
||||
comment="维度类型:NONE/PRODUCT_CATEGORY/BUSINESS_ROLE",
|
||||
)
|
||||
options_text: Mapped[str | None] = mapped_column(
|
||||
String(255), comment="枚举选项(竖线分隔),仅 ENUM 使用"
|
||||
)
|
||||
default_value: Mapped[str | None] = mapped_column(
|
||||
String(64), comment="系统默认值(Fraction 可解析字符串)"
|
||||
)
|
||||
value_min: Mapped[str | None] = mapped_column(String(64), comment="取值下限(含),校验用")
|
||||
value_max: Mapped[str | None] = mapped_column(String(64), comment="取值上限(含),校验用")
|
||||
description: Mapped[str | None] = mapped_column(String(255), comment="口径说明(配置页展示)")
|
||||
sort_order: Mapped[int] = mapped_column(
|
||||
Integer, nullable=False, server_default="0", comment="显示排序"
|
||||
)
|
||||
status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, server_default="1", comment="状态:1启用 0停用"
|
||||
)
|
||||
|
||||
|
||||
class ParamChangeBatch(Base):
|
||||
"""参数变更批次表(append-only)。
|
||||
|
||||
一次提交 = 一个批次;版本号(如 P20261012-01)供对比与追溯引用。
|
||||
未生效批次可整批撤回(删批次与条目);已生效条目禁改禁删。
|
||||
"""
|
||||
|
||||
__tablename__ = "param_change_batches"
|
||||
__table_args__ = mysql_table_args("参数变更批次表")
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
version_no: Mapped[str] = mapped_column(
|
||||
String(32), nullable=False, unique=True, comment="版本号,如 P20261012-01"
|
||||
)
|
||||
effective_date: Mapped[date] = mapped_column(
|
||||
Date, nullable=False, comment="生效日期(业务日期口径)"
|
||||
)
|
||||
change_type: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="生效方式:1立即生效 2指定日期生效"
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="变更说明")
|
||||
operator_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
comment="操作人ID(账号删除后置空)",
|
||||
)
|
||||
operator_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="操作人用户名(冗余固化)"
|
||||
)
|
||||
item_count: Mapped[int] = mapped_column(
|
||||
Integer, nullable=False, server_default="0", comment="变更参数项数"
|
||||
)
|
||||
create_time: Mapped[datetime] = mapped_column(
|
||||
DateTime, nullable=False, server_default=text("CURRENT_TIMESTAMP"), comment="创建时间"
|
||||
)
|
||||
|
||||
|
||||
class ParamValue(Base):
|
||||
"""参数版本条目表(append-only)。
|
||||
|
||||
解析规则:按 (param_id, dimension_value) 取 effective_date <= 业务日期 的
|
||||
ORDER BY effective_date DESC, id DESC 首条(同日多次变更取最新)。
|
||||
dimension_value 用空串而非 NULL:MySQL 组合索引对 NULL 不去重,空串语义更稳。
|
||||
"""
|
||||
|
||||
__tablename__ = "param_values"
|
||||
__table_args__ = mysql_table_args(
|
||||
"参数版本条目表(append-only,按生效日期时点化取值)",
|
||||
Index(
|
||||
"idx_param_values_param_id_dimension_value_effective_date",
|
||||
"param_id",
|
||||
"dimension_value",
|
||||
"effective_date",
|
||||
),
|
||||
Index("idx_param_values_effective_date", "effective_date"),
|
||||
Index("idx_param_values_batch_id", "batch_id"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
param_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("param_definitions.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="参数定义ID(param_definitions.id)",
|
||||
)
|
||||
dimension_value: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
server_default=text("''"),
|
||||
comment="维度取值:NONE维度为空串;产品类别/岗位编码为具体值",
|
||||
)
|
||||
effective_date: Mapped[date] = mapped_column(
|
||||
Date, nullable=False, comment="生效日期(按业务日期时点化取值)"
|
||||
)
|
||||
value_text: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="参数值(Fraction 可解析字符串/枚举码/开关)"
|
||||
)
|
||||
old_value_text: Mapped[str | None] = mapped_column(String(64), comment="变更前值(留痕)")
|
||||
batch_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("param_change_batches.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="变更批次ID(param_change_batches.id)",
|
||||
)
|
||||
create_time: Mapped[datetime] = mapped_column(
|
||||
DateTime, nullable=False, server_default=text("CURRENT_TIMESTAMP"), comment="创建时间"
|
||||
)
|
||||
@@ -0,0 +1,127 @@
|
||||
"""营销人员模型:人员档案、产品辐射区域与市场拓展计划。
|
||||
|
||||
- 岗位(business_role_id)决定计提公式模板,与工资标准同属「同步不覆盖」的
|
||||
人工维护字段(对照表 #26 落地口径,表注释标注供 M4 同步模块遵守)
|
||||
- manager_id 自引用表达「经理带团队」:NULL=经理本人或未分配;M3 经理
|
||||
12.5% 聚合、M4 部门汇总均按该关系展开,无需独立团队表
|
||||
- 一期营销人员不登录系统,不与 users 关联;若后续开放自助查工资再加列
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import Date, ForeignKey, Numeric, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import (
|
||||
BIGINT_UNSIGNED,
|
||||
TINYINT_TYPE,
|
||||
Base,
|
||||
TimestampMixin,
|
||||
TPlusSyncMixin,
|
||||
mysql_table_args,
|
||||
)
|
||||
|
||||
# personnel.status 的在职值(对照 BUSINESS_STATUS_* 集中在 models/business.py
|
||||
# 的先例:状态语义单点导出,业务/客户两侧的归属校验共用,防魔数各自漂移)
|
||||
PERSONNEL_STATUS_ACTIVE = 1
|
||||
|
||||
|
||||
class Personnel(Base, TimestampMixin, TPlusSyncMixin):
|
||||
"""营销人员表(需求 2.1.1)。
|
||||
|
||||
表名 personnel 为集合名词(单复数同形),本身即复数语义。
|
||||
试用期人员绩效照算不发放(对照表 #17),is_probation 供 M3 区分。
|
||||
"""
|
||||
|
||||
__tablename__ = "personnel"
|
||||
__table_args__ = mysql_table_args("营销人员表(T+同步不覆盖岗位与工资标准)")
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
personnel_name: Mapped[str] = mapped_column(String(64), nullable=False, comment="姓名")
|
||||
business_role_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("business_roles.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
index=True,
|
||||
comment="岗位角色ID(决定计提公式模板;T+同步不覆盖)",
|
||||
)
|
||||
manager_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("personnel.id", ondelete="RESTRICT"),
|
||||
index=True,
|
||||
comment="直属营销经理ID(NULL=经理本人或未分配;团队成员关系锚点)",
|
||||
)
|
||||
phone: Mapped[str | None] = mapped_column(String(20), comment="联系电话")
|
||||
hire_date: Mapped[date | None] = mapped_column(Date, comment="入职日期")
|
||||
is_probation: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="0",
|
||||
comment="是否试用期:1是 0否(试用期绩效照算不发放)",
|
||||
)
|
||||
salary_standard: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(12, 2), comment="月工资标准(元;T+同步不覆盖)"
|
||||
)
|
||||
status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="1",
|
||||
comment="状态:1在职 0离职(离职人员不可再被业务/客户归属引用)",
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="备注")
|
||||
|
||||
|
||||
class PersonnelRegion(Base, TimestampMixin):
|
||||
"""产品辐射区域表(需求 2.1.1):人员负责的产品辐射地理范围,1:N 子表。
|
||||
|
||||
随人员编辑整表替换维护,无独立管理诉求,故不加 T+ 预留列。
|
||||
"""
|
||||
|
||||
__tablename__ = "personnel_regions"
|
||||
__table_args__ = mysql_table_args("产品辐射区域表")
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
personnel_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("personnel.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
index=True,
|
||||
comment="人员ID(personnel.id)",
|
||||
)
|
||||
region_name: Mapped[str] = mapped_column(
|
||||
String(128), nullable=False, comment="区域名称(产品辐射地理范围)"
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="备注")
|
||||
|
||||
|
||||
class PersonnelPlan(Base, TimestampMixin):
|
||||
"""市场拓展计划表(需求 2.1.1):计划期间 + 计划内容 + 指标说明的自由条目。
|
||||
|
||||
结构化指标粒度待 T+ 字段映射确认,先以自由条目容器落地;条目最终由
|
||||
T+ 同步确定,故预留 source_no 单列(无索引:查询按 personnel_id 走)。
|
||||
"""
|
||||
|
||||
__tablename__ = "personnel_plans"
|
||||
__table_args__ = mysql_table_args("市场拓展计划表")
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
personnel_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("personnel.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
index=True,
|
||||
comment="人员ID(personnel.id)",
|
||||
)
|
||||
plan_period: Mapped[str] = mapped_column(
|
||||
String(32), nullable=False, comment="计划期间(如 2026Q1、2026-05)"
|
||||
)
|
||||
plan_content: Mapped[str] = mapped_column(String(500), nullable=False, comment="计划内容")
|
||||
target_desc: Mapped[str | None] = mapped_column(String(255), comment="指标说明(文字描述)")
|
||||
source_no: Mapped[str | None] = mapped_column(String(64), comment="T+ 原始条目号(预留)")
|
||||
@@ -0,0 +1,58 @@
|
||||
"""产品模型:产品主数据。
|
||||
|
||||
产品类别(product_category)是**折算阈值的行级锚点**:混合业务按产品逐条
|
||||
计算(对照表 #14),阈值本身由 M1 参数 `product.threshold` 按 PRODUCT_CATEGORY
|
||||
维度承担(#28「全部阈值统一在系统设置维护」),本表不建阈值列 —— 两处维护
|
||||
必然漂移。类别值域与 M1 参数维度共用 PRODUCT_CATEGORIES 常量。
|
||||
"""
|
||||
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import Numeric, String, UniqueConstraint
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import (
|
||||
BIGINT_UNSIGNED,
|
||||
TINYINT_TYPE,
|
||||
Base,
|
||||
TimestampMixin,
|
||||
TPlusSyncMixin,
|
||||
mysql_table_args,
|
||||
)
|
||||
|
||||
|
||||
class Product(Base, TimestampMixin, TPlusSyncMixin):
|
||||
"""产品表(需求 2.1.2)。停用(status=0)为主,不物理删除。"""
|
||||
|
||||
__tablename__ = "products"
|
||||
__table_args__ = mysql_table_args(
|
||||
"产品表(类别锚定折算阈值参数;T+同步不覆盖产品类别)",
|
||||
UniqueConstraint("product_name", "spec_model", name="uk_products_name_spec"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
product_name: Mapped[str] = mapped_column(String(128), nullable=False, comment="产品名称")
|
||||
spec_model: Mapped[str] = mapped_column(
|
||||
String(128),
|
||||
nullable=False,
|
||||
server_default="''",
|
||||
comment="规格型号(空串而非 NULL:参与组合唯一键,MySQL 组合索引对 NULL 不去重)",
|
||||
)
|
||||
unit: Mapped[str | None] = mapped_column(String(16), comment="计量单位")
|
||||
stock_quantity: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 2), comment="数量(T+ 同步原样存储,语义待 IT 确认)"
|
||||
)
|
||||
sale_price: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 4), comment="销售单价(元,T+ 同步)"
|
||||
)
|
||||
product_category: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
comment="产品类别:municipal_water市政水利 rail_transit轨道交通(决定折算阈值 30%/20%;T+同步不覆盖)",
|
||||
)
|
||||
status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, server_default="1", comment="状态:1启用 0停用"
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="备注")
|
||||
@@ -0,0 +1,46 @@
|
||||
"""客户评级等级配置模型(需求 2.2.5)。
|
||||
|
||||
评级计算器定位为「仅打分工具,不影响绩效金额」(对照表 #25):评分记录
|
||||
不落库,等级**映射关系**可配置由本表承载。判定规则:按 sort_order 升序取
|
||||
第一个 min_score ≤ 总分的等级 —— 单边判定避免区间边界(如 75 分)在
|
||||
「≥75 且 ≤89」与「>74 且 <75」两套写法间的重叠/遗漏歧义;max_score 仅展示。
|
||||
"""
|
||||
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import Integer, Numeric, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import BIGINT_UNSIGNED, Base, TimestampMixin, mysql_table_args
|
||||
|
||||
|
||||
class CustomerRatingGrade(Base, TimestampMixin):
|
||||
"""客户评级等级配置表(需求 2.2.5「等级对应关系可配置」)。
|
||||
|
||||
种子四条随迁移初始化:A 优秀 90-100 / B 良好 75-89 / C 合格 60-74 /
|
||||
D 待改进 0-59。区间不重叠与 0≤min≤max≤100 由应用层校验。
|
||||
"""
|
||||
|
||||
__tablename__ = "customer_rating_grades"
|
||||
__table_args__ = mysql_table_args(
|
||||
"客户评级等级配置表(等级映射可配置;判定按 sort_order 升序首个 min_score≤总分)"
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
grade_name: Mapped[str] = mapped_column(
|
||||
String(32), nullable=False, unique=True, comment="等级名称(如 A/优秀)"
|
||||
)
|
||||
min_score: Mapped[Decimal] = mapped_column(
|
||||
Numeric(5, 1),
|
||||
nullable=False,
|
||||
comment="总分下限(含);判定=按 sort_order 升序首个 min_score ≤ 总分",
|
||||
)
|
||||
max_score: Mapped[Decimal] = mapped_column(
|
||||
Numeric(5, 1), nullable=False, comment="总分上限(展示用)"
|
||||
)
|
||||
sort_order: Mapped[int] = mapped_column(
|
||||
Integer, nullable=False, server_default="0", comment="排序(判定顺序,升序)"
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="说明")
|
||||
@@ -0,0 +1,83 @@
|
||||
"""回款模型:回款记录与批次追溯。
|
||||
|
||||
- shipment_id 为**手动指定**的发货批次(对照表 #18):可空=暂未指定;
|
||||
必须与 business_id 同属一个业务(服务层强校验,无数据库级约束可表达
|
||||
跨表同属关系);指定后回款天数方可由 formula.payment_days 派生
|
||||
- settlement_status 是 **M3 核算防重锚点**(需规 2.3.3「每笔回款仅核算一次,
|
||||
台账记录核销状态」):预置于本表避免 M3 反向迁移改 M2 表;M3 台账建立后
|
||||
由核算服务写入,M2 仅维护 0(未核算)
|
||||
- receipt_date 是 M3 参数版本匹配日(对照表 #11:按回款到账日取时点参数)
|
||||
- 一期禁负数金额(≥0):红字/退款冲销需求出现时先补设计再放开
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import Date, ForeignKey, Index, Numeric, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import (
|
||||
BIGINT_UNSIGNED,
|
||||
TINYINT_TYPE,
|
||||
Base,
|
||||
TimestampMixin,
|
||||
TPlusSyncMixin,
|
||||
mysql_table_args,
|
||||
)
|
||||
|
||||
# 绩效核算状态(receipts.settlement_status)
|
||||
SETTLEMENT_PENDING = 0
|
||||
SETTLEMENT_DONE = 1
|
||||
|
||||
|
||||
class Receipt(Base, TimestampMixin, TPlusSyncMixin):
|
||||
"""回款表(需求 2.2.3):按业务登记到账款项,批次号系统内唯一。"""
|
||||
|
||||
__tablename__ = "receipts"
|
||||
__table_args__ = mysql_table_args(
|
||||
"回款表(手动指定发货批次;已核算回款禁改禁删)",
|
||||
Index("idx_receipts_business_id", "business_id"),
|
||||
Index("idx_receipts_receipt_date", "receipt_date"),
|
||||
Index("idx_receipts_settlement_status", "settlement_status"),
|
||||
Index("idx_receipts_shipment_id", "shipment_id"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
receipt_batch_no: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
unique=True,
|
||||
comment="回款批次号,自动生成 HK{YYYYMMDD}-{4位当日序号}(系统内唯一;T+ 同步回款以 source_no 幂等)",
|
||||
)
|
||||
business_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("businesses.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="业务ID(businesses.id)",
|
||||
)
|
||||
shipment_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("shipments.id", ondelete="RESTRICT"),
|
||||
comment="发货单ID(shipments.id;手动指定的回款对应批次,须与本行业务一致;NULL=暂未指定)",
|
||||
)
|
||||
receipt_date: Mapped[date] = mapped_column(
|
||||
Date, nullable=False, comment="回款到账日(M3 按此日匹配参数版本,对照表 #11)"
|
||||
)
|
||||
amount: Mapped[Decimal] = mapped_column(
|
||||
Numeric(14, 2), nullable=False, comment="回款金额(≥0;一期禁负数/红字)"
|
||||
)
|
||||
is_barter: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="0",
|
||||
comment="以物抵顶标记:1是 0否(M3 核算按应发绩效×barter.discount 折算,M2 仅标记)",
|
||||
)
|
||||
settlement_status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="0",
|
||||
comment="绩效核算状态:0未核算 1已核算(M3 核算防重锚点;已核算回款禁改禁删)",
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="备注")
|
||||
@@ -0,0 +1,115 @@
|
||||
"""发货模型:发货单与发货产品明细。
|
||||
|
||||
- ship_date 是**回款天数计算基准日**(对照表 #1:发货日首日计第 1 天),
|
||||
回款指定本发货单后由 formula.payment_days 派生回款天数,不在本表落库
|
||||
- 运费仅记录展示,不计入毛利润口径(对照表 #2)
|
||||
- total_amount 为明细行汇总冗余,服务层事务内维护
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import Date, ForeignKey, Index, Numeric, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import (
|
||||
BIGINT_UNSIGNED,
|
||||
Base,
|
||||
TimestampMixin,
|
||||
TPlusSyncMixin,
|
||||
mysql_table_args,
|
||||
)
|
||||
|
||||
|
||||
class Shipment(Base, TimestampMixin, TPlusSyncMixin):
|
||||
"""发货单表(需求 2.2.2):每笔发货对应一个业务,支持分批发货。"""
|
||||
|
||||
__tablename__ = "shipments"
|
||||
__table_args__ = mysql_table_args(
|
||||
"发货单表(发货日为回款天数基准日,发货日首日计第 1 天)",
|
||||
Index("idx_shipments_business_id", "business_id"),
|
||||
Index("idx_shipments_ship_date", "ship_date"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
shipment_no: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
unique=True,
|
||||
comment="发货单号,自动生成 SH{YYYYMMDD}-{4位当日序号}(内部追溯用)",
|
||||
)
|
||||
business_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("businesses.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="业务ID(businesses.id;终态业务禁止新发货)",
|
||||
)
|
||||
ship_date: Mapped[date] = mapped_column(
|
||||
Date, nullable=False, comment="发货日期(回款天数基准日,发货日首日=第 1 天)"
|
||||
)
|
||||
freight_amount: Mapped[Decimal] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
nullable=False,
|
||||
server_default="0",
|
||||
comment="运费金额(仅记录展示;不计入毛利润口径,对照表 #2)",
|
||||
)
|
||||
total_amount: Mapped[Decimal] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
nullable=False,
|
||||
server_default="0",
|
||||
comment="发货总金额(明细行汇总冗余,服务层事务内维护,禁手工直改)",
|
||||
)
|
||||
remark: Mapped[str | None] = mapped_column(String(255), comment="备注")
|
||||
|
||||
|
||||
class ShipmentItem(Base, TimestampMixin):
|
||||
"""发货产品明细表(需求 2.2.2):记录发货的产品名称、规格、数量等。
|
||||
|
||||
价格口径两可(T+ 供价或人工录入,待 IT 确认):sale_price 可空人工补,
|
||||
amount 由服务层按 数量×单价 计算固化。
|
||||
"""
|
||||
|
||||
__tablename__ = "shipment_items"
|
||||
__table_args__ = mysql_table_args(
|
||||
"发货产品明细表",
|
||||
Index("idx_shipment_items_shipment_id", "shipment_id"),
|
||||
Index("idx_shipment_items_product_id", "product_id"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
shipment_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("shipments.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="发货单ID(shipments.id)",
|
||||
)
|
||||
product_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("products.id", ondelete="RESTRICT"),
|
||||
comment="产品ID(products.id;NULL=自由录入)",
|
||||
)
|
||||
product_name: Mapped[str] = mapped_column(
|
||||
String(128), nullable=False, comment="产品名称(引用产品时冗余固化)"
|
||||
)
|
||||
spec_model: Mapped[str] = mapped_column(
|
||||
String(128),
|
||||
nullable=False,
|
||||
server_default="''",
|
||||
comment="规格型号(冗余固化;空串对齐 products 组合唯一键口径)",
|
||||
)
|
||||
unit: Mapped[str | None] = mapped_column(String(16), comment="计量单位")
|
||||
quantity: Mapped[Decimal] = mapped_column(
|
||||
Numeric(14, 2), nullable=False, comment="发货数量(>0)"
|
||||
)
|
||||
sale_price: Mapped[Decimal | None] = mapped_column(
|
||||
Numeric(14, 4), comment="发货单价(元;T+ 同步或人工,口径待 IT 确认)"
|
||||
)
|
||||
amount: Mapped[Decimal] = mapped_column(
|
||||
Numeric(14, 2),
|
||||
nullable=False,
|
||||
comment="行金额 = 数量×单价(服务层计算固化,不信任前端传值)",
|
||||
)
|
||||
@@ -0,0 +1,31 @@
|
||||
"""系统设置模型:公司信息单例行。
|
||||
|
||||
与 M1 计提参数体系刻意分离:公司名称/logo 是「展示事实」,没有按生效日期
|
||||
时点化演算的语义(参数体系按 effective_date 取值快照),且参数值列
|
||||
value_text 为 String(64) 装不下;故独立单行表。logo 只存相对路径——文件在
|
||||
`backend/uploads/logo/`,独立于数据库备份体积且可单独替换(见
|
||||
system_setting_service)。整个系统恒为单行(迁移种子 id=1 保底,upsert 维护)。
|
||||
"""
|
||||
|
||||
from sqlalchemy import String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import BIGINT_UNSIGNED, Base, TimestampMixin, mysql_table_args
|
||||
|
||||
|
||||
class SystemSetting(Base, TimestampMixin):
|
||||
"""系统设置表:本期仅公司信息(公司名称 / logo 路径),全系统单行 id=1。"""
|
||||
|
||||
__tablename__ = "system_settings"
|
||||
__table_args__ = mysql_table_args("系统设置表(公司信息,全系统单行)")
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
company_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="公司名称(登录页与导出页眉展示)"
|
||||
)
|
||||
logo_path: Mapped[str | None] = mapped_column(
|
||||
String(255),
|
||||
comment="logo 相对路径(文件存 uploads/logo/,null=未上传使用默认)",
|
||||
)
|
||||
@@ -0,0 +1,287 @@
|
||||
"""业务数据仓储:业务单、明细、状态留痕与归属留痕。
|
||||
|
||||
只读写数据并 flush;commit/rollback 与业务异常一律在 service 层。
|
||||
归属留痕复用 ownership_change_logs(owner_type=2 为业务维度,常量在
|
||||
models/customer.py 定义)。
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
|
||||
from sqlalchemy import Row, Select, delete, exists, func, or_, select
|
||||
from sqlalchemy.orm import Session, aliased
|
||||
|
||||
from app.models import (
|
||||
Business,
|
||||
BusinessItem,
|
||||
BusinessStatusLog,
|
||||
Customer,
|
||||
OwnershipChangeLog,
|
||||
Personnel,
|
||||
Receipt,
|
||||
SecondaryAllocation,
|
||||
Shipment,
|
||||
)
|
||||
from app.models.customer import OWNER_TYPE_BUSINESS
|
||||
from app.repositories import ownership_log_repository
|
||||
|
||||
|
||||
def get_by_id(session: Session, business_id: int, *, for_update: bool = False) -> Business | None:
|
||||
"""按主键取业务行;for_update 供删除保护、编辑门槛与状态机使用。"""
|
||||
stmt = select(Business).where(Business.id == business_id)
|
||||
if for_update:
|
||||
stmt = stmt.with_for_update()
|
||||
return session.execute(stmt).scalars().first()
|
||||
|
||||
|
||||
def has_docs(session: Session, business_id: int) -> bool:
|
||||
"""业务名下是否已有发货单或回款(换客户/删除保护的引用检查)。
|
||||
|
||||
单条 OR exists 一次往返;新增挂靠业务的单据类型时在此补充条件,
|
||||
编辑与删除两处共用同一判定,防「delete 补了检查、update 漏补」的分叉。
|
||||
"""
|
||||
stmt = select(
|
||||
or_(
|
||||
exists().where(Shipment.business_id == business_id),
|
||||
exists().where(Receipt.business_id == business_id),
|
||||
)
|
||||
)
|
||||
return bool(session.execute(stmt).scalar())
|
||||
|
||||
|
||||
def create(session: Session, business: Business) -> None:
|
||||
"""新增业务行(不 commit,flush 让自增 id 就位)。"""
|
||||
session.add(business)
|
||||
session.flush()
|
||||
|
||||
|
||||
def get_with_names(
|
||||
session: Session, business_id: int, *, for_update: bool = False
|
||||
) -> tuple[Business, str, str | None, str | None] | None:
|
||||
"""业务行 + 客户名 + 负责人名 + 协助人名(DTO 与审计摘要共用)。
|
||||
|
||||
for_update 供编辑/状态流转/归属变更使用:与发货/回款写路径的
|
||||
get_by_id(for_update=True) 同一锁口径,编辑事务与单据写事务互斥,
|
||||
「有发货禁换客户」的快照读校验不再被并发新增旁路。
|
||||
"""
|
||||
owner = aliased(Personnel)
|
||||
assistant = aliased(Personnel)
|
||||
stmt = (
|
||||
select(Business, Customer.company_name, owner.personnel_name, assistant.personnel_name)
|
||||
.join(Customer, Customer.id == Business.customer_id)
|
||||
.outerjoin(owner, owner.id == Business.owner_personnel_id)
|
||||
.outerjoin(assistant, assistant.id == Business.assistant_personnel_id)
|
||||
.where(Business.id == business_id)
|
||||
)
|
||||
if for_update:
|
||||
stmt = stmt.with_for_update()
|
||||
return session.execute(stmt).first()
|
||||
|
||||
|
||||
def _apply_filters(
|
||||
stmt: Select,
|
||||
*,
|
||||
keyword: str | None,
|
||||
status: int | None,
|
||||
customer_id: int | None,
|
||||
owner_personnel_id: int | None,
|
||||
date_from: date | None,
|
||||
date_to: date | None,
|
||||
) -> Select:
|
||||
"""业务列表的筛选条件(调用方须已 join Customer)。"""
|
||||
if keyword:
|
||||
# 业务编号/公司名称双列 OR 模糊;contains(autoescape) 同 query_utils.fuzzy
|
||||
# 的转义口径(fuzzy 为单列 where 语义,双列 OR 在此直接组合)
|
||||
stmt = stmt.where(
|
||||
or_(
|
||||
Business.business_no.contains(keyword, autoescape=True),
|
||||
Customer.company_name.contains(keyword, autoescape=True),
|
||||
)
|
||||
)
|
||||
if status is not None:
|
||||
stmt = stmt.where(Business.status == status)
|
||||
if customer_id is not None:
|
||||
stmt = stmt.where(Business.customer_id == customer_id)
|
||||
if owner_personnel_id is not None:
|
||||
stmt = stmt.where(Business.owner_personnel_id == owner_personnel_id)
|
||||
if date_from is not None:
|
||||
stmt = stmt.where(Business.business_date >= date_from)
|
||||
if date_to is not None:
|
||||
stmt = stmt.where(Business.business_date <= date_to)
|
||||
return stmt
|
||||
|
||||
|
||||
def list_businesses(
|
||||
session: Session,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
keyword: str | None,
|
||||
status: int | None,
|
||||
customer_id: int | None,
|
||||
owner_personnel_id: int | None,
|
||||
date_from: date | None,
|
||||
date_to: date | None,
|
||||
) -> list[tuple[Business, str, str | None, str | None]]:
|
||||
"""分页查询业务(附客户名/负责人名/协助人名),按 id 倒序。"""
|
||||
owner = aliased(Personnel)
|
||||
assistant = aliased(Personnel)
|
||||
stmt = select(
|
||||
Business, Customer.company_name, owner.personnel_name, assistant.personnel_name
|
||||
).join(Customer, Customer.id == Business.customer_id)
|
||||
stmt = _apply_filters(
|
||||
stmt,
|
||||
keyword=keyword,
|
||||
status=status,
|
||||
customer_id=customer_id,
|
||||
owner_personnel_id=owner_personnel_id,
|
||||
date_from=date_from,
|
||||
date_to=date_to,
|
||||
)
|
||||
stmt = (
|
||||
stmt.outerjoin(owner, owner.id == Business.owner_personnel_id)
|
||||
.outerjoin(assistant, assistant.id == Business.assistant_personnel_id)
|
||||
.order_by(Business.id.desc())
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
)
|
||||
return list(session.execute(stmt).all())
|
||||
|
||||
|
||||
def count_businesses(
|
||||
session: Session,
|
||||
*,
|
||||
keyword: str | None,
|
||||
status: int | None,
|
||||
customer_id: int | None,
|
||||
owner_personnel_id: int | None,
|
||||
date_from: date | None,
|
||||
date_to: date | None,
|
||||
) -> int:
|
||||
stmt = (
|
||||
select(func.count())
|
||||
.select_from(Business)
|
||||
.join(Customer, Customer.id == Business.customer_id)
|
||||
)
|
||||
stmt = _apply_filters(
|
||||
stmt,
|
||||
keyword=keyword,
|
||||
status=status,
|
||||
customer_id=customer_id,
|
||||
owner_personnel_id=owner_personnel_id,
|
||||
date_from=date_from,
|
||||
date_to=date_to,
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def list_items(session: Session, business_id: int) -> list[BusinessItem]:
|
||||
"""业务明细行(编辑回显与汇总重算共用)。"""
|
||||
return list(
|
||||
session.execute(
|
||||
select(BusinessItem)
|
||||
.where(BusinessItem.business_id == business_id)
|
||||
.order_by(BusinessItem.id)
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
def replace_items(session: Session, business_id: int, rows: list[BusinessItem]) -> None:
|
||||
"""全量替换明细:先删、立即 flush、再插入(replace_roles 先例的防御写法)。
|
||||
|
||||
同一 flush 中 SQLAlchemy 先处理 INSERT 后处理 DELETE,先删后插不落库
|
||||
会在有唯一键的表上撞键;business_items 虽无唯一键,统一按此写法防御。
|
||||
"""
|
||||
session.execute(delete(BusinessItem).where(BusinessItem.business_id == business_id))
|
||||
session.flush()
|
||||
for row in rows:
|
||||
row.business_id = business_id
|
||||
session.add(row)
|
||||
session.flush()
|
||||
|
||||
|
||||
def list_allocations(session: Session, business_id: int) -> list[SecondaryAllocation]:
|
||||
"""二次分配方案(详情回显;空列表=未设置方案)。"""
|
||||
return list(
|
||||
session.execute(
|
||||
select(SecondaryAllocation)
|
||||
.where(SecondaryAllocation.business_id == business_id)
|
||||
.order_by(SecondaryAllocation.id)
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
def replace_allocations(
|
||||
session: Session, business_id: int, rows: list[SecondaryAllocation]
|
||||
) -> None:
|
||||
"""全量替换二次分配方案(不 commit,事务边界在服务层)。
|
||||
|
||||
本表有 uk(business_id, personnel_id),**必须**沿用先删后 flush 再插的
|
||||
防御写法:同 flush 内 INSERT 先于 DELETE 处理,直接删加插会撞唯一键。
|
||||
"""
|
||||
session.execute(
|
||||
delete(SecondaryAllocation).where(SecondaryAllocation.business_id == business_id)
|
||||
)
|
||||
session.flush()
|
||||
for row in rows:
|
||||
row.business_id = business_id
|
||||
session.add(row)
|
||||
session.flush()
|
||||
|
||||
|
||||
def add_status_log(session: Session, log: BusinessStatusLog) -> None:
|
||||
"""追加状态留痕(不 commit)。"""
|
||||
session.add(log)
|
||||
session.flush()
|
||||
|
||||
|
||||
def list_status_logs(
|
||||
session: Session, business_id: int, *, offset: int, limit: int
|
||||
) -> list[BusinessStatusLog]:
|
||||
"""状态流转时间线(详情页),按时间正序(时间线从创建起展示)。"""
|
||||
return list(
|
||||
session.execute(
|
||||
select(BusinessStatusLog)
|
||||
.where(BusinessStatusLog.business_id == business_id)
|
||||
.order_by(BusinessStatusLog.create_time, BusinessStatusLog.id)
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
def count_status_logs(session: Session, business_id: int) -> int:
|
||||
return int(
|
||||
session.execute(
|
||||
select(func.count())
|
||||
.select_from(BusinessStatusLog)
|
||||
.where(BusinessStatusLog.business_id == business_id)
|
||||
).scalar_one()
|
||||
)
|
||||
|
||||
|
||||
def add_ownership_log(session: Session, log: OwnershipChangeLog) -> None:
|
||||
"""追加归属变更留痕(共享实现,不 commit)。"""
|
||||
ownership_log_repository.add(session, log)
|
||||
|
||||
|
||||
def list_ownership_logs(
|
||||
session: Session, business_id: int, *, offset: int, limit: int
|
||||
) -> list[Row]:
|
||||
"""某业务的归属变更留痕(共享实现,owner_type/business_id 参数化)。"""
|
||||
return ownership_log_repository.list_by_ref(
|
||||
session,
|
||||
owner_type=OWNER_TYPE_BUSINESS,
|
||||
ref_column=OwnershipChangeLog.business_id,
|
||||
ref_id=business_id,
|
||||
offset=offset,
|
||||
limit=limit,
|
||||
)
|
||||
|
||||
|
||||
def count_ownership_logs(session: Session, business_id: int) -> int:
|
||||
return ownership_log_repository.count_by_ref(
|
||||
session,
|
||||
owner_type=OWNER_TYPE_BUSINESS,
|
||||
ref_column=OwnershipChangeLog.business_id,
|
||||
ref_id=business_id,
|
||||
)
|
||||
@@ -0,0 +1,102 @@
|
||||
"""业务岗位角色数据访问。
|
||||
|
||||
本层只 flush 不 commit —— 事务边界由 services 层控制。
|
||||
"""
|
||||
|
||||
from sqlalchemy import Select, func, or_, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models import BusinessRole
|
||||
|
||||
# ==================== 读取 ====================
|
||||
|
||||
|
||||
def get_by_id(session: Session, role_id: int, *, for_update: bool = False) -> BusinessRole | None:
|
||||
"""按主键查询。删除校验走 ``for_update`` 锁行(同 role_repository 的理由)。"""
|
||||
if for_update:
|
||||
stmt = select(BusinessRole).where(BusinessRole.id == role_id).with_for_update()
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
return session.get(BusinessRole, role_id)
|
||||
|
||||
|
||||
def get_by_code(session: Session, role_code: str) -> BusinessRole | None:
|
||||
"""按编码查询岗位。编码是参数维度值(dimension_value)的锚点。"""
|
||||
stmt = select(BusinessRole).where(BusinessRole.role_code == role_code)
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
|
||||
|
||||
def list_by_codes(session: Session, role_codes: list[str]) -> dict[str, BusinessRole]:
|
||||
"""按编码批量取岗位(参数批次校验段用,消除逐条 N+1)。
|
||||
|
||||
返回 {编码: 岗位}。MySQL ci 校对下编码大小写变形也能命中,
|
||||
键取库里的规范 role_code,调用方据此把维度值归一为规范值。
|
||||
"""
|
||||
if not role_codes:
|
||||
return {}
|
||||
rows = session.execute(
|
||||
select(BusinessRole).where(BusinessRole.role_code.in_(role_codes))
|
||||
).scalars()
|
||||
return {role.role_code: role for role in rows}
|
||||
|
||||
|
||||
def list_roles(
|
||||
session: Session,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
keyword: str | None = None,
|
||||
status: int | None = None,
|
||||
) -> list[BusinessRole]:
|
||||
"""分页查询岗位(含停用)。排序 (sort_order, id),与系统角色口径一致。"""
|
||||
stmt = _apply_filters(select(BusinessRole), keyword=keyword, status=status)
|
||||
stmt = stmt.order_by(BusinessRole.sort_order, BusinessRole.id).offset(offset).limit(limit)
|
||||
return list(session.execute(stmt).scalars())
|
||||
|
||||
|
||||
def count_roles(session: Session, *, keyword: str | None = None, status: int | None = None) -> int:
|
||||
"""统计符合条件的岗位总数,供分页使用。"""
|
||||
stmt = _apply_filters(select(func.count(BusinessRole.id)), keyword=keyword, status=status)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def _apply_filters(stmt: Select, *, keyword: str | None, status: int | None) -> Select:
|
||||
"""应用通用筛选条件。列表与计数共用,避免两处口径不一致。
|
||||
|
||||
关键词走 ``contains(autoescape=True)``(转义 LIKE 通配符)——岗位编码含下划线,
|
||||
不转义时 ``_`` 会当单字符通配执行。
|
||||
"""
|
||||
if keyword:
|
||||
stmt = stmt.where(
|
||||
or_(
|
||||
BusinessRole.role_code.contains(keyword, autoescape=True),
|
||||
BusinessRole.role_name.contains(keyword, autoescape=True),
|
||||
)
|
||||
)
|
||||
if status is not None:
|
||||
stmt = stmt.where(BusinessRole.status == status)
|
||||
return stmt
|
||||
|
||||
|
||||
def count_personnel_by_role(session: Session, role_ids: list[int]) -> dict[int, int]:
|
||||
"""批量统计各岗位下的人员数(删除保护的依据)。
|
||||
|
||||
② 基础数据管理落地 personnel 表后在此实现真实计数(一次 GROUP BY,
|
||||
禁止列表循环内逐行查询);当前无人员表,恒返回空,删除校验对空字典放行。
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
# ==================== 写入 ====================
|
||||
|
||||
|
||||
def create(session: Session, role: BusinessRole) -> BusinessRole:
|
||||
"""新增岗位。只 flush 以取得自增 id。"""
|
||||
session.add(role)
|
||||
session.flush()
|
||||
return role
|
||||
|
||||
|
||||
def delete(session: Session, role: BusinessRole) -> None:
|
||||
"""删除岗位。调用方须先完成保护规则校验。"""
|
||||
session.delete(role)
|
||||
session.flush()
|
||||
@@ -0,0 +1,178 @@
|
||||
"""客户数据访问(含归属变更留痕)。
|
||||
|
||||
本层只 flush 不 commit —— 事务边界由 services 层控制。
|
||||
"""
|
||||
|
||||
from sqlalchemy import ColumnElement, Row, Select, func, or_, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models import Customer, OwnershipChangeLog, Personnel
|
||||
from app.models.customer import OWNER_TYPE_CUSTOMER
|
||||
from app.repositories import ownership_log_repository
|
||||
from app.repositories.query_utils import fuzzy
|
||||
|
||||
# ==================== 读取 ====================
|
||||
|
||||
|
||||
def get_by_id(session: Session, customer_id: int) -> Customer | None:
|
||||
"""按主键查询客户。"""
|
||||
return session.get(Customer, customer_id)
|
||||
|
||||
|
||||
def count_business_refs(session: Session, customer_id: int) -> int:
|
||||
"""被业务单据引用的次数(删除保护;业务表就位后补齐的检查)。"""
|
||||
from app.models import Business
|
||||
|
||||
return int(
|
||||
session.execute(
|
||||
select(func.count()).select_from(Business).where(Business.customer_id == customer_id)
|
||||
).scalar_one()
|
||||
)
|
||||
|
||||
|
||||
def get_with_owner_name(session: Session, customer_id: int) -> Row | None:
|
||||
"""查单个客户并带出归属人员姓名(详情、编辑回显与归属变更共用)。"""
|
||||
stmt = _base_select().where(Customer.id == customer_id)
|
||||
return session.execute(stmt).first()
|
||||
|
||||
|
||||
def get_by_company_owner(session: Session, company_name: str, owner_name: str) -> Customer | None:
|
||||
"""按「公司名称 + 负责人」查客户(uk_customers_company_owner 的先查后写兜底)。"""
|
||||
stmt = select(Customer).where(
|
||||
Customer.company_name == company_name,
|
||||
Customer.owner_name == owner_name,
|
||||
)
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
|
||||
|
||||
def list_customers(
|
||||
session: Session,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
keyword: str | None = None,
|
||||
customer_type: str | None = None,
|
||||
owner_personnel_id: int | None = None,
|
||||
) -> list[Row]:
|
||||
"""分页查询客户,行内容为 (客户, 归属人员姓名)。
|
||||
|
||||
归属人员外键非空但统一用 outerjoin:人员行不可考(被物理删除的脏数据)
|
||||
不应让客户行整个查不出来(同 personnel_repository 的韧性口径)。
|
||||
排序按 id 倒序:客户无排序字段,新增的靠前符合列表页习惯。
|
||||
"""
|
||||
stmt = _apply_filters(
|
||||
_base_select(),
|
||||
keyword=keyword,
|
||||
customer_type=customer_type,
|
||||
owner_personnel_id=owner_personnel_id,
|
||||
)
|
||||
stmt = stmt.order_by(Customer.id.desc()).offset(offset).limit(limit)
|
||||
return list(session.execute(stmt).all())
|
||||
|
||||
|
||||
def count_customers(
|
||||
session: Session,
|
||||
*,
|
||||
keyword: str | None = None,
|
||||
customer_type: str | None = None,
|
||||
owner_personnel_id: int | None = None,
|
||||
) -> int:
|
||||
"""统计符合条件的客户总数,供分页使用。
|
||||
|
||||
筛选条件全部落在主表上,计数无需 join(列表与计数的筛选口径由
|
||||
``_apply_filters`` 单点保证)。
|
||||
"""
|
||||
stmt = _apply_filters(
|
||||
select(func.count(Customer.id)),
|
||||
keyword=keyword,
|
||||
customer_type=customer_type,
|
||||
owner_personnel_id=owner_personnel_id,
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def list_ownership_logs(
|
||||
session: Session,
|
||||
*,
|
||||
customer_id: int,
|
||||
offset: int,
|
||||
limit: int,
|
||||
) -> list[Row]:
|
||||
"""查某客户的归属变更留痕(共享实现,owner_type/customer_id 参数化)。"""
|
||||
return ownership_log_repository.list_by_ref(
|
||||
session,
|
||||
owner_type=OWNER_TYPE_CUSTOMER,
|
||||
ref_column=OwnershipChangeLog.customer_id,
|
||||
ref_id=customer_id,
|
||||
offset=offset,
|
||||
limit=limit,
|
||||
)
|
||||
|
||||
|
||||
def count_ownership_logs(session: Session, *, customer_id: int) -> int:
|
||||
"""统计某客户的归属留痕总数,供分页使用。"""
|
||||
return ownership_log_repository.count_by_ref(
|
||||
session,
|
||||
owner_type=OWNER_TYPE_CUSTOMER,
|
||||
ref_column=OwnershipChangeLog.customer_id,
|
||||
ref_id=customer_id,
|
||||
)
|
||||
|
||||
|
||||
def _base_select() -> Select:
|
||||
"""客户主表外联归属人员姓名。"""
|
||||
return select(Customer, Personnel.personnel_name).outerjoin(
|
||||
Personnel, Customer.owner_personnel_id == Personnel.id
|
||||
)
|
||||
|
||||
|
||||
def _apply_filters(
|
||||
stmt: Select,
|
||||
*,
|
||||
keyword: str | None,
|
||||
customer_type: str | None,
|
||||
owner_personnel_id: int | None,
|
||||
) -> Select:
|
||||
"""应用通用筛选条件。列表与计数共用,避免两处口径不一致。"""
|
||||
if keyword:
|
||||
stmt = stmt.where(_keyword_clause(keyword))
|
||||
if customer_type:
|
||||
stmt = stmt.where(Customer.customer_type == customer_type)
|
||||
if owner_personnel_id is not None:
|
||||
stmt = stmt.where(Customer.owner_personnel_id == owner_personnel_id)
|
||||
return stmt
|
||||
|
||||
|
||||
def _keyword_clause(keyword: str) -> ColumnElement[bool]:
|
||||
"""关键词条件:公司名称或客户负责人两列 OR 模糊。
|
||||
|
||||
借 ``query_utils.fuzzy`` 在空 select 上生成单列条件后取 whereclause 做
|
||||
OR 合并 —— LIKE 通配符转义口径单点维护;两处手写 ``contains`` 迟早有
|
||||
一处漏掉 ``autoescape``(人名含下划线是常态,不转义会当单字符通配执行)。
|
||||
"""
|
||||
probe = select(Customer.id)
|
||||
return or_(
|
||||
fuzzy(probe, Customer.company_name, keyword).whereclause,
|
||||
fuzzy(probe, Customer.owner_name, keyword).whereclause,
|
||||
)
|
||||
|
||||
|
||||
# ==================== 写入 ====================
|
||||
|
||||
|
||||
def create(session: Session, customer: Customer) -> Customer:
|
||||
"""新增客户。只 flush 以取得自增 id。"""
|
||||
session.add(customer)
|
||||
session.flush()
|
||||
return customer
|
||||
|
||||
|
||||
def delete(session: Session, customer: Customer) -> None:
|
||||
"""删除客户。调用方须先完成引用保护校验。"""
|
||||
session.delete(customer)
|
||||
session.flush()
|
||||
|
||||
|
||||
def add_ownership_log(session: Session, log: OwnershipChangeLog) -> OwnershipChangeLog:
|
||||
"""写入一条归属变更留痕(共享实现)。只 flush 不 commit,与主表更新同事务。"""
|
||||
return ownership_log_repository.add(session, log)
|
||||
@@ -32,7 +32,21 @@ from app.repositories.query_utils import LogFilters, apply_log_filters
|
||||
# 口径与 core.logging.scrub 的键名正则一致,但改为结构化处理 ——
|
||||
# 文本正则有三种逃逸形态:值以空白开头时整体匹配失败(完全不脱敏)、
|
||||
# 值含空格/逗号时只抹首段、值含引号时既残留又破坏 JSON 结构。
|
||||
_SENSITIVE_KEY_PARTS = ("password", "passwd", "pwd", "secret", "token", "app_key", "access_key")
|
||||
# phone/mobile/id_card 系 CLAUDE.md「日志禁输出手机号/身份证」红线的键名口径 ——
|
||||
# 带分隔符的号码会穿过文本正则,必须在这里按整值抹除
|
||||
_SENSITIVE_KEY_PARTS = (
|
||||
"password",
|
||||
"passwd",
|
||||
"pwd",
|
||||
"secret",
|
||||
"token",
|
||||
"app_key",
|
||||
"access_key",
|
||||
"phone",
|
||||
"mobile",
|
||||
"id_card",
|
||||
"idcard",
|
||||
)
|
||||
|
||||
_MASK = "***"
|
||||
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
"""归属变更留痕的共享数据访问(客户/业务两维度共用)。
|
||||
|
||||
owner_type 与引用列由调用方参数化 —— 此前客户、业务两侧各持一套逐行
|
||||
同构的 list/count/add,排序口径与 join 兜底的调整须同步两处;收口后
|
||||
「被删人员留痕仍可读」「翻页稳定双键倒序」等口径单点维护。
|
||||
"""
|
||||
|
||||
from sqlalchemy import Row, func, select
|
||||
from sqlalchemy.orm import Session, aliased
|
||||
|
||||
from app.models import OwnershipChangeLog, Personnel
|
||||
|
||||
|
||||
def list_by_ref(
|
||||
session: Session,
|
||||
*,
|
||||
owner_type: int,
|
||||
ref_column,
|
||||
ref_id: int,
|
||||
offset: int,
|
||||
limit: int,
|
||||
) -> list[Row]:
|
||||
"""查某引用对象的归属留痕,行内容为 (留痕, 旧归属人名, 新归属人名)。
|
||||
|
||||
人员删除后 join 出 None,留痕固化 ID 兜底可读。按 (create_time, id)
|
||||
双键倒序:create_time 是秒级精度,同一秒内多条排序不确定,id 兜底
|
||||
保证翻页稳定(与操作日志同一理由)。
|
||||
"""
|
||||
old_person = aliased(Personnel)
|
||||
new_person = aliased(Personnel)
|
||||
stmt = (
|
||||
select(OwnershipChangeLog, old_person.personnel_name, new_person.personnel_name)
|
||||
.outerjoin(old_person, OwnershipChangeLog.old_owner_personnel_id == old_person.id)
|
||||
.outerjoin(new_person, OwnershipChangeLog.new_owner_personnel_id == new_person.id)
|
||||
.where(OwnershipChangeLog.owner_type == owner_type, ref_column == ref_id)
|
||||
.order_by(OwnershipChangeLog.create_time.desc(), OwnershipChangeLog.id.desc())
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
)
|
||||
return list(session.execute(stmt).all())
|
||||
|
||||
|
||||
def count_by_ref(session: Session, *, owner_type: int, ref_column, ref_id: int) -> int:
|
||||
"""统计某引用对象的归属留痕总数,供分页使用。"""
|
||||
stmt = select(func.count(OwnershipChangeLog.id)).where(
|
||||
OwnershipChangeLog.owner_type == owner_type,
|
||||
ref_column == ref_id,
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def add(session: Session, log: OwnershipChangeLog) -> OwnershipChangeLog:
|
||||
"""写入一条归属变更留痕。只 flush 不 commit,与主表归属更新同事务提交。"""
|
||||
session.add(log)
|
||||
session.flush()
|
||||
return log
|
||||
@@ -0,0 +1,242 @@
|
||||
"""计提参数数据访问。
|
||||
|
||||
本层只 flush 不 commit —— 事务边界由 services 层控制。
|
||||
时点化解析查询(窗口函数版)留存 db/queries/计提参数.sql。
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
|
||||
from sqlalchemy import Select, delete, func, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models import ParamChangeBatch, ParamDefinition, ParamValue
|
||||
|
||||
# ==================== 读取 ====================
|
||||
|
||||
|
||||
def resolve_values(session: Session, biz_date: date) -> list[tuple[str, str, str, date]]:
|
||||
"""时点化解析:每个 (param_id, dimension_value) 取生效日期 <= 业务日期的最新条目。
|
||||
|
||||
排序 (effective_date DESC, id DESC) 保证同日多次变更取最新一条
|
||||
(不设日期唯一键,同日修正是合法留痕)。仅返回启用状态的参数定义。
|
||||
返回 (param_code, dimension_value, value_text, effective_date)。
|
||||
"""
|
||||
row_number = (
|
||||
func.row_number()
|
||||
.over(
|
||||
partition_by=(ParamValue.param_id, ParamValue.dimension_value),
|
||||
order_by=(ParamValue.effective_date.desc(), ParamValue.id.desc()),
|
||||
)
|
||||
.label("rn")
|
||||
)
|
||||
subq = (
|
||||
select(
|
||||
ParamDefinition.param_code.label("param_code"),
|
||||
ParamValue.dimension_value.label("dimension_value"),
|
||||
ParamValue.value_text.label("value_text"),
|
||||
ParamValue.effective_date.label("effective_date"),
|
||||
row_number,
|
||||
)
|
||||
.join(ParamDefinition, ParamDefinition.id == ParamValue.param_id)
|
||||
.where(ParamValue.effective_date <= biz_date, ParamDefinition.status == 1)
|
||||
.subquery()
|
||||
)
|
||||
stmt = select(
|
||||
subq.c.param_code, subq.c.dimension_value, subq.c.value_text, subq.c.effective_date
|
||||
).where(subq.c.rn == 1)
|
||||
return [
|
||||
(row.param_code, row.dimension_value, row.value_text, row.effective_date)
|
||||
for row in session.execute(stmt)
|
||||
]
|
||||
|
||||
|
||||
def latest_value_before(
|
||||
session: Session, param_id: int, dimension_value: str, biz_date: date
|
||||
) -> ParamValue | None:
|
||||
"""取某参数某维度在业务日期(含)之前的最新条目 —— 提交变更时记录「旧值」。"""
|
||||
stmt = (
|
||||
select(ParamValue)
|
||||
.where(
|
||||
ParamValue.param_id == param_id,
|
||||
ParamValue.dimension_value == dimension_value,
|
||||
ParamValue.effective_date <= biz_date,
|
||||
)
|
||||
.order_by(ParamValue.effective_date.desc(), ParamValue.id.desc())
|
||||
.limit(1)
|
||||
)
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
|
||||
|
||||
def list_definitions(session: Session, *, status: int | None = None) -> list[ParamDefinition]:
|
||||
"""参数定义列表(目录)。"""
|
||||
stmt = select(ParamDefinition).order_by(ParamDefinition.sort_order, ParamDefinition.id)
|
||||
if status is not None:
|
||||
stmt = stmt.where(ParamDefinition.status == status)
|
||||
return list(session.execute(stmt).scalars())
|
||||
|
||||
|
||||
def get_definition_by_code(session: Session, param_code: str) -> ParamDefinition | None:
|
||||
"""按编码取参数定义。"""
|
||||
stmt = select(ParamDefinition).where(ParamDefinition.param_code == param_code)
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
|
||||
|
||||
def list_definitions_by_codes(
|
||||
session: Session, param_codes: list[str]
|
||||
) -> dict[str, ParamDefinition]:
|
||||
"""按编码批量取参数定义(提交批次的校验段用,消除逐条 N+1)。
|
||||
|
||||
返回 {编码: 定义};未定义的编码不在结果中,由调用方判缺失。
|
||||
"""
|
||||
if not param_codes:
|
||||
return {}
|
||||
rows = session.execute(
|
||||
select(ParamDefinition).where(ParamDefinition.param_code.in_(param_codes))
|
||||
).scalars()
|
||||
return {definition.param_code: definition for definition in rows}
|
||||
|
||||
|
||||
def list_history(
|
||||
session: Session,
|
||||
param_id: int,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
dimension_value: str | None = None,
|
||||
) -> list[tuple[ParamValue, ParamChangeBatch]]:
|
||||
"""单参数的版本历史(含批次信息),最新在前。"""
|
||||
stmt = _history_stmt(session, param_id, dimension_value=dimension_value)
|
||||
return [(value, batch) for value, batch in session.execute(stmt.offset(offset).limit(limit))]
|
||||
|
||||
|
||||
def count_history(session: Session, param_id: int, *, dimension_value: str | None = None) -> int:
|
||||
"""统计单参数的历史条目数。"""
|
||||
stmt = select(func.count()).select_from(
|
||||
_history_stmt(session, param_id, dimension_value=dimension_value).subquery()
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def _history_stmt(session: Session, param_id: int, *, dimension_value: str | None) -> Select:
|
||||
"""历史查询基语句:条目 join 批次(版本号/操作人),最新在前。"""
|
||||
stmt = (
|
||||
select(ParamValue, ParamChangeBatch)
|
||||
.join(ParamChangeBatch, ParamChangeBatch.id == ParamValue.batch_id)
|
||||
.where(ParamValue.param_id == param_id)
|
||||
.order_by(ParamValue.effective_date.desc(), ParamValue.id.desc())
|
||||
)
|
||||
if dimension_value is not None:
|
||||
stmt = stmt.where(ParamValue.dimension_value == dimension_value)
|
||||
return stmt
|
||||
|
||||
|
||||
# ==================== 批次 ====================
|
||||
|
||||
|
||||
def create_batch(session: Session, batch: ParamChangeBatch) -> ParamChangeBatch:
|
||||
"""新增变更批次。只 flush 以取得自增 id。"""
|
||||
session.add(batch)
|
||||
session.flush()
|
||||
return batch
|
||||
|
||||
|
||||
def get_batch_by_id(
|
||||
session: Session, batch_id: int, *, for_update: bool = False
|
||||
) -> ParamChangeBatch | None:
|
||||
"""按主键取批次。撤回校验走 ``for_update`` 锁行(防并发双撤)。"""
|
||||
if for_update:
|
||||
stmt = select(ParamChangeBatch).where(ParamChangeBatch.id == batch_id).with_for_update()
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
return session.get(ParamChangeBatch, batch_id)
|
||||
|
||||
|
||||
def list_batches(
|
||||
session: Session,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
start_date: date | None = None,
|
||||
end_date: date | None = None,
|
||||
) -> list[ParamChangeBatch]:
|
||||
"""分页查询变更批次(按创建时间倒序)。"""
|
||||
stmt = _batch_filters(select(ParamChangeBatch), start_date=start_date, end_date=end_date)
|
||||
return list(
|
||||
session.execute(
|
||||
stmt.order_by(ParamChangeBatch.create_time.desc(), ParamChangeBatch.id.desc())
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
def count_batches(
|
||||
session: Session, *, start_date: date | None = None, end_date: date | None = None
|
||||
) -> int:
|
||||
"""统计符合条件的批次总数。"""
|
||||
stmt = _batch_filters(
|
||||
select(func.count(ParamChangeBatch.id)), start_date=start_date, end_date=end_date
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def _batch_filters(stmt: Select, *, start_date: date | None, end_date: date | None) -> Select:
|
||||
"""批次筛选(生效日期区间,含边界)。列表与计数共用。"""
|
||||
if start_date is not None:
|
||||
stmt = stmt.where(ParamChangeBatch.effective_date >= start_date)
|
||||
if end_date is not None:
|
||||
stmt = stmt.where(ParamChangeBatch.effective_date <= end_date)
|
||||
return stmt
|
||||
|
||||
|
||||
def list_values_by_batch(
|
||||
session: Session, batch_id: int
|
||||
) -> list[tuple[ParamValue, ParamDefinition]]:
|
||||
"""批次内全部条目(join 参数定义取编码/名称),按 id 排序。"""
|
||||
stmt = (
|
||||
select(ParamValue, ParamDefinition)
|
||||
.join(ParamDefinition, ParamDefinition.id == ParamValue.param_id)
|
||||
.where(ParamValue.batch_id == batch_id)
|
||||
.order_by(ParamValue.id)
|
||||
)
|
||||
return [(value, definition) for value, definition in session.execute(stmt)]
|
||||
|
||||
|
||||
def delete_values_by_batch(session: Session, batch_id: int) -> None:
|
||||
"""删除批次下全部条目(撤回未生效批次时使用,2.0 风格 delete 语句)。"""
|
||||
session.execute(delete(ParamValue).where(ParamValue.batch_id == batch_id))
|
||||
|
||||
|
||||
def delete_batch(session: Session, batch: ParamChangeBatch) -> None:
|
||||
"""删除批次本体(调用方须先删条目并完成保护校验)。"""
|
||||
session.delete(batch)
|
||||
session.flush()
|
||||
|
||||
|
||||
# ==================== 写入 ====================
|
||||
|
||||
|
||||
def create_value(session: Session, value: ParamValue) -> ParamValue:
|
||||
"""新增版本条目(append-only,禁改禁删已生效条目)。只 flush。"""
|
||||
session.add(value)
|
||||
session.flush()
|
||||
return value
|
||||
|
||||
|
||||
# ==================== 导出 ====================
|
||||
|
||||
|
||||
def list_export_rows(
|
||||
session: Session, *, start_date: date | None = None, end_date: date | None = None
|
||||
) -> list[tuple[ParamChangeBatch, ParamValue, ParamDefinition]]:
|
||||
"""导出行:批次 × 条目 × 定义(变更人/时间/参数/维度/旧值/新值/生效日期)。"""
|
||||
stmt = (
|
||||
select(ParamChangeBatch, ParamValue, ParamDefinition)
|
||||
.join(ParamValue, ParamValue.batch_id == ParamChangeBatch.id)
|
||||
.join(ParamDefinition, ParamDefinition.id == ParamValue.param_id)
|
||||
.order_by(ParamChangeBatch.create_time.desc(), ParamChangeBatch.id.desc(), ParamValue.id)
|
||||
)
|
||||
if start_date is not None:
|
||||
stmt = stmt.where(ParamChangeBatch.effective_date >= start_date)
|
||||
if end_date is not None:
|
||||
stmt = stmt.where(ParamChangeBatch.effective_date <= end_date)
|
||||
return [(batch, value, definition) for batch, value, definition in session.execute(stmt)]
|
||||
@@ -0,0 +1,209 @@
|
||||
"""营销人员数据访问(含辐射区域与拓展计划子表)。
|
||||
|
||||
本层只 flush 不 commit —— 事务边界由 services 层控制。
|
||||
"""
|
||||
|
||||
from sqlalchemy import Row, Select, func, select
|
||||
from sqlalchemy import delete as sa_delete
|
||||
from sqlalchemy.orm import Session, aliased
|
||||
|
||||
from app.models import BusinessRole, Customer, Personnel, PersonnelPlan, PersonnelRegion
|
||||
from app.repositories.query_utils import fuzzy
|
||||
|
||||
# 自引用别名:manager_id 指向 personnel.id,同一张表自联取「直属经理姓名」
|
||||
_manager = aliased(Personnel)
|
||||
|
||||
# ==================== 读取 ====================
|
||||
|
||||
|
||||
def get_by_id(session: Session, personnel_id: int, *, for_update: bool = False) -> Personnel | None:
|
||||
"""按主键查询。删除校验走 ``for_update`` 锁行(同 business_role_repository 的理由)。"""
|
||||
if for_update:
|
||||
stmt = select(Personnel).where(Personnel.id == personnel_id).with_for_update()
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
return session.get(Personnel, personnel_id)
|
||||
|
||||
|
||||
def get_with_names(session: Session, personnel_id: int) -> Row | None:
|
||||
"""查单个人员并带出岗位名称与直属经理姓名(详情/编辑回显共用)。"""
|
||||
stmt = _base_select().where(Personnel.id == personnel_id)
|
||||
return session.execute(stmt).first()
|
||||
|
||||
|
||||
def list_personnel(
|
||||
session: Session,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
keyword: str | None = None,
|
||||
status: int | None = None,
|
||||
business_role_id: int | None = None,
|
||||
) -> list[Row]:
|
||||
"""分页查询人员,行内容为 (人员, 岗位名称, 直属经理姓名)。
|
||||
|
||||
排序按 id 倒序:人员无排序字段,新增的靠前符合列表页习惯。
|
||||
"""
|
||||
stmt = _apply_filters(
|
||||
_base_select(), keyword=keyword, status=status, business_role_id=business_role_id
|
||||
)
|
||||
stmt = stmt.order_by(Personnel.id.desc()).offset(offset).limit(limit)
|
||||
return list(session.execute(stmt).all())
|
||||
|
||||
|
||||
def count_personnel(
|
||||
session: Session,
|
||||
*,
|
||||
keyword: str | None = None,
|
||||
status: int | None = None,
|
||||
business_role_id: int | None = None,
|
||||
) -> int:
|
||||
"""统计符合条件的人员总数,供分页使用。
|
||||
|
||||
筛选条件全部落在主表上,计数无需 join(列表与计数的筛选口径由
|
||||
``_apply_filters`` 单点保证)。
|
||||
"""
|
||||
stmt = _apply_filters(
|
||||
select(func.count(Personnel.id)),
|
||||
keyword=keyword,
|
||||
status=status,
|
||||
business_role_id=business_role_id,
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def count_team_members(session: Session, manager_ids: list[int]) -> dict[int, int]:
|
||||
"""按直属经理批量统计团队成员数(删除保护的依据)。
|
||||
|
||||
一次 GROUP BY 完成,禁止调用方在列表循环内逐行查询。
|
||||
"""
|
||||
stmt = (
|
||||
select(Personnel.manager_id, func.count(Personnel.id))
|
||||
.where(Personnel.manager_id.in_(manager_ids))
|
||||
.group_by(Personnel.manager_id)
|
||||
)
|
||||
return {int(manager_id): int(count) for manager_id, count in session.execute(stmt).all()}
|
||||
|
||||
|
||||
def count_customer_ownerships(session: Session, personnel_ids: list[int]) -> dict[int, int]:
|
||||
"""按归属人员批量统计客户数(删除保护的另一半依据)。"""
|
||||
stmt = (
|
||||
select(Customer.owner_personnel_id, func.count(Customer.id))
|
||||
.where(Customer.owner_personnel_id.in_(personnel_ids))
|
||||
.group_by(Customer.owner_personnel_id)
|
||||
)
|
||||
return {int(owner_id): int(count) for owner_id, count in session.execute(stmt).all()}
|
||||
|
||||
|
||||
def count_business_roles_refs(session: Session, personnel_ids: list[int]) -> dict[int, int]:
|
||||
"""按人员批量统计业务单据归属引用(负责/协助合计;业务表就位后补齐的检查)。
|
||||
|
||||
businesses.owner/assistant_personnel_id 均为 RESTRICT 外键——漏检会让
|
||||
「删除被业务引用的人员」以 500 暴露而非可读的 400。
|
||||
"""
|
||||
|
||||
from app.models import Business
|
||||
|
||||
owner = (
|
||||
select(Business.owner_personnel_id, func.count(Business.id))
|
||||
.where(Business.owner_personnel_id.in_(personnel_ids))
|
||||
.group_by(Business.owner_personnel_id)
|
||||
)
|
||||
assistant = (
|
||||
select(Business.assistant_personnel_id, func.count(Business.id))
|
||||
.where(Business.assistant_personnel_id.in_(personnel_ids))
|
||||
.group_by(Business.assistant_personnel_id)
|
||||
)
|
||||
refs: dict[int, int] = {}
|
||||
for stmt in (owner, assistant):
|
||||
for owner_id, count in session.execute(stmt).all():
|
||||
if owner_id is not None:
|
||||
refs[int(owner_id)] = refs.get(int(owner_id), 0) + int(count)
|
||||
return refs
|
||||
|
||||
|
||||
def list_regions(session: Session, personnel_id: int) -> list[PersonnelRegion]:
|
||||
"""查人员的全部辐射区域,按插入顺序返回。"""
|
||||
stmt = (
|
||||
select(PersonnelRegion)
|
||||
.where(PersonnelRegion.personnel_id == personnel_id)
|
||||
.order_by(PersonnelRegion.id)
|
||||
)
|
||||
return list(session.execute(stmt).scalars())
|
||||
|
||||
|
||||
def list_plans(session: Session, personnel_id: int) -> list[PersonnelPlan]:
|
||||
"""查人员的全部拓展计划,按插入顺序返回。"""
|
||||
stmt = (
|
||||
select(PersonnelPlan)
|
||||
.where(PersonnelPlan.personnel_id == personnel_id)
|
||||
.order_by(PersonnelPlan.id)
|
||||
)
|
||||
return list(session.execute(stmt).scalars())
|
||||
|
||||
|
||||
def _base_select() -> Select:
|
||||
"""人员主表联岗位名称与直属经理姓名。
|
||||
|
||||
岗位外键非空,但统一用 outerjoin:岗位行被物理删除的脏数据不应让
|
||||
整个列表查不出来(外键 RESTRICT 正常情况下不会发生)。
|
||||
"""
|
||||
return (
|
||||
select(Personnel, BusinessRole.role_name, _manager.personnel_name)
|
||||
.outerjoin(BusinessRole, Personnel.business_role_id == BusinessRole.id)
|
||||
.outerjoin(_manager, Personnel.manager_id == _manager.id)
|
||||
)
|
||||
|
||||
|
||||
def _apply_filters(
|
||||
stmt: Select,
|
||||
*,
|
||||
keyword: str | None,
|
||||
status: int | None,
|
||||
business_role_id: int | None,
|
||||
) -> Select:
|
||||
"""应用通用筛选条件。列表与计数共用,避免两处口径不一致。"""
|
||||
if keyword:
|
||||
stmt = fuzzy(stmt, Personnel.personnel_name, keyword)
|
||||
if status is not None:
|
||||
stmt = stmt.where(Personnel.status == status)
|
||||
if business_role_id is not None:
|
||||
stmt = stmt.where(Personnel.business_role_id == business_role_id)
|
||||
return stmt
|
||||
|
||||
|
||||
# ==================== 写入 ====================
|
||||
|
||||
|
||||
def create(session: Session, personnel: Personnel) -> Personnel:
|
||||
"""新增人员。只 flush 以取得自增 id。"""
|
||||
session.add(personnel)
|
||||
session.flush()
|
||||
return personnel
|
||||
|
||||
|
||||
def delete(session: Session, personnel: Personnel) -> None:
|
||||
"""删除人员。调用方须先完成引用保护校验。"""
|
||||
session.delete(personnel)
|
||||
session.flush()
|
||||
|
||||
|
||||
def replace_regions(session: Session, personnel_id: int, rows: list[PersonnelRegion]) -> None:
|
||||
"""全量替换人员的辐射区域。
|
||||
|
||||
**先删、立即 flush、再插入**:同一 flush 内 SQLAlchemy 先执行 INSERT
|
||||
后执行 DELETE,新旧行并存会在带唯一键的表上撞 1062 —— M1 的
|
||||
replace_roles 在 e2e 中踩过此坑。本表当前无唯一键,仍统一按防御写法,
|
||||
避免后续加约束时翻车。
|
||||
"""
|
||||
session.execute(sa_delete(PersonnelRegion).where(PersonnelRegion.personnel_id == personnel_id))
|
||||
session.flush()
|
||||
session.add_all(rows)
|
||||
session.flush()
|
||||
|
||||
|
||||
def replace_plans(session: Session, personnel_id: int, rows: list[PersonnelPlan]) -> None:
|
||||
"""全量替换人员的拓展计划(防御写法同 ``replace_regions``)。"""
|
||||
session.execute(sa_delete(PersonnelPlan).where(PersonnelPlan.personnel_id == personnel_id))
|
||||
session.flush()
|
||||
session.add_all(rows)
|
||||
session.flush()
|
||||
@@ -0,0 +1,135 @@
|
||||
"""产品主数据数据访问。
|
||||
|
||||
本层只 flush 不 commit —— 事务边界由 services 层控制。
|
||||
"""
|
||||
|
||||
from sqlalchemy import Select, func, or_, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models import BusinessItem, Product, ShipmentItem
|
||||
|
||||
# ==================== 读取 ====================
|
||||
|
||||
|
||||
def get_by_id(session: Session, product_id: int, *, for_update: bool = False) -> Product | None:
|
||||
"""按主键查询。删除校验走 ``for_update`` 锁行(同 business_role_repository
|
||||
的理由:校验与删除之间若发生并发引用,锁行使并发写入可见地失败,
|
||||
而非引用被静默悬空)。"""
|
||||
if for_update:
|
||||
stmt = select(Product).where(Product.id == product_id).with_for_update()
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
return session.get(Product, product_id)
|
||||
|
||||
|
||||
def get_by_name_spec(session: Session, product_name: str, spec_model: str) -> Product | None:
|
||||
"""按 (名称, 规格型号) 组合查询。
|
||||
|
||||
组合是 uk_products_name_spec 唯一键的键值,先查用于给出即时业务提示;
|
||||
并发窗口仍存在,最终由 IntegrityError 兜底(见 product_service)。
|
||||
"""
|
||||
stmt = select(Product).where(
|
||||
Product.product_name == product_name,
|
||||
Product.spec_model == spec_model,
|
||||
)
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
|
||||
|
||||
def list_products(
|
||||
session: Session,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
keyword: str | None = None,
|
||||
product_category: str | None = None,
|
||||
status: int | None = None,
|
||||
) -> list[Product]:
|
||||
"""分页查询产品(含停用)。按 id 升序,与 M1 岗位列表的次序口径一致。"""
|
||||
stmt = _apply_filters(
|
||||
select(Product),
|
||||
keyword=keyword,
|
||||
product_category=product_category,
|
||||
status=status,
|
||||
)
|
||||
stmt = stmt.order_by(Product.id).offset(offset).limit(limit)
|
||||
return list(session.execute(stmt).scalars())
|
||||
|
||||
|
||||
def count_products(
|
||||
session: Session,
|
||||
*,
|
||||
keyword: str | None = None,
|
||||
product_category: str | None = None,
|
||||
status: int | None = None,
|
||||
) -> int:
|
||||
"""统计符合条件的产品总数,供分页使用。"""
|
||||
stmt = _apply_filters(
|
||||
select(func.count(Product.id)),
|
||||
keyword=keyword,
|
||||
product_category=product_category,
|
||||
status=status,
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def _apply_filters(
|
||||
stmt: Select,
|
||||
*,
|
||||
keyword: str | None,
|
||||
product_category: str | None,
|
||||
status: int | None,
|
||||
) -> Select:
|
||||
"""应用通用筛选条件。列表与计数共用,避免两处口径不一致。
|
||||
|
||||
关键词对名称/规格两列取 OR 命中。转义与 query_utils.fuzzy 同一机制
|
||||
(``contains(autoescape=True)`` 转义 LIKE 通配符并附加 ESCAPE 子句);
|
||||
因 fuzzy 是单列 where 语义(两次调用会叠加成 AND),双列 OR 在此直接
|
||||
写 contains —— M1 business_role_repository 的双列关键词同款写法。
|
||||
规格型号常含 ``_``(如 DN300_II),不转义会当单字符通配执行。
|
||||
"""
|
||||
if keyword:
|
||||
stmt = stmt.where(
|
||||
or_(
|
||||
Product.product_name.contains(keyword, autoescape=True),
|
||||
Product.spec_model.contains(keyword, autoescape=True),
|
||||
)
|
||||
)
|
||||
if product_category:
|
||||
stmt = stmt.where(Product.product_category == product_category)
|
||||
if status is not None:
|
||||
stmt = stmt.where(Product.status == status)
|
||||
return stmt
|
||||
|
||||
|
||||
def count_refs(session: Session, product_id: int) -> int:
|
||||
"""统计引用该产品的业务明细与发货明细行数(删除保护,business_id 先例)。
|
||||
|
||||
两张明细表对 products 均 RESTRICT 外键:先查给出可读的 400;校验与
|
||||
删除之间的并发引用由锁行 + FK 兜底(service 层再翻译 IntegrityError)。
|
||||
"""
|
||||
stmt = select(
|
||||
select(func.count())
|
||||
.select_from(BusinessItem)
|
||||
.where(BusinessItem.product_id == product_id)
|
||||
.scalar_subquery()
|
||||
+ select(func.count())
|
||||
.select_from(ShipmentItem)
|
||||
.where(ShipmentItem.product_id == product_id)
|
||||
.scalar_subquery()
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
# ==================== 写入 ====================
|
||||
|
||||
|
||||
def create(session: Session, product: Product) -> Product:
|
||||
"""新增产品。只 flush 以取得自增 id。"""
|
||||
session.add(product)
|
||||
session.flush()
|
||||
return product
|
||||
|
||||
|
||||
def delete(session: Session, product: Product) -> None:
|
||||
"""物理删除产品。调用方须先完成引用保护校验(count_refs + FK 兜底)。"""
|
||||
session.delete(product)
|
||||
session.flush()
|
||||
@@ -0,0 +1,65 @@
|
||||
"""客户评级等级配置数据访问。
|
||||
|
||||
本层只 flush 不 commit —— 事务边界由 services 层控制。
|
||||
"""
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models import CustomerRatingGrade
|
||||
|
||||
# ==================== 读取 ====================
|
||||
|
||||
|
||||
def list_all(session: Session, *, for_update: bool = False) -> list[CustomerRatingGrade]:
|
||||
"""全量等级,按 sort_order 升序、id 兜底(同序次序稳定)。
|
||||
|
||||
不分页:等级映射是判定表,数量个位数,分页无意义。
|
||||
|
||||
for_update 供区间重叠判定使用:先查后写在无锁时,两管理员并发提交
|
||||
重叠区间会互判不重叠而双双入库(区间重叠无唯一键可拦)——锁全表行
|
||||
串行化并发的重叠判定(先到者提交后,后到者在锁下读到新区间即判重叠)。
|
||||
只读直出(list_grades)不加锁。
|
||||
"""
|
||||
stmt = select(CustomerRatingGrade).order_by(
|
||||
CustomerRatingGrade.sort_order, CustomerRatingGrade.id
|
||||
)
|
||||
if for_update:
|
||||
stmt = stmt.with_for_update()
|
||||
return list(session.execute(stmt).scalars())
|
||||
|
||||
|
||||
def get_by_id(session: Session, grade_id: int) -> CustomerRatingGrade | None:
|
||||
"""按主键查询。
|
||||
|
||||
等级表无下游引用(评级是纯计算器不落评分记录),无需 ``for_update``
|
||||
锁行 —— product_repository 锁行防的是并发引用悬空,此处不存在该风险。
|
||||
"""
|
||||
return session.get(CustomerRatingGrade, grade_id)
|
||||
|
||||
|
||||
def get_by_name(session: Session, grade_name: str) -> CustomerRatingGrade | None:
|
||||
"""按等级名称查询。
|
||||
|
||||
grade_name 是 uk_customer_rating_grades_grade_name 唯一键的键值,先查
|
||||
用于给出即时业务提示;并发窗口仍存在,最终由 IntegrityError 兜底
|
||||
(见 rating_service)。
|
||||
"""
|
||||
stmt = select(CustomerRatingGrade).where(CustomerRatingGrade.grade_name == grade_name)
|
||||
return session.execute(stmt).scalar_one_or_none()
|
||||
|
||||
|
||||
# ==================== 写入 ====================
|
||||
|
||||
|
||||
def create(session: Session, grade: CustomerRatingGrade) -> CustomerRatingGrade:
|
||||
"""新增等级。只 flush 以取得自增 id。"""
|
||||
session.add(grade)
|
||||
session.flush()
|
||||
return grade
|
||||
|
||||
|
||||
def delete(session: Session, grade: CustomerRatingGrade) -> None:
|
||||
"""物理删除等级。等级表无下游引用,调用方无需引用保护校验。"""
|
||||
session.delete(grade)
|
||||
session.flush()
|
||||
@@ -0,0 +1,125 @@
|
||||
"""回款数据访问:回款行与关联引用(业务号/发货单号/发货日)。
|
||||
|
||||
只读写数据并 flush;commit/rollback 与业务异常一律在 service 层。
|
||||
|
||||
- 列表与详情统一 join 出 ``business_no / shipment_no / ship_date``,
|
||||
ship_date 供 service 按 ``formula.payment_days`` 派生回款天数 —— 关联
|
||||
引用经本层查询一次供给,service 不再对发货单二次查询
|
||||
- shipment_id 是手动指定(可空),发货单关联一律 outerjoin
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
|
||||
from sqlalchemy import Select, func, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models import Business, Receipt, Shipment
|
||||
|
||||
|
||||
def get_by_id(session: Session, receipt_id: int) -> Receipt | None:
|
||||
"""按主键取回款行(供摘要预取与状态判定;不锁行,写保护锚在业务行)。"""
|
||||
return session.get(Receipt, receipt_id)
|
||||
|
||||
|
||||
def get_with_refs(
|
||||
session: Session, receipt_id: int
|
||||
) -> tuple[Receipt, str, str | None, date | None] | None:
|
||||
"""回款行 + 业务号 + 发货单号 + 发货日(DTO 与 payment_days 派生共用)。
|
||||
|
||||
business 主表为 inner join(FK NOT NULL,业务与回款同存亡);发货单
|
||||
可未指定,outerjoin 后 shipment_no / ship_date 可能为 None。
|
||||
"""
|
||||
row = session.execute(
|
||||
select(Receipt, Business.business_no, Shipment.shipment_no, Shipment.ship_date)
|
||||
.join(Business, Business.id == Receipt.business_id)
|
||||
.outerjoin(Shipment, Shipment.id == Receipt.shipment_id)
|
||||
.where(Receipt.id == receipt_id)
|
||||
).first()
|
||||
return row
|
||||
|
||||
|
||||
def get_shipment(session: Session, shipment_id: int) -> Shipment | None:
|
||||
"""按主键取发货单(同业务强校验的只读预查;FK RESTRICT 为最终防线)。"""
|
||||
return session.get(Shipment, shipment_id)
|
||||
|
||||
|
||||
def _apply_filters(
|
||||
stmt: Select,
|
||||
*,
|
||||
business_id: int | None,
|
||||
date_from: date | None,
|
||||
date_to: date | None,
|
||||
is_barter: int | None,
|
||||
settlement_status: int | None,
|
||||
) -> Select:
|
||||
"""回款列表的筛选条件(全部落在 Receipt 自身列上)。"""
|
||||
if business_id is not None:
|
||||
stmt = stmt.where(Receipt.business_id == business_id)
|
||||
if date_from is not None:
|
||||
stmt = stmt.where(Receipt.receipt_date >= date_from)
|
||||
if date_to is not None:
|
||||
stmt = stmt.where(Receipt.receipt_date <= date_to)
|
||||
if is_barter is not None:
|
||||
stmt = stmt.where(Receipt.is_barter == is_barter)
|
||||
if settlement_status is not None:
|
||||
stmt = stmt.where(Receipt.settlement_status == settlement_status)
|
||||
return stmt
|
||||
|
||||
|
||||
def list_receipts(
|
||||
session: Session,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
business_id: int | None,
|
||||
date_from: date | None,
|
||||
date_to: date | None,
|
||||
is_barter: int | None,
|
||||
settlement_status: int | None,
|
||||
) -> list[tuple[Receipt, str, str | None, date | None]]:
|
||||
"""分页查询回款(附业务号/发货单号/发货日),按 id 倒序。"""
|
||||
stmt = _apply_filters(
|
||||
select(Receipt, Business.business_no, Shipment.shipment_no, Shipment.ship_date)
|
||||
.join(Business, Business.id == Receipt.business_id)
|
||||
.outerjoin(Shipment, Shipment.id == Receipt.shipment_id),
|
||||
business_id=business_id,
|
||||
date_from=date_from,
|
||||
date_to=date_to,
|
||||
is_barter=is_barter,
|
||||
settlement_status=settlement_status,
|
||||
)
|
||||
return list(session.execute(stmt.order_by(Receipt.id.desc()).offset(offset).limit(limit)).all())
|
||||
|
||||
|
||||
def count_receipts(
|
||||
session: Session,
|
||||
*,
|
||||
business_id: int | None,
|
||||
date_from: date | None,
|
||||
date_to: date | None,
|
||||
is_barter: int | None,
|
||||
settlement_status: int | None,
|
||||
) -> int:
|
||||
"""回款总数(筛选条件与列表共用同一 apply_filters,防两侧口径漂移)。"""
|
||||
stmt = _apply_filters(
|
||||
select(func.count()).select_from(Receipt),
|
||||
business_id=business_id,
|
||||
date_from=date_from,
|
||||
date_to=date_to,
|
||||
is_barter=is_barter,
|
||||
settlement_status=settlement_status,
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def create(session: Session, receipt: Receipt) -> Receipt:
|
||||
"""新增回款行。只 flush 以取得自增 id,编号唯一键冲突由 service 兜底。"""
|
||||
session.add(receipt)
|
||||
session.flush()
|
||||
return receipt
|
||||
|
||||
|
||||
def delete(session: Session, receipt: Receipt) -> None:
|
||||
"""物理删除回款行(已核算与否的准入判定在 service 层)。"""
|
||||
session.delete(receipt)
|
||||
session.flush()
|
||||
@@ -0,0 +1,143 @@
|
||||
"""发货数据访问:发货单行、明细行与业务号关联引用。
|
||||
|
||||
只读写数据并 flush;commit/rollback 与业务异常一律在 service 层。
|
||||
|
||||
- 列表与详情统一 join 出 ``business_no``(业务主表 inner join,FK NOT
|
||||
NULL,业务与发货单同存亡)
|
||||
- 明细行汇总(sum_item_amount)是发货单 total_amount 重算的唯一数据源,
|
||||
业务级汇总仍收口 business_service._recalc_totals
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import Select, delete, func, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models import Business, Receipt, Shipment, ShipmentItem
|
||||
|
||||
|
||||
def get_by_id(session: Session, shipment_id: int) -> Shipment | None:
|
||||
"""按主键取发货单行(供摘要预取与编辑赋值;不锁行,写保护锚在业务行)。"""
|
||||
return session.get(Shipment, shipment_id)
|
||||
|
||||
|
||||
def get_with_business_no(session: Session, shipment_id: int) -> tuple[Shipment, str] | None:
|
||||
"""发货单行 + 业务号(DTO 与审计摘要共用)。"""
|
||||
return session.execute(
|
||||
select(Shipment, Business.business_no)
|
||||
.join(Business, Business.id == Shipment.business_id)
|
||||
.where(Shipment.id == shipment_id)
|
||||
).first()
|
||||
|
||||
|
||||
def _apply_filters(
|
||||
stmt: Select,
|
||||
*,
|
||||
business_id: int | None,
|
||||
ship_date_from: date | None,
|
||||
ship_date_to: date | None,
|
||||
) -> Select:
|
||||
"""发货列表的筛选条件(business_id 空=全量,一期按业务维度查看为主)。"""
|
||||
if business_id is not None:
|
||||
stmt = stmt.where(Shipment.business_id == business_id)
|
||||
if ship_date_from is not None:
|
||||
stmt = stmt.where(Shipment.ship_date >= ship_date_from)
|
||||
if ship_date_to is not None:
|
||||
stmt = stmt.where(Shipment.ship_date <= ship_date_to)
|
||||
return stmt
|
||||
|
||||
|
||||
def list_shipments(
|
||||
session: Session,
|
||||
*,
|
||||
offset: int,
|
||||
limit: int,
|
||||
business_id: int | None,
|
||||
ship_date_from: date | None,
|
||||
ship_date_to: date | None,
|
||||
) -> list[tuple[Shipment, str]]:
|
||||
"""分页查询发货单(附业务号),按 id 倒序。"""
|
||||
stmt = _apply_filters(
|
||||
select(Shipment, Business.business_no).join(Business, Business.id == Shipment.business_id),
|
||||
business_id=business_id,
|
||||
ship_date_from=ship_date_from,
|
||||
ship_date_to=ship_date_to,
|
||||
)
|
||||
return list(
|
||||
session.execute(stmt.order_by(Shipment.id.desc()).offset(offset).limit(limit)).all()
|
||||
)
|
||||
|
||||
|
||||
def count_shipments(
|
||||
session: Session,
|
||||
*,
|
||||
business_id: int | None,
|
||||
ship_date_from: date | None,
|
||||
ship_date_to: date | None,
|
||||
) -> int:
|
||||
"""发货单总数(筛选条件与列表共用同一 apply_filters,防两侧口径漂移)。"""
|
||||
stmt = _apply_filters(
|
||||
select(func.count())
|
||||
.select_from(Shipment)
|
||||
.join(Business, Business.id == Shipment.business_id),
|
||||
business_id=business_id,
|
||||
ship_date_from=ship_date_from,
|
||||
ship_date_to=ship_date_to,
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def list_items(session: Session, shipment_id: int) -> list[ShipmentItem]:
|
||||
"""发货明细行(详情回显与总金额重算共用)。"""
|
||||
return list(
|
||||
session.execute(
|
||||
select(ShipmentItem)
|
||||
.where(ShipmentItem.shipment_id == shipment_id)
|
||||
.order_by(ShipmentItem.id)
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
def sum_item_amount(session: Session, shipment_id: int) -> Decimal | None:
|
||||
"""明细行金额合计(发货单 total_amount 重算的唯一数据源)。"""
|
||||
return session.execute(
|
||||
select(func.sum(ShipmentItem.amount)).where(ShipmentItem.shipment_id == shipment_id)
|
||||
).scalar_one()
|
||||
|
||||
|
||||
def count_receipt_refs(session: Session, shipment_id: int) -> int:
|
||||
"""被回款批次指定的引用数(删除保护依据,receipts.shipment_id)。"""
|
||||
return int(
|
||||
session.execute(
|
||||
select(func.count()).select_from(Receipt).where(Receipt.shipment_id == shipment_id)
|
||||
).scalar_one()
|
||||
)
|
||||
|
||||
|
||||
def create(session: Session, shipment: Shipment) -> Shipment:
|
||||
"""新增发货单行。只 flush 以取得自增 id,单号唯一键冲突由 service 兜底。"""
|
||||
session.add(shipment)
|
||||
session.flush()
|
||||
return shipment
|
||||
|
||||
|
||||
def replace_items(session: Session, shipment_id: int, rows: list[ShipmentItem]) -> None:
|
||||
"""全量替换明细:先删、立即 flush、再插入(business_repository 同款防御写法)。
|
||||
|
||||
同一 flush 中 SQLAlchemy 先处理 INSERT 后处理 DELETE,先删后插不落库
|
||||
会在有唯一键的表上撞键;shipment_items 虽无唯一键,统一按此写法防御。
|
||||
"""
|
||||
session.execute(delete(ShipmentItem).where(ShipmentItem.shipment_id == shipment_id))
|
||||
session.flush()
|
||||
for row in rows:
|
||||
row.shipment_id = shipment_id
|
||||
session.add(row)
|
||||
session.flush()
|
||||
|
||||
|
||||
def delete_with_items(session: Session, shipment_id: int) -> None:
|
||||
"""删除发货单及明细行(按依赖序:明细 → 主表,FK RESTRICT)。"""
|
||||
session.execute(delete(ShipmentItem).where(ShipmentItem.shipment_id == shipment_id))
|
||||
session.execute(delete(Shipment).where(Shipment.id == shipment_id))
|
||||
session.flush()
|
||||
@@ -0,0 +1,66 @@
|
||||
"""审批管理的请求/响应模型(2026-10-15 复核审批补充需求)。"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, model_validator
|
||||
|
||||
from app.core.response import PageQuery
|
||||
|
||||
|
||||
class ApprovalStepOut(BaseModel):
|
||||
"""节点记录(时间线;action=3 自动通过 operator 记「系统」)。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
node: int
|
||||
action: int
|
||||
opinion: str | None = None
|
||||
operator_id: int | None = None
|
||||
operator_name: str
|
||||
create_time: datetime
|
||||
|
||||
|
||||
class ApprovalOrderOut(BaseModel):
|
||||
"""审批单列表行。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
order_no: str
|
||||
order_type: int
|
||||
ref_id: int
|
||||
refer_no: str
|
||||
status: int
|
||||
submitter_id: int | None = None
|
||||
submitter_name: str
|
||||
create_time: datetime
|
||||
|
||||
|
||||
class ApprovalOrderDetailOut(ApprovalOrderOut):
|
||||
"""审批单详情:附节点时间线。"""
|
||||
|
||||
steps: list[ApprovalStepOut] = Field(default_factory=list)
|
||||
|
||||
|
||||
class ApprovalQuery(PageQuery):
|
||||
"""审批单列表查询条件。"""
|
||||
|
||||
keyword: str | None = Field(default=None, max_length=32, description="审批单号/引用单号,模糊")
|
||||
status: int | None = Field(default=None, ge=1, le=5, description="状态筛选")
|
||||
order_type: int | None = Field(default=None, ge=1, le=2, description="对象类型筛选")
|
||||
|
||||
|
||||
class ApprovalActionIn(BaseModel):
|
||||
"""节点动作:1 通过 / 2 驳回(驳回须填意见——空驳无从追溯)。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
action: int = Field(ge=1, le=2, description="1通过 2驳回")
|
||||
opinion: str | None = Field(default=None, max_length=255, description="审批意见")
|
||||
|
||||
@model_validator(mode="after")
|
||||
def _check_opinion(self) -> "ApprovalActionIn":
|
||||
if self.action == 2 and not self.opinion:
|
||||
raise ValueError("驳回必须填写审批意见")
|
||||
return self
|
||||
@@ -0,0 +1,396 @@
|
||||
"""业务管理的请求/响应模型(需求 2.2.1/2.2.4)。
|
||||
|
||||
金额/数量入参出参一律 str(服务层 Decimal/Fraction,全程禁 float);
|
||||
派生值(毛利润额/毛利润率/折算毛利润额)不在写接口入参内 —— 落库列只有
|
||||
源数据,派生值由毛利润视图实时计算。
|
||||
"""
|
||||
|
||||
from datetime import date, datetime
|
||||
from decimal import Decimal, InvalidOperation
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
|
||||
|
||||
from app.core.constants import (
|
||||
PRODUCT_CATEGORIES,
|
||||
PRODUCT_CATEGORY_MUNICIPAL_WATER,
|
||||
PRODUCT_CATEGORY_RAIL_TRANSIT,
|
||||
)
|
||||
from app.core.response import PageQuery
|
||||
|
||||
# DECIMAL(14,2) 容量上限:整数部分 12 位(同 personnel.py 的金额校验口径)
|
||||
AMOUNT_MAX = Decimal("999999999999.99")
|
||||
# DECIMAL(14,4) 容量上限:整数部分 10 位
|
||||
PRICE_MAX = Decimal("9999999999.9999")
|
||||
|
||||
|
||||
def _check_amount(
|
||||
value: str | None,
|
||||
label: str,
|
||||
cap: Decimal,
|
||||
allow_positive_only: bool = False,
|
||||
scale: int = 2,
|
||||
) -> str | None:
|
||||
"""字符串金额的通用校验:数字/有限/非负/容量/小数位上限。
|
||||
|
||||
小数位超限直接拒绝而非静默舍入 —— 舍入即算错钱(工资系统红线)。
|
||||
``scale`` 按列口径区分:金额/数量列 DECIMAL(14,2) 为 2;单价类列
|
||||
DECIMAL(14,4) 为 4(回显 "5000.0000" 必须能原样提交,否则任何带
|
||||
精度的历史单价都被编辑端点永远拒收)。
|
||||
"""
|
||||
if value is None:
|
||||
return None
|
||||
try:
|
||||
amount = Decimal(value)
|
||||
except InvalidOperation:
|
||||
raise ValueError(f"{label}须为有效数字") from None
|
||||
if not amount.is_finite():
|
||||
raise ValueError(f"{label}须为有效数字")
|
||||
if allow_positive_only:
|
||||
if amount <= 0:
|
||||
raise ValueError(f"{label}必须大于 0")
|
||||
elif amount < 0:
|
||||
raise ValueError(f"{label}不能为负数")
|
||||
if amount > cap:
|
||||
raise ValueError(f"{label}超出可录入上限")
|
||||
if -amount.as_tuple().exponent > scale:
|
||||
raise ValueError(f"{label}最多{'两' if scale == 2 else '四'}位小数")
|
||||
return value
|
||||
|
||||
|
||||
class BusinessItemIn(BaseModel):
|
||||
"""业务产品明细行(需求 2.2.1「支持添加多种产品,录入指导价」)。
|
||||
|
||||
product_category 保留蛇形:该值与 M1 参数维度值域同源(枚举码本就是
|
||||
蛇形);其余标识类字段驼峰兼容(snake/驼峰双入,同 customer.py 契约)。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
product_id: int | None = Field(default=None, ge=1, description="产品ID;空=自由录入")
|
||||
product_name: str = Field(min_length=1, max_length=128, description="产品名称")
|
||||
spec_model: str | None = Field(
|
||||
default=None, max_length=128, description="规格型号,空=空串归一"
|
||||
)
|
||||
unit: str | None = Field(default=None, max_length=16, description="计量单位")
|
||||
product_category: str = Field(
|
||||
description="产品类别:municipal_water/rail_transit(行级折算锚点)"
|
||||
)
|
||||
quantity: str = Field(description="数量,>0")
|
||||
sale_price: str | None = Field(default=None, description="销售单价(元)")
|
||||
cost_amount: str | None = Field(
|
||||
default=None, description="成本额(元);毛利润额 = 销售额 − 成本额"
|
||||
)
|
||||
guided_price: str | None = Field(default=None, description="指导价(元)")
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
|
||||
@field_validator("product_category")
|
||||
@classmethod
|
||||
def _check_category(cls, value: str) -> str:
|
||||
if value not in PRODUCT_CATEGORIES:
|
||||
raise ValueError("产品类别不合法")
|
||||
return value
|
||||
|
||||
@field_validator("quantity")
|
||||
@classmethod
|
||||
def _check_quantity(cls, value: str) -> str:
|
||||
return _check_amount(value, "数量", AMOUNT_MAX, allow_positive_only=True) or value
|
||||
|
||||
@field_validator("sale_price", "guided_price")
|
||||
@classmethod
|
||||
def _check_unit_prices(cls, value: str | None) -> str | None:
|
||||
"""单价类字段按 DECIMAL(14,4) 口径校验(4 位小数)。"""
|
||||
return _check_amount(value, "单价", PRICE_MAX, scale=4)
|
||||
|
||||
@field_validator("cost_amount")
|
||||
@classmethod
|
||||
def _check_cost(cls, value: str | None) -> str | None:
|
||||
return _check_amount(value, "金额", AMOUNT_MAX)
|
||||
|
||||
|
||||
class BusinessItemOut(BaseModel):
|
||||
"""业务产品明细行响应。金额/数量一律 str。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
product_id: int | None = None
|
||||
product_name: str
|
||||
spec_model: str | None = None
|
||||
unit: str | None = None
|
||||
product_category: str
|
||||
quantity: str
|
||||
sale_price: str | None = None
|
||||
sale_amount: str
|
||||
cost_amount: str | None = None
|
||||
guided_price: str | None = None
|
||||
remark: str | None = None
|
||||
|
||||
|
||||
class BusinessOut(BaseModel):
|
||||
"""业务响应(列表与写操作回包共用)。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
business_no: str
|
||||
customer_id: int
|
||||
customer_name: str | None = None
|
||||
business_date: date | None = None
|
||||
status: int = 1
|
||||
owner_personnel_id: int | None = None
|
||||
owner_personnel_name: str | None = None
|
||||
assistant_personnel_id: int | None = None
|
||||
assistant_personnel_name: str | None = None
|
||||
is_special: int = 0
|
||||
special_note: str | None = None
|
||||
total_sale_amount: str | None = None
|
||||
total_cost_amount: str | None = None
|
||||
total_ship_amount: str | None = None
|
||||
total_received_amount: str | None = None
|
||||
total_freight_amount: str | None = None
|
||||
remark: str | None = None
|
||||
|
||||
|
||||
class SecondaryAllocationIn(BaseModel):
|
||||
"""二次分配参与人入参(2026-10-15 补充需求「二次分配方案」)。
|
||||
|
||||
比例**不要求合计 100%**(需求原文):余额归属待业务澄清(待澄清 #2),
|
||||
服务层仅以 hint 展示合计/余额,不做强制校验。ratio 沿金额红线口径:
|
||||
字符串入参、两位小数、超限拒绝不静默舍入。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
personnel_id: int = Field(ge=1, description="参与业务员ID(personnel.id)")
|
||||
ratio: str = Field(description="分摊比例(0-100,两位小数)")
|
||||
|
||||
@field_validator("ratio")
|
||||
@classmethod
|
||||
def _check_ratio(cls, value: str) -> str:
|
||||
return _check_amount(value, "分摊比例", Decimal("100"), allow_positive_only=True) or value
|
||||
|
||||
|
||||
class SecondaryAllocationOut(BaseModel):
|
||||
"""二次分配参与人响应(personnel_name 冗余固化,离职后回显有名)。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
personnel_id: int
|
||||
personnel_name: str
|
||||
ratio: str
|
||||
|
||||
|
||||
def _ensure_allocations_unique(items: list["SecondaryAllocationIn"]) -> None:
|
||||
"""同一业务内参与人去重:uk(business_id, personnel_id) 的前置友好提示
|
||||
(让 400 文案说「重复参与人」而不是裸唯一键冲突)。"""
|
||||
seen: set[int] = set()
|
||||
for item in items:
|
||||
if item.personnel_id in seen:
|
||||
raise ValueError(f"二次分配参与人重复:人员ID {item.personnel_id}")
|
||||
seen.add(item.personnel_id)
|
||||
|
||||
|
||||
class BusinessDetailOut(BusinessOut):
|
||||
"""业务详情:附产品明细行与二次分配方案。"""
|
||||
|
||||
items: list[BusinessItemOut] = Field(default_factory=list)
|
||||
secondary_allocations: list[SecondaryAllocationOut] = Field(default_factory=list)
|
||||
allocation_hint: str | None = Field(
|
||||
default=None, description="方案合计与余额提示(余额归属待澄清#2,仅展示)"
|
||||
)
|
||||
|
||||
|
||||
class BusinessCreateIn(BaseModel):
|
||||
"""创建业务:主表信息 + 明细行数组(明细 ≥1 行)。
|
||||
|
||||
字段名全线蛇形直出(M1 既有契约:前端 api 封装与 schemas 同名对应,
|
||||
仅分页信封 list/pageNum 驼峰)。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
customer_id: int = Field(ge=1, description="客户ID")
|
||||
business_date: date | None = Field(default=None, description="业务日期,ISO 格式")
|
||||
owner_personnel_id: int | None = Field(
|
||||
default=None, ge=1, description="负责营销人员ID,可空=待指定"
|
||||
)
|
||||
assistant_personnel_id: int | None = Field(default=None, ge=1, description="协助营销人员ID")
|
||||
is_special: int = Field(default=0, ge=0, le=1, description="特殊业务标记:1是 0否")
|
||||
special_note: str | None = Field(default=None, max_length=255, description="特殊业务说明")
|
||||
items: list[BusinessItemIn] = Field(min_length=1, description="产品明细行,至少 1 行")
|
||||
secondary_allocations: list[SecondaryAllocationIn] = Field(
|
||||
default_factory=list, description="二次分配方案(只出现在合同刚建立时;可空)"
|
||||
)
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def _check_special_note(self) -> "BusinessCreateIn":
|
||||
"""特殊业务须有说明:标记的意义就在于可追溯「特殊在哪」。"""
|
||||
if self.is_special == 1 and not self.special_note:
|
||||
raise ValueError("特殊业务必须填写说明")
|
||||
return self
|
||||
|
||||
@model_validator(mode="after")
|
||||
def _check_allocations(self) -> "BusinessCreateIn":
|
||||
_ensure_allocations_unique(self.secondary_allocations)
|
||||
return self
|
||||
|
||||
|
||||
class BusinessUpdateIn(BaseModel):
|
||||
"""编辑业务(全量替换明细与二次分配方案;归属不在此端点调整,走 /ownership)。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
customer_id: int = Field(ge=1, description="客户ID")
|
||||
business_date: date | None = Field(default=None, description="业务日期,ISO 格式")
|
||||
owner_personnel_id: int | None = Field(
|
||||
default=None,
|
||||
ge=1,
|
||||
description="负责营销人员ID(编辑端点忽略,仅 /ownership 生效)",
|
||||
)
|
||||
assistant_personnel_id: int | None = Field(
|
||||
default=None,
|
||||
ge=1,
|
||||
description="协助营销人员ID(编辑端点忽略)",
|
||||
)
|
||||
is_special: int = Field(default=0, ge=0, le=1, description="特殊业务标记:1是 0否")
|
||||
special_note: str | None = Field(default=None, max_length=255, description="特殊业务说明")
|
||||
items: list[BusinessItemIn] = Field(
|
||||
min_length=1, description="产品明细行,至少 1 行(全量替换)"
|
||||
)
|
||||
secondary_allocations: list[SecondaryAllocationIn] = Field(
|
||||
default_factory=list, description="二次分配方案(全量替换;空数组=清空方案)"
|
||||
)
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def _check_special_note(self) -> "BusinessUpdateIn":
|
||||
if self.is_special == 1 and not self.special_note:
|
||||
raise ValueError("特殊业务必须填写说明")
|
||||
return self
|
||||
|
||||
@model_validator(mode="after")
|
||||
def _check_allocations(self) -> "BusinessUpdateIn":
|
||||
_ensure_allocations_unique(self.secondary_allocations)
|
||||
return self
|
||||
|
||||
|
||||
class BusinessStatusIn(BaseModel):
|
||||
"""状态流转:1执行中 → 2已完成 / 3已终止(终态不可再变更)。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
status: int = Field(ge=1, le=3, description="目标状态:2已完成 3已终止")
|
||||
reason: str | None = Field(default=None, max_length=255, description="变更原因(终止时必填)")
|
||||
|
||||
@model_validator(mode="after")
|
||||
def _check_reason(self) -> "BusinessStatusIn":
|
||||
if self.status == 3 and not self.reason:
|
||||
raise ValueError("终止业务必须填写原因")
|
||||
return self
|
||||
|
||||
|
||||
class BusinessOwnershipIn(BaseModel):
|
||||
"""业务归属变更(负责/协助;前后值写入留痕)。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
new_owner_personnel_id: int | None = Field(default=None, ge=1)
|
||||
new_assistant_personnel_id: int | None = Field(default=None, ge=1)
|
||||
reason: str | None = Field(default=None, max_length=255)
|
||||
|
||||
|
||||
class BusinessQuery(PageQuery):
|
||||
"""业务列表查询条件(筛选参数驼峰 alias,customer.py 同款契约)。"""
|
||||
|
||||
keyword: str | None = Field(default=None, max_length=32, description="业务编号/公司名称,模糊")
|
||||
status: int | None = Field(default=None, ge=1, le=3, description="状态筛选")
|
||||
customer_id: int | None = Field(default=None, ge=1, description="客户筛选")
|
||||
owner_personnel_id: int | None = Field(default=None, ge=1, description="负责营销人员筛选")
|
||||
date_from: date | None = Field(default=None, description="业务日期起(含)")
|
||||
date_to: date | None = Field(default=None, description="业务日期止(含)")
|
||||
|
||||
|
||||
class GrossProfitRowOut(BaseModel):
|
||||
"""毛利润视图行:行级源数据 + 派生值(实时计算,不落库)。"""
|
||||
|
||||
item_id: int
|
||||
product_category: str
|
||||
product_name: str
|
||||
spec_model: str | None = None
|
||||
quantity: str
|
||||
sale_amount: str
|
||||
cost_amount: str | None = None
|
||||
"""成本缺失(未录入)时为 None,派生列同为 None 并置 missing_reason"""
|
||||
profit_amount: str | None = None
|
||||
profit_rate: str | None = None
|
||||
threshold: str
|
||||
converted_profit: str | None = None
|
||||
missing_reason: str | None = None
|
||||
|
||||
|
||||
class GrossProfitCategoryOut(BaseModel):
|
||||
"""按产品类别的毛利润汇总(可计算行聚合;成本缺失行不计入)。"""
|
||||
|
||||
product_category: str
|
||||
sale_amount: str
|
||||
cost_amount: str
|
||||
profit_amount: str
|
||||
profit_rate: str
|
||||
threshold: str
|
||||
converted_profit: str
|
||||
|
||||
|
||||
class GrossProfitOut(BaseModel):
|
||||
"""毛利润数据视图(需求 2.2.4):行级 + 类别汇总。
|
||||
|
||||
口径注释(前端须展示):毛利润率 = 毛利润额 / 销售额,**不含运费**
|
||||
(对照表 #2 作废需规含运费公式);阈值按 asOf 取 M1 参数快照;M3 核算
|
||||
实际按回款到账日取参,本视图默认今日仅供录入期核对。
|
||||
"""
|
||||
|
||||
business_id: int
|
||||
as_of: date
|
||||
rows: list[GrossProfitRowOut] = Field(default_factory=list)
|
||||
categories: list[GrossProfitCategoryOut] = Field(default_factory=list)
|
||||
missing_count: int = 0
|
||||
note: str = "毛利润率与折算额不含运费;M3 核算按回款到账日取参数版本"
|
||||
|
||||
|
||||
class OwnershipChangeLogOut(BaseModel):
|
||||
"""业务归属变更留痕(人员删除后姓名为 None,固化 ID 兜底可追溯)。"""
|
||||
|
||||
id: int
|
||||
business_id: int
|
||||
old_owner_personnel_id: int | None = None
|
||||
new_owner_personnel_id: int | None = None
|
||||
old_assistant_personnel_id: int | None = None
|
||||
new_assistant_personnel_id: int | None = None
|
||||
old_owner_name: str | None = None
|
||||
new_owner_name: str | None = None
|
||||
change_reason: str | None = None
|
||||
operator_id: int | None = None
|
||||
operator_name: str
|
||||
create_time: datetime
|
||||
|
||||
|
||||
class BusinessStatusLogOut(BaseModel):
|
||||
"""业务状态流转记录(详情页时间线;创建首条 old=new=1)。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
business_id: int
|
||||
old_status: int
|
||||
new_status: int
|
||||
change_reason: str | None = None
|
||||
operator_id: int | None = None
|
||||
operator_name: str
|
||||
create_time: datetime
|
||||
|
||||
|
||||
# 供 schema 外部引用的两类别常量(类别汇总展示用)
|
||||
CATEGORY_LABELS = {
|
||||
PRODUCT_CATEGORY_MUNICIPAL_WATER: "市政水利",
|
||||
PRODUCT_CATEGORY_RAIL_TRANSIT: "轨道交通",
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
"""业务岗位角色的请求/响应模型。"""
|
||||
|
||||
import re
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from app.core.response import PageQuery
|
||||
|
||||
# 岗位编码规则与系统角色一致:小写字母开头,后接小写字母/数字/下划线,长度 2–32。
|
||||
# 编码会作为参数维度值(param_values.dimension_value)与核算模板绑定的锚点,
|
||||
# 保持单一风格避免大小写/全角混用造成对照困难
|
||||
BUSINESS_ROLE_CODE_PATTERN = re.compile(r"^[a-z][a-z0-9_]{1,31}$")
|
||||
|
||||
|
||||
class BusinessRoleOut(BaseModel):
|
||||
"""岗位响应(列表与详情共用)。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
role_code: str
|
||||
role_name: str
|
||||
calc_template: str
|
||||
description: str | None = None
|
||||
sort_order: int = 0
|
||||
status: int = 1
|
||||
is_builtin: int = 0
|
||||
|
||||
|
||||
class TemplateParamOut(BaseModel):
|
||||
"""模板声明的参数(供岗位表单展示,含当前口径说明)。"""
|
||||
|
||||
code: str
|
||||
name: str
|
||||
|
||||
|
||||
class TemplateOptionOut(BaseModel):
|
||||
"""公式模板下拉项。"""
|
||||
|
||||
code: str
|
||||
name: str
|
||||
description: str
|
||||
params: list[TemplateParamOut]
|
||||
|
||||
|
||||
class BusinessRoleCreateIn(BaseModel):
|
||||
"""新增岗位。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
role_code: str = Field(min_length=2, max_length=32, description="岗位编码,创建后不可修改")
|
||||
role_name: str = Field(min_length=1, max_length=64, description="岗位名称")
|
||||
calc_template: str = Field(min_length=1, max_length=32, description="计提公式模板编码")
|
||||
description: str | None = Field(default=None, max_length=255)
|
||||
sort_order: int = Field(default=0, ge=0, description="显示排序,越小越靠前")
|
||||
|
||||
@field_validator("role_code")
|
||||
@classmethod
|
||||
def _check_code(cls, value: str) -> str:
|
||||
if not BUSINESS_ROLE_CODE_PATTERN.match(value):
|
||||
raise ValueError("岗位编码须以小写字母开头,仅可含小写字母、数字与下划线")
|
||||
return value
|
||||
|
||||
|
||||
class BusinessRoleUpdateIn(BaseModel):
|
||||
"""编辑岗位。
|
||||
|
||||
**不含 role_code** —— 编码是参数维度值与模板绑定的锚点(同系统角色的保护理由)。
|
||||
前端表单全量提交,故为全量替换语义。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
role_name: str = Field(min_length=1, max_length=64, description="岗位名称")
|
||||
calc_template: str = Field(min_length=1, max_length=32, description="计提公式模板编码")
|
||||
description: str | None = Field(default=None, max_length=255)
|
||||
sort_order: int = Field(default=0, ge=0, description="显示排序,越小越靠前")
|
||||
|
||||
|
||||
class BusinessRoleStatusIn(BaseModel):
|
||||
"""启用/禁用岗位。"""
|
||||
|
||||
status: int = Field(ge=0, le=1, description="1启用 0禁用")
|
||||
|
||||
|
||||
class BusinessRoleQuery(PageQuery):
|
||||
"""岗位列表查询条件。"""
|
||||
|
||||
keyword: str | None = Field(default=None, max_length=64, description="编码或名称,模糊匹配")
|
||||
status: int | None = Field(default=None, ge=0, le=1, description="状态筛选")
|
||||
@@ -0,0 +1,135 @@
|
||||
"""客户管理的请求/响应模型(需求 2.1.3)。"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
|
||||
from app.core.response import PageQuery
|
||||
|
||||
|
||||
class CustomerOut(BaseModel):
|
||||
"""客户响应(列表、详情与写操作回包共用)。
|
||||
|
||||
owner_personnel_name 由 LEFT JOIN 带出:归属人员不可考(被物理删除的
|
||||
脏数据)时为 null,owner_personnel_id 仍返回原值供追溯 —— 与归属留痕
|
||||
「ID 固化、姓名随联表」同一口径。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
company_name: str
|
||||
owner_name: str
|
||||
contact_person: str | None = None
|
||||
contact_phone: str | None = None
|
||||
address: str | None = None
|
||||
industry: str | None = None
|
||||
customer_type: str
|
||||
owner_personnel_id: int | None = None
|
||||
owner_personnel_name: str | None = None
|
||||
remark: str | None = None
|
||||
|
||||
|
||||
class CustomerCreateIn(BaseModel):
|
||||
"""新增客户。
|
||||
|
||||
owner_personnel_id 为**初始归属**,可空(客户先建档、后派归属也合法);
|
||||
归属的后续调整不走本模型,统一走 ``PUT /{id}/ownership``(见
|
||||
``CustomerUpdateIn`` 的说明)。字段名蛇形直出(M1 契约:前端 api 封装
|
||||
与 schema 同名对应,仅分页信封 list/pageNum 驼峰)。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
company_name: str = Field(min_length=1, max_length=128, description="公司名称")
|
||||
owner_name: str = Field(
|
||||
min_length=1,
|
||||
max_length=64,
|
||||
description="客户负责人姓名(客户公司的负责人人名,非系统内营销人员)",
|
||||
)
|
||||
contact_person: str | None = Field(default=None, max_length=64, description="联系人")
|
||||
contact_phone: str | None = Field(default=None, max_length=20, description="联系电话")
|
||||
address: str | None = Field(default=None, max_length=255, description="地址")
|
||||
industry: str | None = Field(default=None, max_length=64, description="所属行业")
|
||||
customer_type: str = Field(
|
||||
min_length=1,
|
||||
max_length=32,
|
||||
description="客户分类:personal个人户 manager_personal经理个人户 enterprise企业户",
|
||||
)
|
||||
owner_personnel_id: int | None = Field(
|
||||
default=None,
|
||||
ge=1,
|
||||
description="归属负责营销人员ID(初始归属,可空)",
|
||||
)
|
||||
remark: str | None = Field(default=None, max_length=255, description="备注")
|
||||
|
||||
|
||||
class CustomerUpdateIn(BaseModel):
|
||||
"""编辑客户(全量替换,前端表单全量提交)。
|
||||
|
||||
**不含 owner_personnel_id** —— 归属调整统一走 ``PUT /{id}/ownership``,
|
||||
只有那条路径才写归属变更留痕。若在本端点放开该字段,会出现「改了归属
|
||||
却无留痕」的旁路,破坏留痕的 append-only 完整性;编辑表单即使提交
|
||||
ownerPersonnelId,pydantic 默认忽略未声明字段,归属以归属端点为准。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
company_name: str = Field(min_length=1, max_length=128, description="公司名称")
|
||||
owner_name: str = Field(min_length=1, max_length=64, description="客户负责人姓名")
|
||||
contact_person: str | None = Field(default=None, max_length=64, description="联系人")
|
||||
contact_phone: str | None = Field(default=None, max_length=20, description="联系电话")
|
||||
address: str | None = Field(default=None, max_length=255, description="地址")
|
||||
industry: str | None = Field(default=None, max_length=64, description="所属行业")
|
||||
customer_type: str = Field(
|
||||
min_length=1,
|
||||
max_length=32,
|
||||
description="客户分类:personal个人户 manager_personal经理个人户 enterprise企业户",
|
||||
)
|
||||
remark: str | None = Field(default=None, max_length=255, description="备注")
|
||||
|
||||
|
||||
class CustomerQuery(PageQuery):
|
||||
"""客户列表查询条件(字段名蛇形直出,与前端 api 封装同名对应)。"""
|
||||
|
||||
keyword: str | None = Field(
|
||||
default=None, max_length=64, description="公司名称或客户负责人,模糊匹配"
|
||||
)
|
||||
customer_type: str | None = Field(default=None, max_length=32, description="客户分类筛选")
|
||||
owner_personnel_id: int | None = Field(default=None, ge=1, description="归属人员ID筛选")
|
||||
|
||||
|
||||
class CustomerOwnershipIn(BaseModel):
|
||||
"""归属变更入参。
|
||||
|
||||
new_owner_personnel_id 可空:null 表示清空归属(客户暂无负责人也合法)。
|
||||
"""
|
||||
|
||||
new_owner_personnel_id: int | None = Field(
|
||||
default=None,
|
||||
ge=1,
|
||||
description="变更后归属人员ID,null=清空归属",
|
||||
)
|
||||
reason: str | None = Field(default=None, max_length=255, description="变更原因")
|
||||
|
||||
|
||||
class OwnershipChangeLogOut(BaseModel):
|
||||
"""归属变更留痕响应。
|
||||
|
||||
新旧归属人员姓名由 LEFT JOIN 带出,人员被删除后为 null;固化的
|
||||
``*_personnel_id`` 始终原样返回 —— 留痕表对人员 ID 无外键固化
|
||||
(见 `models/customer.py` 的论证),姓名可随人员消失,ID 不可。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
customer_id: int
|
||||
old_owner_personnel_id: int | None = None
|
||||
new_owner_personnel_id: int | None = None
|
||||
old_owner_name: str | None = None
|
||||
new_owner_name: str | None = None
|
||||
change_reason: str | None = None
|
||||
operator_id: int | None = None
|
||||
operator_name: str
|
||||
create_time: datetime
|
||||
@@ -0,0 +1,238 @@
|
||||
"""计提参数管理的请求/响应模型。
|
||||
|
||||
字段命名与 user/role 一致采用蛇形直出(前端 TS 接口同构)。
|
||||
金额类入参用字符串承载(Decimal 解析),杜绝 float 精度损失。
|
||||
"""
|
||||
|
||||
from datetime import date, datetime
|
||||
from decimal import Decimal, InvalidOperation
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
|
||||
|
||||
from app.core.response import PageQuery
|
||||
|
||||
|
||||
def _parse_amount(value: str, *, field_name: str, allow_negative: bool) -> str:
|
||||
"""金额字符串校验:必须可被 Decimal 解析;默认拒绝负数(毛利润额除外)。"""
|
||||
try:
|
||||
amount = Decimal(value.strip())
|
||||
except InvalidOperation as exc:
|
||||
raise ValueError(f"{field_name}必须是有效数字:{value}") from exc
|
||||
if not amount.is_finite():
|
||||
# 'NaN' 的比较会抛 InvalidOperation、'Infinity' 会在后续计算抛溢出,均须在入口拦下
|
||||
raise ValueError(f"{field_name}必须为有限数字:{value}")
|
||||
if not allow_negative and amount < 0:
|
||||
raise ValueError(f"{field_name}不得为负数:{value}")
|
||||
return value
|
||||
|
||||
|
||||
class ParamDimensionValueOut(BaseModel):
|
||||
"""某参数单个维度的当前生效值。"""
|
||||
|
||||
dimension_value: str
|
||||
value_text: str
|
||||
effective_date: date | None = None
|
||||
|
||||
|
||||
class ParamCatalogItemOut(BaseModel):
|
||||
"""参数目录项:定义元数据 + 各维度截至查询时点的生效值。"""
|
||||
|
||||
param_code: str
|
||||
param_name: str
|
||||
param_group: str
|
||||
value_type: str
|
||||
unit: str | None = None
|
||||
dimension_type: str
|
||||
options: list[str] = Field(default_factory=list)
|
||||
default_value: str | None = None
|
||||
value_min: str | None = None
|
||||
value_max: str | None = None
|
||||
description: str | None = None
|
||||
values: list[ParamDimensionValueOut] = Field(default_factory=list)
|
||||
|
||||
|
||||
class ParamHistoryOut(BaseModel):
|
||||
"""单参数的版本历史条目(append-only 留痕)。"""
|
||||
|
||||
version_no: str
|
||||
dimension_value: str
|
||||
old_value_text: str | None = None
|
||||
value_text: str
|
||||
effective_date: date
|
||||
operator_name: str
|
||||
create_time: datetime
|
||||
|
||||
|
||||
class ParamChangeItemIn(BaseModel):
|
||||
"""变更条目:参数 + 维度 + 新值。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
param_code: str = Field(min_length=1, max_length=64)
|
||||
dimension_value: str = Field(default="", max_length=32)
|
||||
value: str = Field(min_length=1, max_length=64)
|
||||
|
||||
|
||||
class ParamChangeIn(BaseModel):
|
||||
"""提交变更批次。
|
||||
|
||||
change_type=1 立即生效(生效日期取今日);change_type=2 指定日期生效,
|
||||
生效日期必填且不得早于今日(过去没有「预约」的意义,历史回溯走重算授权)。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
change_type: int = Field(ge=1, le=2, description="生效方式:1立即生效 2指定日期生效")
|
||||
effective_date: date | None = Field(default=None, description="指定日期生效时必填")
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
items: list[ParamChangeItemIn] = Field(min_length=1, max_length=50)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def _check_effective_date(self) -> "ParamChangeIn":
|
||||
if self.change_type == 2 and self.effective_date is None:
|
||||
raise ValueError("指定日期生效时必须提供生效日期")
|
||||
return self
|
||||
|
||||
|
||||
class ParamChangeBatchOut(BaseModel):
|
||||
"""变更批次(提交/撤回/列表共用)。"""
|
||||
|
||||
id: int
|
||||
version_no: str
|
||||
effective_date: date
|
||||
change_type: int
|
||||
remark: str | None = None
|
||||
operator_name: str
|
||||
item_count: int
|
||||
create_time: datetime
|
||||
|
||||
|
||||
class ParamBatchItemOut(BaseModel):
|
||||
"""批次明细条目(旧值 → 新值)。"""
|
||||
|
||||
param_code: str
|
||||
param_name: str
|
||||
dimension_value: str
|
||||
old_value_text: str | None = None
|
||||
value_text: str
|
||||
effective_date: date
|
||||
|
||||
|
||||
class ParamBatchOut(BaseModel):
|
||||
"""变更批次(列表项)。"""
|
||||
|
||||
id: int
|
||||
version_no: str
|
||||
effective_date: date
|
||||
change_type: int
|
||||
remark: str | None = None
|
||||
operator_name: str
|
||||
item_count: int
|
||||
create_time: datetime
|
||||
|
||||
|
||||
class ParamBatchDetailOut(BaseModel):
|
||||
"""批次明细:批次头 + 逐项变更。"""
|
||||
|
||||
id: int
|
||||
version_no: str
|
||||
effective_date: date
|
||||
change_type: int
|
||||
remark: str | None = None
|
||||
operator_name: str
|
||||
item_count: int
|
||||
create_time: datetime
|
||||
items: list[ParamBatchItemOut] = Field(default_factory=list)
|
||||
|
||||
|
||||
class ParamDiffOut(BaseModel):
|
||||
"""两日期快照对比项(全量参数,changed 标记是否变化)。"""
|
||||
|
||||
param_code: str
|
||||
param_name: str
|
||||
param_group: str
|
||||
dimension_value: str
|
||||
old_value: str | None = None
|
||||
new_value: str | None = None
|
||||
changed: bool
|
||||
|
||||
|
||||
class ParamPreviewIn(BaseModel):
|
||||
"""计算预览入参。金额用字符串承载,Decimal 解析。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
business_role: str | None = Field(
|
||||
default=None, max_length=32, description="岗位编码,如 salesperson"
|
||||
)
|
||||
customer_type: str | None = Field(
|
||||
default=None, max_length=32, description="客户类型:personal个人户 enterprise企业户"
|
||||
)
|
||||
product_category: str | None = Field(
|
||||
default=None, max_length=32, description="产品类别:municipal_water/rail_transit"
|
||||
)
|
||||
ship_date: date = Field(description="发货日")
|
||||
receipt_date: date = Field(description="回款到账日")
|
||||
revenue: str = Field(min_length=1, description="销售额(不含运费)")
|
||||
profit: str = Field(min_length=1, description="毛利润额(可为负)")
|
||||
received_amount: str = Field(min_length=1, description="本笔回款金额")
|
||||
barter: bool = Field(default=False, description="是否以物抵顶")
|
||||
probation: bool = Field(default=False, description="是否试用期")
|
||||
|
||||
@field_validator("revenue", "received_amount")
|
||||
@classmethod
|
||||
def _check_non_negative(cls, value: str, info) -> str:
|
||||
return _parse_amount(value, field_name=info.field_name, allow_negative=False)
|
||||
|
||||
@field_validator("profit")
|
||||
@classmethod
|
||||
def _check_profit(cls, value: str, info) -> str:
|
||||
return _parse_amount(value, field_name=info.field_name, allow_negative=True)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def _check_dates(self) -> "ParamPreviewIn":
|
||||
if self.receipt_date < self.ship_date:
|
||||
raise ValueError("回款到账日不得早于发货日")
|
||||
return self
|
||||
|
||||
|
||||
class ParamUsedOut(BaseModel):
|
||||
"""预览实际用到的参数(对账透明:取值与生效时点)。"""
|
||||
|
||||
param_code: str
|
||||
value_text: str
|
||||
effective_date: date | None = None
|
||||
|
||||
|
||||
class ParamPreviewOut(BaseModel):
|
||||
"""计算预览出参。分数串(如 97/10000)为精确值,金额为 Decimal 串。"""
|
||||
|
||||
payment_days: int
|
||||
rate: str
|
||||
rate_text: str
|
||||
profit_rate: str
|
||||
converted_profit: str
|
||||
performance_amount: str
|
||||
barter_applied: bool
|
||||
performance_after_barter: str | None = None
|
||||
start_payment_ok: bool
|
||||
payment_weight_r: int
|
||||
payment_weight: str
|
||||
payable_amount: str
|
||||
probation_note: str | None = None
|
||||
params_used: list[ParamUsedOut] = Field(default_factory=list)
|
||||
|
||||
|
||||
class ParamBatchQuery(PageQuery):
|
||||
"""变更记录查询条件。"""
|
||||
|
||||
start_date: date | None = Field(default=None, description="生效日期起(含)")
|
||||
end_date: date | None = Field(default=None, description="生效日期止(含)")
|
||||
|
||||
|
||||
class ParamHistoryQuery(PageQuery):
|
||||
"""参数历史查询条件。"""
|
||||
|
||||
dimension_value: str | None = Field(
|
||||
default=None, max_length=32, description="按维度值筛选,空为全部"
|
||||
)
|
||||
@@ -0,0 +1,149 @@
|
||||
"""营销人员的请求/响应模型(需求 2.1.1)。"""
|
||||
|
||||
from datetime import date
|
||||
from decimal import Decimal, InvalidOperation
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from app.core.response import PageQuery
|
||||
|
||||
# salary_standard 列为 Numeric(12,2):整数部分最多 10 位。
|
||||
# 工资系统金额红线——入参出参一律 str,服务层转 Decimal,全程不经 float
|
||||
SALARY_MAX = Decimal("9999999999.99")
|
||||
|
||||
|
||||
class PersonnelRegionOut(BaseModel):
|
||||
"""辐射区域条目响应。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
region_name: str
|
||||
remark: str | None = None
|
||||
|
||||
|
||||
class PersonnelPlanOut(BaseModel):
|
||||
"""拓展计划条目响应。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
plan_period: str
|
||||
plan_content: str
|
||||
target_desc: str | None = None
|
||||
|
||||
|
||||
class PersonnelOut(BaseModel):
|
||||
"""人员响应(列表与写操作回包共用)。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
personnel_name: str
|
||||
business_role_id: int
|
||||
role_name: str | None = None
|
||||
manager_id: int | None = None
|
||||
manager_name: str | None = None
|
||||
phone: str | None = None
|
||||
hire_date: date | None = None
|
||||
is_probation: int = 0
|
||||
salary_standard: str | None = None
|
||||
status: int = 1
|
||||
remark: str | None = None
|
||||
|
||||
|
||||
class PersonnelDetailOut(PersonnelOut):
|
||||
"""人员详情:附区域与拓展计划,供编辑抽屉一次回显。"""
|
||||
|
||||
regions: list[PersonnelRegionOut] = Field(default_factory=list)
|
||||
plans: list[PersonnelPlanOut] = Field(default_factory=list)
|
||||
|
||||
|
||||
class PersonnelCreateIn(BaseModel):
|
||||
"""新增人员。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
personnel_name: str = Field(min_length=1, max_length=64, description="姓名")
|
||||
business_role_id: int = Field(ge=1, description="岗位角色ID")
|
||||
manager_id: int | None = Field(default=None, ge=1, description="直属营销经理ID,空=无")
|
||||
phone: str | None = Field(default=None, max_length=20, description="联系电话")
|
||||
hire_date: date | None = Field(default=None, description="入职日期,ISO 格式")
|
||||
is_probation: int = Field(default=0, ge=0, le=1, description="是否试用期:1是 0否")
|
||||
salary_standard: str | None = Field(
|
||||
default=None, description="月工资标准(元),字符串形式的数字"
|
||||
)
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
|
||||
@field_validator("salary_standard")
|
||||
@classmethod
|
||||
def _check_salary_standard(cls, value: str | None) -> str | None:
|
||||
"""按 Numeric(12,2) 的容量校验字符串金额。
|
||||
|
||||
金额以字符串进出避免 float 精度损失(项目金额红线);
|
||||
小数位超过两位直接拒绝而非静默舍入——舍入即算错钱。
|
||||
"""
|
||||
if value is None:
|
||||
return None
|
||||
try:
|
||||
amount = Decimal(value)
|
||||
except InvalidOperation:
|
||||
raise ValueError("工资标准须为有效数字") from None
|
||||
if not amount.is_finite():
|
||||
raise ValueError("工资标准须为有效数字")
|
||||
if amount < 0:
|
||||
raise ValueError("工资标准不能为负数")
|
||||
if amount > SALARY_MAX:
|
||||
raise ValueError("工资标准超出可录入上限")
|
||||
if -amount.as_tuple().exponent > 2:
|
||||
raise ValueError("工资标准最多两位小数")
|
||||
return value
|
||||
|
||||
|
||||
class PersonnelUpdateIn(PersonnelCreateIn):
|
||||
"""编辑人员,全量提交、全量替换(不含状态,状态走独立接口)。"""
|
||||
|
||||
|
||||
class PersonnelStatusIn(BaseModel):
|
||||
"""在职/离职切换。"""
|
||||
|
||||
status: int = Field(ge=0, le=1, description="1在职 0离职")
|
||||
|
||||
|
||||
class RegionItemIn(BaseModel):
|
||||
"""辐射区域条目。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
region_name: str = Field(min_length=1, max_length=128, description="区域名称")
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
|
||||
|
||||
class RegionReplaceIn(BaseModel):
|
||||
"""辐射区域全量替换。空列表即清空该人员的全部区域。"""
|
||||
|
||||
items: list[RegionItemIn] = Field(default_factory=list, description="全量条目")
|
||||
|
||||
|
||||
class PlanItemIn(BaseModel):
|
||||
"""拓展计划条目。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
plan_period: str = Field(min_length=1, max_length=32, description="计划期间,如 2026Q1")
|
||||
plan_content: str = Field(min_length=1, max_length=500, description="计划内容")
|
||||
target_desc: str | None = Field(default=None, max_length=255, description="指标说明")
|
||||
|
||||
|
||||
class PlanReplaceIn(BaseModel):
|
||||
"""拓展计划全量替换。空列表即清空该人员的全部计划。"""
|
||||
|
||||
items: list[PlanItemIn] = Field(default_factory=list, description="全量条目")
|
||||
|
||||
|
||||
class PersonnelQuery(PageQuery):
|
||||
"""人员列表查询条件。"""
|
||||
|
||||
keyword: str | None = Field(default=None, max_length=64, description="姓名,模糊匹配")
|
||||
status: int | None = Field(default=None, ge=0, le=1, description="状态筛选:1在职 0离职")
|
||||
business_role_id: int | None = Field(default=None, ge=1, description="岗位筛选")
|
||||
@@ -0,0 +1,97 @@
|
||||
"""产品管理的请求/响应模型。
|
||||
|
||||
数量与单价(stock_quantity/sale_price)入参出参一律用**字符串**承载:
|
||||
前端 JS 的 number 无法精确表示全部十进制小数,字符串是金额红线的入口闸门,
|
||||
Decimal 转换统一收敛在 service 层。字段命名与 user/role/param 一致采用
|
||||
蛇形直出(前端 TS 接口同构)。
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from app.core.response import PageQuery
|
||||
from app.schemas.business import AMOUNT_MAX, PRICE_MAX, _check_amount
|
||||
|
||||
|
||||
class ProductOut(BaseModel):
|
||||
"""产品响应(列表与详情共用)。数量/单价按红线以字符串出参。"""
|
||||
|
||||
id: int
|
||||
product_name: str
|
||||
spec_model: str
|
||||
unit: str | None = None
|
||||
stock_quantity: str | None = None
|
||||
sale_price: str | None = None
|
||||
product_category: str
|
||||
status: int = 1
|
||||
remark: str | None = None
|
||||
create_time: datetime
|
||||
update_time: datetime
|
||||
|
||||
|
||||
class ProductCreateIn(BaseModel):
|
||||
"""新增产品。
|
||||
|
||||
spec_model 允许缺省/空:service 层归一为空串(组合唯一键
|
||||
uk_products_name_spec 对 NULL 不去重,归 NULL 会放行重名同规格数据)。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
product_name: str = Field(min_length=1, max_length=128, description="产品名称")
|
||||
spec_model: str | None = Field(
|
||||
default=None, max_length=128, description="规格型号,空归一为空串"
|
||||
)
|
||||
unit: str | None = Field(default=None, max_length=16, description="计量单位")
|
||||
stock_quantity: str | None = Field(default=None, description="数量,非负数字字符串")
|
||||
sale_price: str | None = Field(default=None, description="销售单价(元),非负数字字符串")
|
||||
product_category: str = Field(min_length=1, max_length=32, description="产品类别")
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
|
||||
@field_validator("stock_quantity")
|
||||
@classmethod
|
||||
def _check_stock_quantity(cls, value: str | None) -> str | None:
|
||||
"""空串与 None 同义(可空列),归一为 None;非空走通用金额校验。
|
||||
|
||||
复用 _check_amount:容量/小数位与 DECIMAL(14,2) 列口径一致
|
||||
(此前私写的 _parse_non_negative 不查小数位与容量,属同语义
|
||||
字段两处口径漂移)。
|
||||
"""
|
||||
if not value:
|
||||
return None
|
||||
return _check_amount(value, "数量", AMOUNT_MAX)
|
||||
|
||||
@field_validator("sale_price")
|
||||
@classmethod
|
||||
def _check_sale_price(cls, value: str | None) -> str | None:
|
||||
"""空串与 None 同义(可空列),归一为 None;非空走通用金额校验。
|
||||
|
||||
scale=4 与列口径 Numeric(14,4) 一致 —— 带精度的历史单价必须能
|
||||
原样提交(「编辑任何带精度历史行都失败」的 fba8cfc 教训)。
|
||||
"""
|
||||
if not value:
|
||||
return None
|
||||
return _check_amount(value, "销售单价", PRICE_MAX, scale=4)
|
||||
|
||||
|
||||
class ProductUpdateIn(ProductCreateIn):
|
||||
"""编辑产品。
|
||||
|
||||
前端表单全量提交,故为全量替换语义;**不含 status** —— 启用/停用是
|
||||
独立操作(走 PUT /{id}/status),避免编辑表单误触停用。
|
||||
"""
|
||||
|
||||
|
||||
class ProductStatusIn(BaseModel):
|
||||
"""启用/停用产品。"""
|
||||
|
||||
status: int = Field(ge=0, le=1, description="1启用 0停用")
|
||||
|
||||
|
||||
class ProductQuery(PageQuery):
|
||||
"""产品列表查询条件。"""
|
||||
|
||||
keyword: str | None = Field(default=None, max_length=64, description="名称或规格,模糊匹配")
|
||||
product_category: str | None = Field(default=None, max_length=32, description="按类别筛选")
|
||||
status: int | None = Field(default=None, ge=0, le=1, description="状态筛选")
|
||||
@@ -0,0 +1,79 @@
|
||||
"""客户评级等级配置的请求/响应模型。
|
||||
|
||||
分值(min_score/max_score)入参出参一律用**字符串**承载:前端 JS 的 number
|
||||
无法精确表示全部十进制小数,字符串是分值红线的入口闸门,Decimal 转换统一
|
||||
收敛在 service 层(与 schemas/product.py 同一口径)。
|
||||
|
||||
注意:schema 只拦**格式**(可解析、有限数);0≤min≤max≤100 与区间不重叠
|
||||
是横跨两字段/多行的业务值域规则,在 service 层审计上下文内统一判定 ——
|
||||
值域校验失败的 400 也要留痕(2026-10-13 定稿口径)。
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
from decimal import Decimal, InvalidOperation
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
|
||||
def _parse_score(value: str, *, label: str) -> str:
|
||||
"""分值字符串格式校验:必须可被 Decimal 解析且为有限数。
|
||||
|
||||
``NaN`` 参与比较抛 InvalidOperation、``Infinity`` 落库即溢出,均须在
|
||||
入口用 ``is_finite()`` 拦下(与 schemas/product.py 的 _parse_non_negative
|
||||
同口径);非负与 ≤100 属业务值域,留给 service 层在审计上下文内判定。
|
||||
"""
|
||||
try:
|
||||
score = Decimal(value.strip())
|
||||
except InvalidOperation as exc:
|
||||
raise ValueError(f"{label}必须是有效数字:{value}") from exc
|
||||
if not score.is_finite():
|
||||
raise ValueError(f"{label}必须为有限数字:{value}")
|
||||
return value
|
||||
|
||||
|
||||
class RatingGradeOut(BaseModel):
|
||||
"""评级等级响应(列表直出)。分值按红线以字符串出参。"""
|
||||
|
||||
id: int
|
||||
grade_name: str
|
||||
min_score: str
|
||||
max_score: str
|
||||
sort_order: int
|
||||
remark: str | None = None
|
||||
create_time: datetime
|
||||
update_time: datetime
|
||||
|
||||
|
||||
class RatingGradeCreateIn(BaseModel):
|
||||
"""新增评级等级。
|
||||
|
||||
min_score/max_score 必填:区间是判定表的判定依据,缺省无从判定。
|
||||
sort_order 缺省 0(列默认值同源),判定按其升序取首个命中等级。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
grade_name: str = Field(min_length=1, max_length=32, description="等级名称(如 A/优秀)")
|
||||
min_score: str = Field(description="总分下限(含),0-100 数字字符串")
|
||||
max_score: str = Field(description="总分上限(展示用),0-100 数字字符串")
|
||||
sort_order: int = Field(default=0, ge=0, description="判定顺序,升序")
|
||||
remark: str | None = Field(default=None, max_length=255, description="说明")
|
||||
|
||||
@field_validator("min_score")
|
||||
@classmethod
|
||||
def _check_min_score(cls, value: str) -> str:
|
||||
"""总分下限须为有限数字(值域 0-100 由 service 层判定)。"""
|
||||
return _parse_score(value, label="总分下限")
|
||||
|
||||
@field_validator("max_score")
|
||||
@classmethod
|
||||
def _check_max_score(cls, value: str) -> str:
|
||||
"""总分上限须为有限数字(值域 0-100 由 service 层判定)。"""
|
||||
return _parse_score(value, label="总分上限")
|
||||
|
||||
|
||||
class RatingGradeUpdateIn(RatingGradeCreateIn):
|
||||
"""编辑评级等级。
|
||||
|
||||
前端表单全量提交,故为全量替换语义;等级表无启停状态列,字段与新增一致。
|
||||
"""
|
||||
@@ -0,0 +1,102 @@
|
||||
"""回款管理的请求/响应模型(需求 2.2.3)。
|
||||
|
||||
金额入参出参一律 str(服务层 Decimal,全程禁 float);字段契约**纯蛇形
|
||||
直出**(2026-10-13 定稿,无驼峰 alias)。
|
||||
|
||||
payment_days 是派生值(发货日 → 回款日的天数,对照表 #1),不在写接口
|
||||
入参内 —— 落库列只有 shipment_id 源数据,派生值实时计算,发货批次变更
|
||||
后无需回写历史。
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from app.core.response import PageQuery
|
||||
|
||||
# 金额校验是工资系统的红线口径(数字/非负/容量/两位小数拒绝),跨 schema
|
||||
# 单点复用 T7 定稿工具,禁止各处复制导致口径漂移;AMOUNT_MAX 即
|
||||
# DECIMAL(14,2) 的容量上限,与回款列容量同源
|
||||
from app.schemas.business import AMOUNT_MAX, _check_amount
|
||||
|
||||
|
||||
class ReceiptCreateIn(BaseModel):
|
||||
"""新增回款:业务必选,发货批次可暂不指定(手动指定,对照表 #18)。
|
||||
|
||||
shipment_id 指向的发货单必须与本回款同属一个业务(服务层强校验,
|
||||
数据完整性红线);shipment_id 可空 = 暂未指定,指定后回款天数方可派生。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
business_id: int = Field(ge=1, description="业务ID")
|
||||
shipment_id: int | None = Field(default=None, ge=1, description="发货单ID,可空=暂未指定")
|
||||
receipt_date: date = Field(description="回款到账日(M3 按此日匹配参数版本)")
|
||||
amount: str = Field(description="回款金额(元),≥0,最多两位小数")
|
||||
is_barter: int = Field(default=0, ge=0, le=1, description="以物抵顶标记:1是 0否")
|
||||
remark: str | None = Field(default=None, max_length=255, description="备注")
|
||||
|
||||
@field_validator("amount")
|
||||
@classmethod
|
||||
def _check_amount_value(cls, value: str) -> str:
|
||||
return _check_amount(value, "回款金额", AMOUNT_MAX) or value
|
||||
|
||||
|
||||
class ReceiptUpdateIn(BaseModel):
|
||||
"""编辑回款(全量替换语义)。
|
||||
|
||||
shipment_id 传 None = 清除指定(回到「暂未指定」);amount 是必填项,
|
||||
全量替换下不存在「不传即不变」的歧义。已核算(settlement_status=1)
|
||||
的回款在服务层禁改,schema 层不感知该状态。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
shipment_id: int | None = Field(
|
||||
default=None, ge=1, description="发货单ID,可空=暂未指定(传空清除既有指定)"
|
||||
)
|
||||
receipt_date: date = Field(description="回款到账日")
|
||||
amount: str = Field(description="回款金额(元),≥0,最多两位小数")
|
||||
is_barter: int = Field(default=0, ge=0, le=1, description="以物抵顶标记:1是 0否")
|
||||
remark: str | None = Field(default=None, max_length=255, description="备注")
|
||||
|
||||
@field_validator("amount")
|
||||
@classmethod
|
||||
def _check_amount_value(cls, value: str) -> str:
|
||||
return _check_amount(value, "回款金额", AMOUNT_MAX) or value
|
||||
|
||||
|
||||
class ReceiptOut(BaseModel):
|
||||
"""回款响应(列表与写操作回包共用)。
|
||||
|
||||
business_no/shipment_no 为关联冗余展示;payment_days 为派生值:
|
||||
未指定发货批次时为 None,指定后 = 发货日到回款日的天数(发货日首日
|
||||
计第 1 天)。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
receipt_batch_no: str
|
||||
business_id: int
|
||||
business_no: str
|
||||
shipment_id: int | None = None
|
||||
shipment_no: str | None = None
|
||||
receipt_date: date
|
||||
amount: str
|
||||
is_barter: int
|
||||
settlement_status: int
|
||||
payment_days: int | None = None
|
||||
remark: str | None = None
|
||||
|
||||
|
||||
class ReceiptQuery(PageQuery):
|
||||
"""回款列表查询条件(筛选参数纯蛇形直出,同 BusinessQuery 契约)。"""
|
||||
|
||||
business_id: int | None = Field(default=None, ge=1, description="业务筛选")
|
||||
date_from: date | None = Field(default=None, description="回款到账日起(含)")
|
||||
date_to: date | None = Field(default=None, description="回款到账日止(含)")
|
||||
is_barter: int | None = Field(default=None, ge=0, le=1, description="以物抵顶筛选:1是 0否")
|
||||
settlement_status: int | None = Field(
|
||||
default=None, ge=0, le=1, description="核算状态筛选:0未核算 1已核算"
|
||||
)
|
||||
@@ -0,0 +1,28 @@
|
||||
"""系统设置(公司信息)请求/响应模型。
|
||||
|
||||
`SettingPublicOut` 与 `SettingOut` **刻意不共用**:public 端点无鉴权,
|
||||
响应字段必须白名单显式列出——将来往 SettingOut 加敏感字段时不会
|
||||
顺着复用链泄漏到匿名端点。
|
||||
"""
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
|
||||
class SettingOut(BaseModel):
|
||||
"""公司信息(管理端)。"""
|
||||
|
||||
company_name: str
|
||||
logo_url: str | None = None
|
||||
|
||||
|
||||
class SettingPublicOut(BaseModel):
|
||||
"""公司信息(匿名端点白名单):登录页展示所需的两个字段。"""
|
||||
|
||||
company_name: str
|
||||
logo_url: str | None = None
|
||||
|
||||
|
||||
class SettingUpdateIn(BaseModel):
|
||||
"""公司信息更新。"""
|
||||
|
||||
company_name: str = Field(min_length=1, max_length=64, description="公司名称")
|
||||
@@ -0,0 +1,138 @@
|
||||
"""发货管理的请求/响应模型(需求 2.2.2)。
|
||||
|
||||
金额/数量入参出参一律 str(服务层 Decimal 运算,全程禁 float),容量与
|
||||
小数位校验复用 business.py 的 ``_check_amount``(同一套口径,防两处漂移);
|
||||
字段契约全线蛇形直出(2026-10-13 定稿:无驼峰 alias)。
|
||||
|
||||
amount(行金额)与 total_amount(发货总金额)不在入参内 —— 由服务层按
|
||||
数量×单价 计算固化,不信任前端传值;运费仅记录展示,不计入毛利润口径。
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from app.core.response import PageQuery
|
||||
from app.schemas.business import AMOUNT_MAX, PRICE_MAX, _check_amount
|
||||
|
||||
|
||||
class ShipmentItemIn(BaseModel):
|
||||
"""发货产品明细行(product_id 空=自由录入;价格口径两可,可空人工补)。"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
product_id: int | None = Field(default=None, ge=1, description="产品ID;空=自由录入")
|
||||
product_name: str = Field(min_length=1, max_length=128, description="产品名称")
|
||||
spec_model: str | None = Field(
|
||||
default=None, max_length=128, description="规格型号,空=空串归一"
|
||||
)
|
||||
unit: str | None = Field(default=None, max_length=16, description="计量单位")
|
||||
quantity: str = Field(description="数量,>0")
|
||||
sale_price: str | None = Field(
|
||||
default=None, description="发货单价(元),可空=待人工补价,补价前行金额记 0"
|
||||
)
|
||||
|
||||
@field_validator("quantity")
|
||||
@classmethod
|
||||
def _check_quantity(cls, value: str) -> str:
|
||||
return _check_amount(value, "数量", AMOUNT_MAX, allow_positive_only=True) or value
|
||||
|
||||
@field_validator("sale_price")
|
||||
@classmethod
|
||||
def _check_price(cls, value: str | None) -> str | None:
|
||||
"""发货单价列 DECIMAL(14,4):按 4 位小数口径(回显可原样提交)。"""
|
||||
return _check_amount(value, "单价", PRICE_MAX, scale=4)
|
||||
|
||||
|
||||
class ShipmentItemOut(BaseModel):
|
||||
"""发货产品明细行响应。金额/数量一律 str。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
product_id: int | None = None
|
||||
product_name: str
|
||||
spec_model: str | None = None
|
||||
unit: str | None = None
|
||||
quantity: str
|
||||
sale_price: str | None = None
|
||||
amount: str
|
||||
|
||||
|
||||
class ShipmentOut(BaseModel):
|
||||
"""发货单响应(列表与写操作回包共用);business_no 为 join 附带列。"""
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
id: int
|
||||
shipment_no: str
|
||||
business_id: int
|
||||
business_no: str | None = None
|
||||
ship_date: date
|
||||
freight_amount: str
|
||||
total_amount: str
|
||||
remark: str | None = None
|
||||
|
||||
|
||||
class ShipmentDetailOut(ShipmentOut):
|
||||
"""发货单详情:附产品明细行。"""
|
||||
|
||||
items: list[ShipmentItemOut] = Field(default_factory=list)
|
||||
|
||||
|
||||
class ShipmentCreateIn(BaseModel):
|
||||
"""创建发货单:业务维度 + 明细行数组(明细 ≥1 行)。
|
||||
|
||||
字段名全线蛇形直出(同 business.py 契约,仅分页信封 list/pageNum 驼峰)。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
business_id: int = Field(ge=1, description="业务ID")
|
||||
ship_date: date = Field(description="发货日期(回款天数基准日,发货日首日=第 1 天)")
|
||||
freight_amount: str | None = Field(
|
||||
default=None, description="运费金额(元),空记 0;仅记录展示,不计入毛利润口径"
|
||||
)
|
||||
items: list[ShipmentItemIn] = Field(min_length=1, description="发货明细行,至少 1 行")
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
|
||||
@field_validator("freight_amount")
|
||||
@classmethod
|
||||
def _check_freight(cls, value: str | None) -> str | None:
|
||||
"""运费同样是金额源数据:复用 _check_amount 拒负数/多小数位/超容量。"""
|
||||
return _check_amount(value, "运费金额", AMOUNT_MAX)
|
||||
|
||||
|
||||
class ShipmentUpdateIn(BaseModel):
|
||||
"""编辑发货单(明细全量替换)。
|
||||
|
||||
business_id 不在编辑入参内 —— 发货单挂靠的业务创建时定死,改挂会让
|
||||
已指定本发货单的回款语义断裂。
|
||||
"""
|
||||
|
||||
model_config = ConfigDict(str_strip_whitespace=True)
|
||||
|
||||
ship_date: date = Field(description="发货日期(回款天数基准日,发货日首日=第 1 天)")
|
||||
freight_amount: str | None = Field(default=None, description="运费金额(元),空记 0")
|
||||
items: list[ShipmentItemIn] = Field(
|
||||
min_length=1, description="发货明细行,至少 1 行(全量替换)"
|
||||
)
|
||||
remark: str | None = Field(default=None, max_length=255)
|
||||
|
||||
@field_validator("freight_amount")
|
||||
@classmethod
|
||||
def _check_freight(cls, value: str | None) -> str | None:
|
||||
"""运费同样是金额源数据:复用 _check_amount 拒负数/多小数位/超容量。"""
|
||||
return _check_amount(value, "运费金额", AMOUNT_MAX)
|
||||
|
||||
|
||||
class ShipmentQuery(PageQuery):
|
||||
"""发货单列表查询条件(字段名蛇形直出,与前端 api 封装同名对应)。
|
||||
|
||||
business_id 可空=全量:发货单以业务维度查看为主(一期),但单号可
|
||||
独立检索,不强制挂业务条件。
|
||||
"""
|
||||
|
||||
business_id: int | None = Field(default=None, ge=1, description="业务筛选,空=全部")
|
||||
ship_date_from: date | None = Field(default=None, description="发货日期起(含)")
|
||||
ship_date_to: date | None = Field(default=None, description="发货日期止(含)")
|
||||
@@ -0,0 +1,330 @@
|
||||
"""审批流业务编排(2026-10-15 复核审批补充需求)。
|
||||
|
||||
三级链路:营销后勤提交 → 财务复核 → 领导审核。行为由参数开关驱动
|
||||
(`approval.secondary_allocation.enabled` / `approval.monthly_settlement.enabled`):
|
||||
|
||||
- **关闭(默认)**:提交即生成审批单并「自动通过」全节点留痕(action=3,
|
||||
operator 记「系统」)——留痕不断链,与「关闭=直接生效」的需求口径一致;
|
||||
- **开启**:status=1 待财务复核 → 2 待领导审核 → 3 已通过;任一节点驳回
|
||||
即整体驳回(status=4),一期不做退回重走(简单状态机)。
|
||||
|
||||
红线:
|
||||
- `submit_order` **不 commit、不嵌套 audit** —— 由业务写路径(business_service
|
||||
的 create/update)既有 audit 上下文统一收口,违反嵌套禁令会让失败路径
|
||||
回滚不完整(见 audit_service 模块 docstring);
|
||||
- 节点准入**严格按角色编码**:status=1 仅财务、status=2 仅领导,admin 不
|
||||
代办 —— 放行 admin 会让双人复核流退化成管理员单点审批;
|
||||
- 同一引用对象的在途单(status 1/2)在重新提交前先撤回(status=5 +
|
||||
node=0/action=4 留痕),保证「一个对象至多一张在途单」。
|
||||
"""
|
||||
|
||||
import logging
|
||||
from datetime import date
|
||||
|
||||
from sqlalchemy import func, select
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_APPROVE,
|
||||
ACTION_REJECT,
|
||||
MODULE_APPROVAL,
|
||||
NO_PREFIX_APPROVAL,
|
||||
ROLE_FINANCE,
|
||||
ROLE_LEADER,
|
||||
)
|
||||
from app.core.db_errors import is_duplicate_entry
|
||||
from app.core.exceptions import BadRequestError, ForbiddenError, NotFoundError
|
||||
from app.core.response import PageResult
|
||||
from app.models import ApprovalOrder, ApprovalStep, User
|
||||
from app.models.approval import (
|
||||
APPROVAL_ACTION_APPROVE,
|
||||
APPROVAL_ACTION_AUTO_APPROVE,
|
||||
APPROVAL_ACTION_WITHDRAW,
|
||||
APPROVAL_NODE_FINANCE,
|
||||
APPROVAL_NODE_LEADER,
|
||||
APPROVAL_NODE_WITHDRAW,
|
||||
APPROVAL_NODES,
|
||||
APPROVAL_STATUS_APPROVED,
|
||||
APPROVAL_STATUS_PENDING_FINANCE,
|
||||
APPROVAL_STATUS_PENDING_LEADER,
|
||||
APPROVAL_STATUS_REJECTED,
|
||||
APPROVAL_STATUS_WITHDRAWN,
|
||||
)
|
||||
from app.repositories import user_repository
|
||||
from app.schemas.approval import (
|
||||
ApprovalActionIn,
|
||||
ApprovalOrderDetailOut,
|
||||
ApprovalOrderOut,
|
||||
ApprovalQuery,
|
||||
ApprovalStepOut,
|
||||
)
|
||||
from app.services import audit_service, param_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
from app.services.no_generator import next_no
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 开关参数编码(与 param_registry 种子同源)
|
||||
ENABLE_CODE_BY_TYPE: dict[int, str] = {
|
||||
1: "approval.secondary_allocation.enabled",
|
||||
2: "approval.monthly_settlement.enabled",
|
||||
}
|
||||
|
||||
_NO_RETRY = 1 # AP 单号唯一键冲突重试(next_no 的 MAX+FOR UPDATE 之外的兜底)
|
||||
|
||||
# 在途状态集合(同一引用对象至多一张在途单)
|
||||
_PENDING_STATUSES = (APPROVAL_STATUS_PENDING_FINANCE, APPROVAL_STATUS_PENDING_LEADER)
|
||||
|
||||
# 在途状态 → 当前节点应操作的角色(admin 不代办:单人审批绕过双人复核)
|
||||
_NODE_ROLE_BY_STATUS = {
|
||||
APPROVAL_STATUS_PENDING_FINANCE: ROLE_FINANCE,
|
||||
APPROVAL_STATUS_PENDING_LEADER: ROLE_LEADER,
|
||||
}
|
||||
|
||||
_ROLE_LABEL = {ROLE_FINANCE: "财务", ROLE_LEADER: "领导"}
|
||||
|
||||
|
||||
def is_enabled(session: Session, order_type: int) -> bool:
|
||||
"""读当日参数快照判定审批开关(一次提交路径内只读一次,调用方勿重读)。"""
|
||||
code = ENABLE_CODE_BY_TYPE.get(order_type)
|
||||
if code is None:
|
||||
raise BadRequestError("未知的审批对象类型")
|
||||
return param_service.resolve_snapshot(session, date.today()).boolean(code)
|
||||
|
||||
|
||||
def submit_order(
|
||||
session: Session,
|
||||
*,
|
||||
order_type: int,
|
||||
ref_id: int,
|
||||
refer_no: str,
|
||||
submitter: User,
|
||||
retry_on_conflict: bool,
|
||||
) -> ApprovalOrder:
|
||||
"""提单(业务写路径内部调用;不 commit、不嵌套 audit)。
|
||||
|
||||
同一引用对象的在途单先撤回留痕再建新单;开关关闭时生成即自动通过
|
||||
(全节点 action=3 留痕)。
|
||||
|
||||
:param retry_on_conflict: AP 编号撞唯一键时是否允许本函数内部
|
||||
rollback 后重取。**仅 create 传 True**——它外层有编号重试循环,
|
||||
rollback 后整体重来;update 路径必须传 False:内部 rollback 会把
|
||||
同事务的业务行修改一并回滚,静默继续会「返回 200 库里没改」。
|
||||
False 时 IntegrityError 直接抛出 → 审计上下文回滚并记失败 →
|
||||
全局 handler 收敛 400,用户重试即可。
|
||||
"""
|
||||
_withdraw_pending(session, order_type=order_type, ref_id=ref_id, operator=submitter)
|
||||
|
||||
order = ApprovalOrder(
|
||||
order_no=next_no(
|
||||
session,
|
||||
model=ApprovalOrder,
|
||||
column_name="order_no",
|
||||
prefix=NO_PREFIX_APPROVAL,
|
||||
),
|
||||
order_type=order_type,
|
||||
ref_id=ref_id,
|
||||
refer_no=refer_no,
|
||||
submitter_id=submitter.id,
|
||||
submitter_name=submitter.username,
|
||||
)
|
||||
session.add(order)
|
||||
|
||||
if is_enabled(session, order_type):
|
||||
order.status = APPROVAL_STATUS_PENDING_FINANCE
|
||||
_flush_order(session, order, retry_on_conflict=retry_on_conflict)
|
||||
logger.info("审批单待审 | order=%s", order.order_no)
|
||||
return order
|
||||
|
||||
# 开关关闭=直接生效:两级节点各记一条「自动通过」,留痕不断链
|
||||
order.status = APPROVAL_STATUS_APPROVED
|
||||
_flush_order(session, order, retry_on_conflict=retry_on_conflict)
|
||||
session.add_all(
|
||||
[
|
||||
ApprovalStep(
|
||||
order_id=order.id,
|
||||
node=node,
|
||||
action=APPROVAL_ACTION_AUTO_APPROVE,
|
||||
operator_name="系统",
|
||||
)
|
||||
for node in (APPROVAL_NODE_FINANCE, APPROVAL_NODE_LEADER)
|
||||
]
|
||||
)
|
||||
session.flush()
|
||||
logger.info("审批单自动通过 | order=%s(开关关闭)", order.order_no)
|
||||
return order
|
||||
|
||||
|
||||
def act(
|
||||
session: Session,
|
||||
order_id: int,
|
||||
payload: ApprovalActionIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ApprovalOrderDetailOut:
|
||||
"""节点动作(财务复核/领导审核):状态机流转 + 节点留痕(审计上下文)。
|
||||
|
||||
通过:status=1 → 2(下一步领导);status=2 → 3(终态已通过)。
|
||||
驳回:任一在途状态 → 4(整体驳回,一期不退回重走)。
|
||||
节点留痕的 node 取**动作发生时的当前节点**(通过/驳回都记在操作节点上)。
|
||||
"""
|
||||
codes = set(user_repository.get_role_codes(operator))
|
||||
verb = ACTION_APPROVE if payload.action == APPROVAL_ACTION_APPROVE else ACTION_REJECT
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_APPROVAL,
|
||||
action=verb,
|
||||
summary=f"审批单 #{order_id} {verb}",
|
||||
request_data=payload.model_dump(),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
order = session.get(ApprovalOrder, order_id, with_for_update=True)
|
||||
if order is None:
|
||||
raise NotFoundError("审批单不存在")
|
||||
if order.status not in _PENDING_STATUSES:
|
||||
raise BadRequestError("审批单已结束,不可重复操作")
|
||||
|
||||
required_role = _NODE_ROLE_BY_STATUS[order.status]
|
||||
if required_role not in codes:
|
||||
raise ForbiddenError(f"当前节点须{_ROLE_LABEL[required_role]}角色操作")
|
||||
|
||||
node_now = APPROVAL_NODES[order.status]
|
||||
if payload.action == APPROVAL_ACTION_APPROVE:
|
||||
order.status = (
|
||||
APPROVAL_STATUS_PENDING_LEADER
|
||||
if order.status == APPROVAL_STATUS_PENDING_FINANCE
|
||||
else APPROVAL_STATUS_APPROVED
|
||||
)
|
||||
else:
|
||||
order.status = APPROVAL_STATUS_REJECTED
|
||||
|
||||
session.add(
|
||||
ApprovalStep(
|
||||
order_id=order.id,
|
||||
node=node_now,
|
||||
action=payload.action,
|
||||
opinion=payload.opinion,
|
||||
operator_id=operator.id,
|
||||
operator_name=operator.username,
|
||||
)
|
||||
)
|
||||
session.commit()
|
||||
return _detail_of(session, order)
|
||||
|
||||
|
||||
def list_orders(session: Session, query: ApprovalQuery) -> PageResult[ApprovalOrderOut]:
|
||||
"""分页查询审批单(准入由 api 层依赖判定)。"""
|
||||
filters = _order_filters(query)
|
||||
rows = (
|
||||
session.execute(
|
||||
select(ApprovalOrder)
|
||||
.where(*filters)
|
||||
.order_by(ApprovalOrder.id.desc())
|
||||
.offset(query.offset)
|
||||
.limit(query.page_size)
|
||||
)
|
||||
.scalars()
|
||||
.all()
|
||||
)
|
||||
total = session.execute(
|
||||
select(func.count()).select_from(ApprovalOrder).where(*filters)
|
||||
).scalar_one()
|
||||
return PageResult[ApprovalOrderOut](
|
||||
records=[ApprovalOrderOut.model_validate(r) for r in rows],
|
||||
total=int(total),
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_order(session: Session, order_id: int) -> ApprovalOrderDetailOut:
|
||||
"""审批单详情(附节点时间线)。"""
|
||||
order = session.get(ApprovalOrder, order_id)
|
||||
if order is None:
|
||||
raise NotFoundError("审批单不存在")
|
||||
return _detail_of(session, order)
|
||||
|
||||
|
||||
def _withdraw_pending(session: Session, *, order_type: int, ref_id: int, operator: User) -> None:
|
||||
"""撤回引用对象的在途单(重新提交前调用;不 commit)。"""
|
||||
pending = (
|
||||
session.execute(
|
||||
select(ApprovalOrder).where(
|
||||
ApprovalOrder.order_type == order_type,
|
||||
ApprovalOrder.ref_id == ref_id,
|
||||
ApprovalOrder.status.in_(_PENDING_STATUSES),
|
||||
)
|
||||
)
|
||||
.scalars()
|
||||
.all()
|
||||
)
|
||||
for order in pending:
|
||||
order.status = APPROVAL_STATUS_WITHDRAWN
|
||||
session.add(
|
||||
ApprovalStep(
|
||||
order_id=order.id,
|
||||
node=APPROVAL_NODE_WITHDRAW,
|
||||
action=APPROVAL_ACTION_WITHDRAW,
|
||||
operator_id=operator.id,
|
||||
operator_name=operator.username,
|
||||
)
|
||||
)
|
||||
if pending:
|
||||
session.flush()
|
||||
logger.info("撤回在途审批单 %s 张 | ref=%s", len(pending), ref_id)
|
||||
|
||||
|
||||
def _flush_order(session: Session, order: ApprovalOrder, *, retry_on_conflict: bool) -> None:
|
||||
"""flush 提单;撞 AP 单号唯一键时按 retry_on_conflict 决定重取或抛出。
|
||||
|
||||
rollback 会连业务写路径的未提交变更一并回滚 —— 见 submit_order 的
|
||||
retry_on_conflict 说明(create 才允许内部重取)。
|
||||
"""
|
||||
for attempt in range(_NO_RETRY + 1):
|
||||
try:
|
||||
session.flush()
|
||||
return
|
||||
except IntegrityError as exc:
|
||||
session.rollback()
|
||||
if is_duplicate_entry(exc) and retry_on_conflict and attempt < _NO_RETRY:
|
||||
order.id = None # rollback 后实例回 transient,主键重新分配
|
||||
order.order_no = next_no(
|
||||
session,
|
||||
model=ApprovalOrder,
|
||||
column_name="order_no",
|
||||
prefix=NO_PREFIX_APPROVAL,
|
||||
)
|
||||
session.add(order)
|
||||
continue
|
||||
raise
|
||||
|
||||
|
||||
def _detail_of(session: Session, order: ApprovalOrder) -> ApprovalOrderDetailOut:
|
||||
"""出参组装(含 steps 时间线)。"""
|
||||
steps = (
|
||||
session.execute(
|
||||
select(ApprovalStep).where(ApprovalStep.order_id == order.id).order_by(ApprovalStep.id)
|
||||
)
|
||||
.scalars()
|
||||
.all()
|
||||
)
|
||||
detail = ApprovalOrderDetailOut.model_validate(order)
|
||||
detail.steps = [ApprovalStepOut.model_validate(s) for s in steps]
|
||||
return detail
|
||||
|
||||
|
||||
def _order_filters(query: ApprovalQuery) -> tuple:
|
||||
filters = []
|
||||
if query.keyword:
|
||||
like = f"%{query.keyword}%"
|
||||
filters.append(ApprovalOrder.order_no.like(like) | ApprovalOrder.refer_no.like(like))
|
||||
if query.status is not None:
|
||||
filters.append(ApprovalOrder.status == query.status)
|
||||
if query.order_type is not None:
|
||||
filters.append(ApprovalOrder.order_type == query.order_type)
|
||||
return tuple(filters)
|
||||
@@ -0,0 +1,287 @@
|
||||
"""业务岗位角色管理业务编排。
|
||||
|
||||
需求 #28 的落点:岗位可增删、绑定公式模板(有限集合,代码内注册表),
|
||||
新增岗位无需改代码。保护规则(前端会禁用相应按钮,**后端校验是唯一防线**):
|
||||
|
||||
- 内置岗位(is_builtin=1:营销员/营销经理/信息员)**禁删禁停** ——
|
||||
参数种子与核算模板按编码锚定(如 salesperson 的递减公式参数行)
|
||||
- `role_code` 创建后不可改 —— 它是参数维度值(param_values.dimension_value)
|
||||
与模板绑定语义的锚点
|
||||
- `calc_template` 必须是模板注册表(calc_templates.TEMPLATES)内的编码
|
||||
- 有人员引用的岗位禁删 —— ② 落地 personnel 表后由引用计数生效,
|
||||
当前钩子恒为空(见 business_role_repository.count_personnel_by_role)
|
||||
"""
|
||||
|
||||
import logging
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
ACTION_DELETE,
|
||||
ACTION_DISABLE,
|
||||
ACTION_ENABLE,
|
||||
ACTION_UPDATE,
|
||||
MODULE_BUSINESS_ROLE,
|
||||
)
|
||||
from app.core.exceptions import BadRequestError, ForbiddenError, NotFoundError
|
||||
from app.core.response import PageResult
|
||||
from app.models import BusinessRole, User
|
||||
from app.repositories import business_role_repository
|
||||
from app.schemas.business_role import (
|
||||
BusinessRoleCreateIn,
|
||||
BusinessRoleOut,
|
||||
BusinessRoleQuery,
|
||||
BusinessRoleUpdateIn,
|
||||
TemplateOptionOut,
|
||||
TemplateParamOut,
|
||||
)
|
||||
from app.services import audit_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
from app.services.calc_templates import TEMPLATES
|
||||
from app.services.param_registry import PARAM_REGISTRY
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _to_out(role: BusinessRole) -> BusinessRoleOut:
|
||||
"""ORM 对象转响应模型。禁止把 ORM 对象直接当 response_model。"""
|
||||
return BusinessRoleOut(
|
||||
id=role.id,
|
||||
role_code=role.role_code,
|
||||
role_name=role.role_name,
|
||||
calc_template=role.calc_template,
|
||||
description=role.description,
|
||||
sort_order=role.sort_order,
|
||||
status=role.status,
|
||||
is_builtin=role.is_builtin,
|
||||
)
|
||||
|
||||
|
||||
def _ensure_template(calc_template: str) -> None:
|
||||
"""模板必须存在于代码内注册表(前端为受控下拉,后端仍须校验)。"""
|
||||
if calc_template not in TEMPLATES:
|
||||
raise BadRequestError(f"计提公式模板 {calc_template!r} 不存在")
|
||||
|
||||
|
||||
def list_roles(session: Session, query: BusinessRoleQuery) -> PageResult[BusinessRoleOut]:
|
||||
"""分页查询岗位(含停用)。"""
|
||||
roles = business_role_repository.list_roles(
|
||||
session,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
keyword=query.keyword,
|
||||
status=query.status,
|
||||
)
|
||||
total = business_role_repository.count_roles(
|
||||
session, keyword=query.keyword, status=query.status
|
||||
)
|
||||
return PageResult[BusinessRoleOut](
|
||||
records=[_to_out(role) for role in roles],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_role(session: Session, role_id: int) -> BusinessRoleOut:
|
||||
"""岗位详情。
|
||||
|
||||
:raises NotFoundError: 岗位不存在
|
||||
"""
|
||||
role = business_role_repository.get_by_id(session, role_id)
|
||||
if role is None:
|
||||
raise NotFoundError("岗位不存在")
|
||||
return _to_out(role)
|
||||
|
||||
|
||||
def list_template_options() -> list[TemplateOptionOut]:
|
||||
"""公式模板下拉(含声明参数,供岗位表单展示与引导配置)。"""
|
||||
options: list[TemplateOptionOut] = []
|
||||
for tpl in TEMPLATES.values():
|
||||
options.append(
|
||||
TemplateOptionOut(
|
||||
code=tpl.code,
|
||||
name=tpl.name,
|
||||
description=tpl.description,
|
||||
params=[
|
||||
TemplateParamOut(code=code, name=PARAM_REGISTRY[code].name)
|
||||
for code in tpl.params
|
||||
],
|
||||
)
|
||||
)
|
||||
return options
|
||||
|
||||
|
||||
def create_role(
|
||||
session: Session,
|
||||
payload: BusinessRoleCreateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> BusinessRoleOut:
|
||||
"""新增岗位。编码唯一、创建后不可修改,新岗位固定启用、非内置。
|
||||
|
||||
:raises BadRequestError: 编码已存在 / 模板不存在
|
||||
"""
|
||||
_ensure_template(payload.calc_template)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS_ROLE,
|
||||
action=ACTION_CREATE,
|
||||
summary=f"新增岗位 {payload.role_name}({payload.role_code})",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if business_role_repository.get_by_code(session, payload.role_code) is not None:
|
||||
raise BadRequestError(f"岗位编码 {payload.role_code!r} 已存在")
|
||||
|
||||
role = BusinessRole(
|
||||
role_code=payload.role_code,
|
||||
role_name=payload.role_name,
|
||||
calc_template=payload.calc_template,
|
||||
description=payload.description,
|
||||
sort_order=payload.sort_order,
|
||||
status=1,
|
||||
is_builtin=0,
|
||||
)
|
||||
try:
|
||||
business_role_repository.create(session, role)
|
||||
out = _to_out(role)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 先查后写不是原子操作:并发提交同一编码会撞 uk_business_roles_role_code
|
||||
session.rollback()
|
||||
raise BadRequestError(f"岗位编码 {payload.role_code!r} 已存在") from exc
|
||||
|
||||
logger.info(
|
||||
"新增岗位 | role_code=%s | template=%s", payload.role_code, payload.calc_template
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def update_role(
|
||||
session: Session,
|
||||
role_id: int,
|
||||
payload: BusinessRoleUpdateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> BusinessRoleOut:
|
||||
"""编辑岗位名称/模板/说明/排序(全量替换,不含 role_code)。
|
||||
|
||||
:raises NotFoundError: 岗位不存在
|
||||
:raises BadRequestError: 模板不存在
|
||||
"""
|
||||
role = business_role_repository.get_by_id(session, role_id)
|
||||
_ensure_template(payload.calc_template)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS_ROLE,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改岗位 {role.role_name if role else f'#{role_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if role is None:
|
||||
raise NotFoundError("岗位不存在")
|
||||
|
||||
role.role_name = payload.role_name
|
||||
role.calc_template = payload.calc_template
|
||||
role.description = payload.description
|
||||
role.sort_order = payload.sort_order
|
||||
# 响应与后置动作全部在 commit 之前完成(见 user_service 顶部说明)
|
||||
out = _to_out(role)
|
||||
session.commit()
|
||||
logger.info("修改岗位 | role_id=%s | template=%s", role_id, payload.calc_template)
|
||||
return out
|
||||
|
||||
|
||||
def set_status(
|
||||
session: Session,
|
||||
role_id: int,
|
||||
status: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> BusinessRoleOut:
|
||||
"""启用或禁用岗位。内置岗位不可停用(参数种子按编码锚定)。
|
||||
|
||||
:raises NotFoundError: 岗位不存在
|
||||
:raises ForbiddenError: 试图停用内置岗位
|
||||
"""
|
||||
role = business_role_repository.get_by_id(session, role_id)
|
||||
verb = "启用" if status == 1 else "禁用"
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS_ROLE,
|
||||
action=ACTION_ENABLE if status == 1 else ACTION_DISABLE,
|
||||
summary=f"{verb}岗位 {role.role_name if role else f'#{role_id}'}",
|
||||
request_data={"status": status},
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if role is None:
|
||||
raise NotFoundError("岗位不存在")
|
||||
|
||||
if role.is_builtin == 1 and status == 0:
|
||||
raise ForbiddenError("内置岗位不可停用")
|
||||
|
||||
role.status = status
|
||||
out = _to_out(role)
|
||||
session.commit()
|
||||
logger.info("变更岗位状态 | role_id=%s | status=%s", role_id, status)
|
||||
return out
|
||||
|
||||
|
||||
def delete_role(
|
||||
session: Session,
|
||||
role_id: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""删除岗位。内置岗位不可删除;有人员引用的岗位不可删除。
|
||||
|
||||
查询走 ``FOR UPDATE`` 锁行:校验与删除之间若发生并发引用(M2 接入后),
|
||||
锁行使并发写入失败(可见)而非引用被静默悬空(不可见)。
|
||||
|
||||
:raises NotFoundError: 岗位不存在
|
||||
:raises ForbiddenError: 试图删除内置岗位
|
||||
:raises BadRequestError: 岗位下仍有人引用
|
||||
"""
|
||||
role = business_role_repository.get_by_id(session, role_id, for_update=True)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS_ROLE,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"删除岗位 {role.role_name if role else f'#{role_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if role is None:
|
||||
raise NotFoundError("岗位不存在")
|
||||
|
||||
if role.is_builtin == 1:
|
||||
raise ForbiddenError("内置岗位不可删除")
|
||||
|
||||
counts = business_role_repository.count_personnel_by_role(session, [role_id])
|
||||
person_count = counts.get(role_id, 0)
|
||||
if person_count > 0:
|
||||
raise BadRequestError(f"该岗位下仍有 {person_count} 名人员,请先调整归属")
|
||||
|
||||
role_code = role.role_code # 固化:对象随删除失效
|
||||
business_role_repository.delete(session, role)
|
||||
session.commit()
|
||||
logger.info("删除岗位 | role_code=%s", role_code)
|
||||
@@ -0,0 +1,847 @@
|
||||
"""业务管理业务编排(需求 2.2.1/2.2.4)。
|
||||
|
||||
事务边界在本层:repository 只 flush,commit/rollback 只写在这里。
|
||||
|
||||
- 业务编号自动生成(no_generator.next_no):MAX+FOR UPDATE 锁当日序号区间,
|
||||
残余竞态以唯一键(1062)冲突重试一次兜底
|
||||
- 五项汇总冗余(total_sale/cost/ship/received/freight)由 ``_recalc_totals``
|
||||
单点重算 —— 明细/发货/回款任何写路径收口到此函数,禁止各处手写
|
||||
- 状态机:1执行中 → 2已完成 / 3已终止;终态不可再变更(一期口径,开放问题 #8);
|
||||
终止必填原因;每次流转写 business_status_logs(创建写首条 old=new=1)
|
||||
- 归属变更(负责/协助)写 ownership_change_logs(owner_type=2),同事务一次
|
||||
commit;只影响变更后核算,不回溯历史(对照表 #19)
|
||||
- 毛利润视图为只读派生值(复用 formula.profit_rate/converted_profit),
|
||||
阈值按 asOf 取 M1 参数快照 —— 落库即漂移,M3 台账才是固化点
|
||||
"""
|
||||
|
||||
import logging
|
||||
from datetime import date
|
||||
from decimal import ROUND_HALF_UP, Decimal
|
||||
from fractions import Fraction
|
||||
|
||||
from sqlalchemy import Row, func, select
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
ACTION_DELETE,
|
||||
ACTION_UPDATE,
|
||||
MODULE_BUSINESS,
|
||||
NO_PREFIX_BUSINESS,
|
||||
)
|
||||
from app.core.db_errors import is_duplicate_entry
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.core.response import PageQuery, PageResult
|
||||
from app.models import (
|
||||
Business,
|
||||
BusinessItem,
|
||||
BusinessStatusLog,
|
||||
Customer,
|
||||
OwnershipChangeLog,
|
||||
Personnel,
|
||||
Receipt,
|
||||
SecondaryAllocation,
|
||||
Shipment,
|
||||
User,
|
||||
)
|
||||
from app.models.approval import APPROVAL_TYPE_SECONDARY_ALLOCATION
|
||||
from app.models.business import (
|
||||
BUSINESS_STATUS_ACTIVE,
|
||||
BUSINESS_STATUS_DONE,
|
||||
)
|
||||
from app.models.customer import OWNER_TYPE_BUSINESS
|
||||
from app.repositories import business_repository, customer_repository
|
||||
from app.schemas.business import (
|
||||
BusinessCreateIn,
|
||||
BusinessDetailOut,
|
||||
BusinessItemIn,
|
||||
BusinessItemOut,
|
||||
BusinessOut,
|
||||
BusinessOwnershipIn,
|
||||
BusinessQuery,
|
||||
BusinessStatusIn,
|
||||
BusinessStatusLogOut,
|
||||
BusinessUpdateIn,
|
||||
GrossProfitCategoryOut,
|
||||
GrossProfitOut,
|
||||
GrossProfitRowOut,
|
||||
OwnershipChangeLogOut,
|
||||
SecondaryAllocationIn,
|
||||
SecondaryAllocationOut,
|
||||
)
|
||||
from app.services import approval_service, audit_service, param_service, personnel_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
from app.services.formula import converted_profit, profit_rate
|
||||
from app.services.no_generator import next_no
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 编号唯一键冲突后的重试次数:MAX+FOR UPDATE 已覆盖绝大多数竞态,
|
||||
# 重试是为极端场景(锁等待超时后重入)兜底 —— 无限重试反而掩盖死锁类缺陷
|
||||
_NO_RETRY = 1
|
||||
|
||||
|
||||
def _to_out(row: tuple) -> BusinessOut:
|
||||
"""(business, company_name, owner_name, assistant_name) → 响应模型。
|
||||
|
||||
金额冗余列出参 str;汇总列可能为 NULL(server_default 只对 INSERT 生效,
|
||||
存量行可能为 NULL),统一转 "0" 保持契约稳定。
|
||||
"""
|
||||
business, company_name, owner_name, assistant_name = row
|
||||
return BusinessOut(
|
||||
id=business.id,
|
||||
business_no=business.business_no,
|
||||
customer_id=business.customer_id,
|
||||
customer_name=company_name,
|
||||
business_date=business.business_date,
|
||||
status=business.status,
|
||||
owner_personnel_id=business.owner_personnel_id,
|
||||
owner_personnel_name=owner_name,
|
||||
assistant_personnel_id=business.assistant_personnel_id,
|
||||
assistant_personnel_name=assistant_name,
|
||||
is_special=business.is_special,
|
||||
special_note=business.special_note,
|
||||
total_sale_amount=_str_or_zero(business.total_sale_amount),
|
||||
total_cost_amount=_str_or_zero(business.total_cost_amount),
|
||||
total_ship_amount=_str_or_zero(business.total_ship_amount),
|
||||
total_received_amount=_str_or_zero(business.total_received_amount),
|
||||
total_freight_amount=_str_or_zero(business.total_freight_amount),
|
||||
remark=business.remark,
|
||||
)
|
||||
|
||||
|
||||
def _str_or_zero(value: Decimal | None) -> str:
|
||||
return str(value) if value is not None else "0"
|
||||
|
||||
|
||||
def _item_to_out(item: BusinessItem) -> BusinessItemOut:
|
||||
return BusinessItemOut(
|
||||
id=item.id,
|
||||
product_id=item.product_id,
|
||||
product_name=item.product_name,
|
||||
spec_model=item.spec_model,
|
||||
unit=item.unit,
|
||||
product_category=item.product_category,
|
||||
quantity=str(item.quantity),
|
||||
sale_price=str(item.sale_price) if item.sale_price is not None else None,
|
||||
sale_amount=str(item.sale_amount),
|
||||
cost_amount=str(item.cost_amount) if item.cost_amount is not None else None,
|
||||
guided_price=str(item.guided_price) if item.guided_price is not None else None,
|
||||
remark=item.remark,
|
||||
)
|
||||
|
||||
|
||||
def _build_item_rows(business_id: int, items: list[BusinessItemIn]) -> list[BusinessItem]:
|
||||
"""入参明细行转 ORM 行:sale_amount 服务层按 数量×单价 计算固化。
|
||||
|
||||
不信任前端传值(schema 亦无 sale_amount 入参)——单价可空时销售额记 0,
|
||||
由用户在编辑中补价后重算(毛利润视图中销售额 0 的行全部为 0,防除零)。
|
||||
乘积显式 quantize 两位固化:数量(2位)×单价(4位) 可产 6 位小数,直写
|
||||
DECIMAL(14,2) 会被 MySQL 静默舍入且回显漂移(创建响应读内存值、复查
|
||||
读库值前后不一致);HALF_UP 与 MySQL 的 DECIMAL 舍入方向一致。
|
||||
"""
|
||||
rows: list[BusinessItem] = []
|
||||
for item in items:
|
||||
quantity = Decimal(item.quantity)
|
||||
sale_price = Decimal(item.sale_price) if item.sale_price is not None else None
|
||||
sale_amount = (
|
||||
(quantity * sale_price).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
|
||||
if sale_price is not None
|
||||
else Decimal("0.00")
|
||||
)
|
||||
rows.append(
|
||||
BusinessItem(
|
||||
business_id=business_id,
|
||||
product_id=item.product_id,
|
||||
product_name=item.product_name,
|
||||
spec_model=item.spec_model or "",
|
||||
unit=item.unit,
|
||||
product_category=item.product_category,
|
||||
quantity=quantity,
|
||||
sale_price=sale_price,
|
||||
sale_amount=sale_amount,
|
||||
cost_amount=Decimal(item.cost_amount) if item.cost_amount is not None else None,
|
||||
guided_price=Decimal(item.guided_price) if item.guided_price is not None else None,
|
||||
remark=item.remark,
|
||||
)
|
||||
)
|
||||
return rows
|
||||
|
||||
|
||||
def _recalc_totals(session: Session, business: Business) -> None:
|
||||
"""重算业务的五项汇总冗余(明细/发货/回款写路径统一收口)。
|
||||
|
||||
五条独立聚合查询(各表单列 SUM,走 business_id 索引)——业务单据量级
|
||||
为单业务数行,不值得为省查询做单大 JOIN。
|
||||
"""
|
||||
sale = session.execute(
|
||||
_sum(BusinessItem.sale_amount, BusinessItem.business_id, business.id)
|
||||
).scalar_one()
|
||||
cost = session.execute(
|
||||
_sum(BusinessItem.cost_amount, BusinessItem.business_id, business.id)
|
||||
).scalar_one()
|
||||
ship = session.execute(_sum_ship_items(business.id)).scalar_one()
|
||||
freight = session.execute(
|
||||
_sum(Shipment.freight_amount, Shipment.business_id, business.id)
|
||||
).scalar_one()
|
||||
received = session.execute(_sum(Receipt.amount, Receipt.business_id, business.id)).scalar_one()
|
||||
business.total_sale_amount = sale or Decimal("0")
|
||||
business.total_cost_amount = cost or Decimal("0")
|
||||
business.total_ship_amount = ship or Decimal("0")
|
||||
business.total_freight_amount = freight or Decimal("0")
|
||||
business.total_received_amount = received or Decimal("0")
|
||||
|
||||
|
||||
def _sum(column, match_column, value) -> object:
|
||||
return select(func.sum(column)).where(match_column == value)
|
||||
|
||||
|
||||
def _sum_ship_items(business_id: int):
|
||||
"""发货明细行金额合计(经发货单关联到业务)。"""
|
||||
from app.models import ShipmentItem
|
||||
|
||||
return (
|
||||
select(func.sum(ShipmentItem.amount))
|
||||
.select_from(ShipmentItem)
|
||||
.join(Shipment, Shipment.id == ShipmentItem.shipment_id)
|
||||
.where(Shipment.business_id == business_id)
|
||||
)
|
||||
|
||||
|
||||
def _generate_no(session: Session) -> str:
|
||||
"""生成业务编号(MAX+FOR UPDATE;1062 兜底重试一次,见模块 docstring)。"""
|
||||
return next_no(session, model=Business, column_name="business_no", prefix=NO_PREFIX_BUSINESS)
|
||||
|
||||
|
||||
def _ensure_personnel_active(session: Session, personnel_id: int, label: str) -> Personnel:
|
||||
"""归属人员须存在且在职(共享校验收口于 personnel_service.ensure_active)。"""
|
||||
return personnel_service.ensure_active(session, personnel_id, label=label)
|
||||
|
||||
|
||||
def _ensure_customer(session: Session, customer_id: int) -> Customer:
|
||||
customer = customer_repository.get_by_id(session, customer_id)
|
||||
if customer is None:
|
||||
raise NotFoundError("客户不存在")
|
||||
return customer
|
||||
|
||||
|
||||
def _is_duplicate_entry(exc: IntegrityError) -> bool:
|
||||
return is_duplicate_entry(exc)
|
||||
|
||||
|
||||
def list_businesses(session: Session, query: BusinessQuery) -> PageResult[BusinessOut]:
|
||||
"""分页查询业务(附客户名与归属人名)。"""
|
||||
rows = business_repository.list_businesses(
|
||||
session,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
keyword=query.keyword,
|
||||
status=query.status,
|
||||
customer_id=query.customer_id,
|
||||
owner_personnel_id=query.owner_personnel_id,
|
||||
date_from=query.date_from,
|
||||
date_to=query.date_to,
|
||||
)
|
||||
total = business_repository.count_businesses(
|
||||
session,
|
||||
keyword=query.keyword,
|
||||
status=query.status,
|
||||
customer_id=query.customer_id,
|
||||
owner_personnel_id=query.owner_personnel_id,
|
||||
date_from=query.date_from,
|
||||
date_to=query.date_to,
|
||||
)
|
||||
return PageResult[BusinessOut](
|
||||
records=[_to_out(row) for row in rows],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_detail(session: Session, business_id: int) -> BusinessDetailOut:
|
||||
"""业务详情(附明细行与二次分配方案,供编辑抽屉回显)。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
"""
|
||||
row = business_repository.get_with_names(session, business_id)
|
||||
if row is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
out = BusinessDetailOut(**_to_out(row).model_dump())
|
||||
out.items = [
|
||||
_item_to_out(item) for item in business_repository.list_items(session, business_id)
|
||||
]
|
||||
allocations = business_repository.list_allocations(session, business_id)
|
||||
out.secondary_allocations = [
|
||||
SecondaryAllocationOut(
|
||||
personnel_id=a.personnel_id, personnel_name=a.personnel_name, ratio=str(a.ratio)
|
||||
)
|
||||
for a in allocations
|
||||
]
|
||||
out.allocation_hint = _allocation_hint(allocations)
|
||||
return out
|
||||
|
||||
|
||||
def _build_allocation_rows(
|
||||
session: Session, business_id: int, items: list[SecondaryAllocationIn]
|
||||
) -> list[SecondaryAllocation]:
|
||||
"""构造二次分配明细行:人员在职校验 + 姓名冗余固化 + 比例转 Decimal。
|
||||
|
||||
:raises BadRequestError: 参与人员不存在或已离职
|
||||
"""
|
||||
rows: list[SecondaryAllocation] = []
|
||||
for item in items:
|
||||
person = _ensure_personnel_active(session, item.personnel_id, "分摊参与")
|
||||
rows.append(
|
||||
SecondaryAllocation(
|
||||
business_id=business_id,
|
||||
personnel_id=item.personnel_id,
|
||||
personnel_name=person.personnel_name,
|
||||
ratio=Decimal(item.ratio),
|
||||
)
|
||||
)
|
||||
return rows
|
||||
|
||||
|
||||
def _allocation_hint(allocations: list[SecondaryAllocation]) -> str | None:
|
||||
"""方案合计/余额提示(不强制合计满额是需求原文;余额归属待澄清 #2)。
|
||||
|
||||
无方案返回 None;合计恰满额只报合计,避免「余额 0」噪音。
|
||||
"""
|
||||
if not allocations:
|
||||
return None
|
||||
total = sum((a.ratio for a in allocations), Decimal("0"))
|
||||
total_text = total.quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
|
||||
if total == Decimal("100"):
|
||||
return f"二次分配合计 {total_text}%"
|
||||
rest = (Decimal("100") - total).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
|
||||
return f"二次分配合计 {total_text}%,余额 {rest}%(归属待业务确认)"
|
||||
|
||||
|
||||
def create_business(
|
||||
session: Session,
|
||||
payload: BusinessCreateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> BusinessOut:
|
||||
"""创建业务 + 明细行 + 首条状态留痕,一个事务。
|
||||
|
||||
创建时指定的归属不写归属留痕(留痕记「变更」,创建即初始事实)。
|
||||
|
||||
:raises NotFoundError: 客户不存在
|
||||
:raises BadRequestError: 归属人员不存在或已离职 / 明细校验不通过
|
||||
"""
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS,
|
||||
action=ACTION_CREATE,
|
||||
summary=f"创建业务(客户ID={payload.customer_id},明细 {len(payload.items)} 行)",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
_ensure_customer(session, payload.customer_id)
|
||||
if payload.owner_personnel_id is not None:
|
||||
_ensure_personnel_active(session, payload.owner_personnel_id, "负责")
|
||||
if payload.assistant_personnel_id is not None:
|
||||
_ensure_personnel_active(session, payload.assistant_personnel_id, "协助")
|
||||
|
||||
# 编号唯一键冲突的重试整体收在审计上下文内:rollback 后同一事务重来,
|
||||
# 成功/最终失败各只记一条审计(吞异常 return 会被记成假成功,重入
|
||||
# 整个 create_* 则违反「不支持嵌套」约定);上限 _NO_RETRY 防无限重试
|
||||
# 掩盖死锁类缺陷。审计摘要预取的是首次编号——重试成功时入库编号见
|
||||
# 应用日志(AuditRecord frozen,不回填)。
|
||||
for attempt in range(_NO_RETRY + 1):
|
||||
try:
|
||||
business = Business(
|
||||
business_no=_generate_no(session),
|
||||
customer_id=payload.customer_id,
|
||||
business_date=payload.business_date,
|
||||
status=BUSINESS_STATUS_ACTIVE,
|
||||
owner_personnel_id=payload.owner_personnel_id,
|
||||
assistant_personnel_id=payload.assistant_personnel_id,
|
||||
is_special=payload.is_special,
|
||||
special_note=payload.special_note,
|
||||
remark=payload.remark,
|
||||
)
|
||||
business_repository.create(session, business)
|
||||
business_repository.replace_items(
|
||||
session, business.id, _build_item_rows(business.id, payload.items)
|
||||
)
|
||||
_recalc_totals(session, business)
|
||||
business_repository.add_status_log(
|
||||
session,
|
||||
BusinessStatusLog(
|
||||
business_id=business.id,
|
||||
old_status=BUSINESS_STATUS_ACTIVE,
|
||||
new_status=BUSINESS_STATUS_ACTIVE,
|
||||
operator_id=operator.id,
|
||||
operator_name=operator.username,
|
||||
),
|
||||
)
|
||||
# 二次分配方案与业务同事务(需求:只出现在合同刚建立时);
|
||||
# 放在重试循环内——rollback 后方案行随业务一并重来
|
||||
business_repository.replace_allocations(
|
||||
session,
|
||||
business.id,
|
||||
_build_allocation_rows(session, business.id, payload.secondary_allocations),
|
||||
)
|
||||
# 方案非空才提单:开关关闭=自动通过留痕,开启=待财务复核。
|
||||
# retry_on_conflict=True:AP 编号撞键可内部重取(外层编号
|
||||
# 重试循环兜底整体重来)
|
||||
if payload.secondary_allocations:
|
||||
approval_service.submit_order(
|
||||
session,
|
||||
order_type=APPROVAL_TYPE_SECONDARY_ALLOCATION,
|
||||
ref_id=business.id,
|
||||
refer_no=business.business_no,
|
||||
submitter=operator,
|
||||
retry_on_conflict=True,
|
||||
)
|
||||
customer = customer_repository.get_by_id(session, business.customer_id)
|
||||
out = _to_out((business, customer.company_name if customer else None, None, None))
|
||||
new_id, new_no = business.id, business.business_no # 固化:commit 后不碰 ORM
|
||||
session.commit()
|
||||
break
|
||||
except IntegrityError as exc:
|
||||
session.rollback()
|
||||
if _is_duplicate_entry(exc) and attempt < _NO_RETRY:
|
||||
continue
|
||||
raise
|
||||
|
||||
logger.info("创建业务 | business_id=%s | no=%s", new_id, new_no)
|
||||
return out
|
||||
|
||||
|
||||
def update_business(
|
||||
session: Session,
|
||||
business_id: int,
|
||||
payload: BusinessUpdateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> BusinessOut:
|
||||
"""编辑业务:全量替换明细 + 重算汇总;归属不在此端点(防旁路)。
|
||||
|
||||
客户可改,但有发货或回款记录后禁改 —— 单据 FK 挂在业务上,换客户会让
|
||||
发货/回款语义断裂(明细同理随业务走)。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
:raises BadRequestError: 业务已完成或已终止 / 归属人员不合法 / 有发货或回款时换客户
|
||||
"""
|
||||
row = business_repository.get_with_names(session, business_id, for_update=True)
|
||||
business = row[0] if row else None
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改业务 {business.business_no if business else f'#{business_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if row is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
business, _, owner_name, assistant_name = row
|
||||
|
||||
# 终态门槛与发货/回款写准入同口径:明细与汇总是 M3 核算基线,
|
||||
# 已完成/已终止的业务禁改(发货/回款服务以同一理由禁写终态业务)
|
||||
if business.status != BUSINESS_STATUS_ACTIVE:
|
||||
raise BadRequestError("业务已完成或已终止,禁止编辑业务")
|
||||
|
||||
if payload.customer_id != business.customer_id and business_repository.has_docs(
|
||||
session, business_id
|
||||
):
|
||||
raise BadRequestError("业务已有发货或回款记录,不能更换客户")
|
||||
customer = _ensure_customer(session, payload.customer_id)
|
||||
if payload.owner_personnel_id is not None:
|
||||
_ensure_personnel_active(session, payload.owner_personnel_id, "负责")
|
||||
if payload.assistant_personnel_id is not None:
|
||||
_ensure_personnel_active(session, payload.assistant_personnel_id, "协助")
|
||||
|
||||
business.customer_id = payload.customer_id
|
||||
business.business_date = payload.business_date
|
||||
business.is_special = payload.is_special
|
||||
business.special_note = payload.special_note
|
||||
business.remark = payload.remark
|
||||
# 归属刻意不赋值:留痕只由 /ownership 端点产生,编辑路径改归属构成
|
||||
# 「改归属不留痕」的旁路(与 customers 编辑不触归属同一口径)
|
||||
business_repository.replace_items(
|
||||
session, business_id, _build_item_rows(business_id, payload.items)
|
||||
)
|
||||
# 方案全量替换(空数组=清空);终态门槛已挡「修改影响已结算月份」的
|
||||
# 前置场景(月结在 ④,快照固化后按同一哲学隔离)
|
||||
business_repository.replace_allocations(
|
||||
session,
|
||||
business_id,
|
||||
_build_allocation_rows(session, business_id, payload.secondary_allocations),
|
||||
)
|
||||
# 方案非空提单(自动撤回旧在途单);retry_on_conflict=False:
|
||||
# 本路径无外层重试,内部 rollback 会回掉业务行修改造成静默丢失
|
||||
if payload.secondary_allocations:
|
||||
approval_service.submit_order(
|
||||
session,
|
||||
order_type=APPROVAL_TYPE_SECONDARY_ALLOCATION,
|
||||
ref_id=business_id,
|
||||
refer_no=business.business_no,
|
||||
submitter=operator,
|
||||
retry_on_conflict=False,
|
||||
)
|
||||
_recalc_totals(session, business)
|
||||
# 锁定行上已赋值,同一身份映射实例的 _to_out 即反映新值;名称字段
|
||||
# 从首查 row 取(换客户时 _ensure_customer 已给出新公司名)
|
||||
out = _to_out((business, customer.company_name, owner_name, assistant_name))
|
||||
session.commit()
|
||||
logger.info("修改业务 | business_id=%s", business_id)
|
||||
return out
|
||||
|
||||
|
||||
def delete_business(
|
||||
session: Session,
|
||||
business_id: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""删除业务(物理删除):有发货/回款 → 400 引导走「已终止」。
|
||||
|
||||
无单据引用的业务(建错的空单)方可删除;删除时连带清理明细、状态留痕
|
||||
与业务维度的归属留痕(无外键固化表,须手动清)。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
:raises BadRequestError: 存在发货或回款记录
|
||||
"""
|
||||
business = business_repository.get_by_id(session, business_id, for_update=True)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"删除业务 {business.business_no if business else f'#{business_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if business is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
if business_repository.has_docs(session, business_id):
|
||||
raise BadRequestError("业务已有发货或回款记录,请改为已终止而非删除")
|
||||
|
||||
business_no = business.business_no
|
||||
_hard_delete(session, business_id)
|
||||
session.commit()
|
||||
logger.info("删除业务 | business_id=%s | no=%s", business_id, business_no)
|
||||
|
||||
|
||||
def _hard_delete(session: Session, business_id: int) -> None:
|
||||
"""按依赖序删除:明细 → 状态留痕 → 业务维度归属留痕 → 主表。"""
|
||||
from sqlalchemy import delete
|
||||
|
||||
session.execute(delete(BusinessItem).where(BusinessItem.business_id == business_id))
|
||||
session.execute(delete(BusinessStatusLog).where(BusinessStatusLog.business_id == business_id))
|
||||
session.execute(
|
||||
delete(OwnershipChangeLog).where(
|
||||
OwnershipChangeLog.owner_type == OWNER_TYPE_BUSINESS,
|
||||
OwnershipChangeLog.business_id == business_id,
|
||||
)
|
||||
)
|
||||
session.execute(delete(Business).where(Business.id == business_id))
|
||||
|
||||
|
||||
def change_status(
|
||||
session: Session,
|
||||
business_id: int,
|
||||
payload: BusinessStatusIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> BusinessOut:
|
||||
"""状态流转:1→2 / 1→3,终态不可再变更;每次流转写留痕。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
:raises BadRequestError: 非执行中状态流转 / 目标与当前相同
|
||||
"""
|
||||
row = business_repository.get_with_names(session, business_id, for_update=True)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS,
|
||||
action=ACTION_UPDATE,
|
||||
summary=(
|
||||
f"业务状态变更 {row[0].business_no if row else f'#{business_id}'} → "
|
||||
f"{'已完成' if payload.status == BUSINESS_STATUS_DONE else '已终止'}"
|
||||
),
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if row is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
business, _, _, _ = row
|
||||
if business.status != BUSINESS_STATUS_ACTIVE:
|
||||
raise BadRequestError("已完成或已终止的业务不可再变更状态")
|
||||
if business.status == payload.status:
|
||||
raise BadRequestError("状态未变化")
|
||||
|
||||
# 变更前状态须在赋值前固化:ORM 属性赋值后 old_status 就取不到旧值
|
||||
# (留痕会记成 old==new 失真,时间线无法回溯)
|
||||
old_status = business.status
|
||||
business.status = payload.status
|
||||
business_repository.add_status_log(
|
||||
session,
|
||||
BusinessStatusLog(
|
||||
business_id=business_id,
|
||||
old_status=old_status,
|
||||
new_status=payload.status,
|
||||
change_reason=payload.reason,
|
||||
operator_id=operator.id,
|
||||
operator_name=operator.username,
|
||||
),
|
||||
)
|
||||
# 锁定行上已赋值,同一身份映射实例的 _to_out 即反映新状态
|
||||
out = _to_out(row)
|
||||
session.commit()
|
||||
logger.info(
|
||||
"业务状态变更 | business_id=%s | %s -> %s",
|
||||
business_id,
|
||||
old_status,
|
||||
payload.status,
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def change_ownership(
|
||||
session: Session,
|
||||
business_id: int,
|
||||
payload: BusinessOwnershipIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> BusinessOut:
|
||||
"""归属变更(负责/协助):同事务「更新主表 + 插留痕」,一次 commit。
|
||||
|
||||
负责与协助之一发生变化即记一条留痕(前后值都含两个字段);两者均未变化
|
||||
→ 400「归属未变化」。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
:raises BadRequestError: 归属人员不存在或已离职 / 归属未变化
|
||||
"""
|
||||
row = business_repository.get_with_names(session, business_id, for_update=True)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_BUSINESS,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"调整业务归属 {row[0].business_no if row else f'#{business_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if row is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
business, _, old_owner_name, old_assistant_name = row
|
||||
# 归属变更的出参姓名来自校验函数的返回行(锁定读):首查姓名是变更前
|
||||
# 固化标量,新归属人名必须按新 ID 重取
|
||||
new_owner = (
|
||||
_ensure_personnel_active(session, payload.new_owner_personnel_id, "负责")
|
||||
if payload.new_owner_personnel_id is not None
|
||||
else None
|
||||
)
|
||||
new_assistant = (
|
||||
_ensure_personnel_active(session, payload.new_assistant_personnel_id, "协助")
|
||||
if payload.new_assistant_personnel_id is not None
|
||||
else None
|
||||
)
|
||||
|
||||
owner_changed = business.owner_personnel_id != payload.new_owner_personnel_id
|
||||
assistant_changed = business.assistant_personnel_id != payload.new_assistant_personnel_id
|
||||
if not owner_changed and not assistant_changed:
|
||||
raise BadRequestError("归属未变化")
|
||||
|
||||
old_owner_id = business.owner_personnel_id
|
||||
old_assistant_id = business.assistant_personnel_id
|
||||
business.owner_personnel_id = payload.new_owner_personnel_id
|
||||
business.assistant_personnel_id = payload.new_assistant_personnel_id
|
||||
business_repository.add_ownership_log(
|
||||
session,
|
||||
OwnershipChangeLog(
|
||||
owner_type=OWNER_TYPE_BUSINESS,
|
||||
business_id=business_id,
|
||||
old_owner_personnel_id=old_owner_id,
|
||||
new_owner_personnel_id=payload.new_owner_personnel_id,
|
||||
old_assistant_personnel_id=old_assistant_id,
|
||||
new_assistant_personnel_id=payload.new_assistant_personnel_id,
|
||||
change_reason=payload.reason,
|
||||
operator_id=operator.id,
|
||||
operator_name=operator.username,
|
||||
),
|
||||
)
|
||||
# 出参组装:ID 在锁定行上已赋值(_to_out 读内存值即反映新值),姓名
|
||||
# 一侧「变更项用新 ID 的人名、未变项沿用首查名」——首查名是变更前快照
|
||||
out = _to_out(
|
||||
(
|
||||
business,
|
||||
row[1],
|
||||
new_owner.personnel_name if new_owner is not None else old_owner_name,
|
||||
new_assistant.personnel_name if new_assistant is not None else old_assistant_name,
|
||||
)
|
||||
)
|
||||
session.commit()
|
||||
logger.info(
|
||||
"调整业务归属 | business_id=%s | owner %s->%s | assistant %s->%s",
|
||||
business_id,
|
||||
old_owner_id,
|
||||
payload.new_owner_personnel_id,
|
||||
old_assistant_id,
|
||||
payload.new_assistant_personnel_id,
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def list_ownership_logs(
|
||||
session: Session, business_id: int, query: PageQuery
|
||||
) -> PageResult[OwnershipChangeLogOut]:
|
||||
"""某业务的归属变更留痕(分页)。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
"""
|
||||
if business_repository.get_by_id(session, business_id) is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
rows = business_repository.list_ownership_logs(
|
||||
session, business_id, offset=query.offset, limit=query.page_size
|
||||
)
|
||||
total = business_repository.count_ownership_logs(session, business_id=business_id)
|
||||
return PageResult[OwnershipChangeLogOut](
|
||||
records=[_log_to_out(row) for row in rows],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def _log_to_out(row: Row) -> OwnershipChangeLogOut:
|
||||
log, old_owner_name, new_owner_name = row
|
||||
return OwnershipChangeLogOut(
|
||||
id=log.id,
|
||||
business_id=log.business_id,
|
||||
old_owner_personnel_id=log.old_owner_personnel_id,
|
||||
new_owner_personnel_id=log.new_owner_personnel_id,
|
||||
old_assistant_personnel_id=log.old_assistant_personnel_id,
|
||||
new_assistant_personnel_id=log.new_assistant_personnel_id,
|
||||
old_owner_name=old_owner_name,
|
||||
new_owner_name=new_owner_name,
|
||||
change_reason=log.change_reason,
|
||||
operator_id=log.operator_id,
|
||||
operator_name=log.operator_name,
|
||||
create_time=log.create_time,
|
||||
)
|
||||
|
||||
|
||||
def list_status_logs(
|
||||
session: Session, business_id: int, query: PageQuery
|
||||
) -> PageResult[BusinessStatusLogOut]:
|
||||
"""某业务的状态流转时间线(分页,时间正序)。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
"""
|
||||
if business_repository.get_by_id(session, business_id) is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
rows = business_repository.list_status_logs(
|
||||
session, business_id, offset=query.offset, limit=query.page_size
|
||||
)
|
||||
total = business_repository.count_status_logs(session, business_id=business_id)
|
||||
return PageResult[BusinessStatusLogOut](
|
||||
records=[BusinessStatusLogOut.model_validate(row) for row in rows],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def gross_profit(session: Session, business_id: int, as_of: date | None) -> GrossProfitOut:
|
||||
"""毛利润数据视图(需求 2.2.4):行级派生值 + 类别汇总,实时计算不落库。
|
||||
|
||||
阈值按 asOf(默认今日)取 M1 参数快照(product.threshold,按行类别维度,
|
||||
存储口径为 % 数如 30,直接进 converted_profit);毛利润率按 M1 预览同一
|
||||
出参口径输出 Fraction 分数字符串(如 "97/10000");成本缺失的行派生列为
|
||||
None 并标注原因;汇总只聚合可计算行。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
"""
|
||||
if business_repository.get_by_id(session, business_id) is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
as_of = as_of or date.today()
|
||||
snapshot = param_service.resolve_snapshot(session, as_of)
|
||||
|
||||
def threshold_of(category: str) -> Fraction:
|
||||
return snapshot.fraction("product.threshold", product_category=category)
|
||||
|
||||
rows_out: list[GrossProfitRowOut] = []
|
||||
missing_count = 0
|
||||
# 类别聚合容器:{类别: [sale, cost]},成本缺失行不计入该类别聚合
|
||||
agg: dict[str, list[Decimal]] = {}
|
||||
for item in business_repository.list_items(session, business_id):
|
||||
threshold = threshold_of(item.product_category)
|
||||
row_kwargs: dict = {
|
||||
"item_id": item.id,
|
||||
"product_category": item.product_category,
|
||||
"product_name": item.product_name,
|
||||
"spec_model": item.spec_model,
|
||||
"quantity": str(item.quantity),
|
||||
"sale_amount": str(item.sale_amount),
|
||||
"threshold": str(threshold),
|
||||
}
|
||||
if item.cost_amount is None:
|
||||
missing_count += 1
|
||||
row_kwargs.update(
|
||||
cost_amount=None,
|
||||
profit_amount=None,
|
||||
profit_rate=None,
|
||||
converted_profit=None,
|
||||
missing_reason="成本缺失,无法计算毛利润",
|
||||
)
|
||||
else:
|
||||
profit = item.sale_amount - item.cost_amount
|
||||
rate = profit_rate(profit, item.sale_amount)
|
||||
conv = converted_profit(item.sale_amount, rate, threshold)
|
||||
row_kwargs.update(
|
||||
cost_amount=str(item.cost_amount),
|
||||
profit_amount=str(profit),
|
||||
profit_rate=str(rate),
|
||||
converted_profit=str(conv),
|
||||
missing_reason=None,
|
||||
)
|
||||
bucket = agg.setdefault(item.product_category, [Decimal("0"), Decimal("0")])
|
||||
bucket[0] += item.sale_amount
|
||||
bucket[1] += item.cost_amount
|
||||
rows_out.append(GrossProfitRowOut(**row_kwargs))
|
||||
|
||||
categories = [
|
||||
GrossProfitCategoryOut(
|
||||
product_category=category,
|
||||
sale_amount=str(sale),
|
||||
cost_amount=str(cost),
|
||||
profit_amount=str(sale - cost),
|
||||
profit_rate=str(profit_rate(sale - cost, sale)),
|
||||
threshold=str(threshold_of(category)),
|
||||
converted_profit=str(
|
||||
converted_profit(sale, profit_rate(sale - cost, sale), threshold_of(category))
|
||||
),
|
||||
)
|
||||
for category, [sale, cost] in agg.items()
|
||||
]
|
||||
return GrossProfitOut(
|
||||
business_id=business_id,
|
||||
as_of=as_of,
|
||||
rows=rows_out,
|
||||
categories=categories,
|
||||
missing_count=missing_count,
|
||||
)
|
||||
@@ -0,0 +1,72 @@
|
||||
"""计提公式模板注册表(代码内有限集合)。
|
||||
|
||||
一期不引入规则引擎的落地方式:公式骨架固定(本表枚举),变化的是参数值
|
||||
(系统设置维护)。岗位角色(business_roles.calc_template)绑定模板编码,
|
||||
新增岗位 = 选模板 + 配参数,无需改代码(需求 #28)。
|
||||
新增公式形态(如未来「按产品数量计提」)需要新增模板 —— 一期接受,
|
||||
岗位表单中模板为带说明的受控下拉,避免误以为可自由写公式。
|
||||
"""
|
||||
|
||||
from dataclasses import dataclass
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class TemplateSpec:
|
||||
"""公式模板元数据。"""
|
||||
|
||||
code: str
|
||||
name: str
|
||||
params: tuple[str, ...]
|
||||
description: str
|
||||
|
||||
|
||||
TEMPLATES: dict[str, TemplateSpec] = {
|
||||
"TPL_SALESPERSON_DECAY": TemplateSpec(
|
||||
code="TPL_SALESPERSON_DECAY",
|
||||
name="业务员个人户·天数线性递减",
|
||||
params=(
|
||||
"salesperson.rate.start",
|
||||
"salesperson.rate.slope",
|
||||
"salesperson.rate.floor",
|
||||
"salesperson.days.boundary",
|
||||
),
|
||||
description="分段:≤分界天数 = 起始 − 天数×斜率;>分界天数 = 下限",
|
||||
),
|
||||
"TPL_MANAGER_SHARE": TemplateSpec(
|
||||
code="TPL_MANAGER_SHARE",
|
||||
name="营销经理·团队与全公司分成",
|
||||
params=("manager.share.team", "manager.share.company"),
|
||||
description="聚合:∑本团队业务员绩效×12.5% + ∑全公司业务员绩效×5%",
|
||||
),
|
||||
"TPL_ENTERPRISE_FIXED": TemplateSpec(
|
||||
code="TPL_ENTERPRISE_FIXED",
|
||||
name="企业户·固定计提",
|
||||
params=("enterprise.rate",),
|
||||
description="乘法:折算毛利润额 × 计提比例",
|
||||
),
|
||||
"TPL_INFO_SALES_FIXED": TemplateSpec(
|
||||
code="TPL_INFO_SALES_FIXED",
|
||||
name="信息员·销售额固定比例",
|
||||
params=("info.rate",),
|
||||
description="乘法:本人销售额 × 计提比例",
|
||||
),
|
||||
"TPL_PREPAY_FIXED": TemplateSpec(
|
||||
code="TPL_PREPAY_FIXED",
|
||||
name="预付款·固定计提",
|
||||
params=("prepay.rate",),
|
||||
description="乘法:回款额 × 计提比例",
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
def get_template(code: str) -> TemplateSpec:
|
||||
"""取模板元数据。未注册编码属代码缺陷(500),不是用户错误。"""
|
||||
tpl = TEMPLATES.get(code)
|
||||
if tpl is None:
|
||||
raise ValueError(f"公式模板编码未注册:{code}")
|
||||
return tpl
|
||||
|
||||
|
||||
def required_params(code: str) -> tuple[str, ...]:
|
||||
"""模板声明的参数编码列表(岗位表单展示与校验用)。"""
|
||||
return get_template(code).params
|
||||
@@ -0,0 +1,422 @@
|
||||
"""客户管理业务编排(需求 2.1.3)。
|
||||
|
||||
**事务边界在本层**:repository 只 flush,commit/rollback 只写在这里。
|
||||
|
||||
- 「公司名称 + 负责人」组合唯一(uk_customers_company_owner):先查后写不是
|
||||
原子操作,并发提交撞唯一键时捕 IntegrityError 判 1062 翻译为 400
|
||||
(同 M1 的并发兜底模式)
|
||||
- **归属变更的裁决语义是「只影响变更后核算,不回溯历史」(对照表 #19)**:
|
||||
实现为同一事务内「更新 customers.owner_personnel_id + 插入一条
|
||||
ownership_change_logs」,一次 commit —— 两步拆开提交时,中途失败会出现
|
||||
「主表已换人、留痕缺失」的静默不一致,事后追溯无据可查
|
||||
- 归属调整只有 ``change_ownership`` 一条路径;编辑端点不触归属,
|
||||
防止出现「改归属不留痕」的旁路
|
||||
"""
|
||||
|
||||
import logging
|
||||
|
||||
from sqlalchemy import Row
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
ACTION_DELETE,
|
||||
ACTION_UPDATE,
|
||||
CUSTOMER_TYPES,
|
||||
MODULE_CUSTOMER,
|
||||
)
|
||||
from app.core.db_errors import is_duplicate_entry
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.core.response import PageQuery, PageResult
|
||||
from app.models import Customer, OwnershipChangeLog, Personnel, User
|
||||
from app.models.customer import OWNER_TYPE_CUSTOMER
|
||||
from app.repositories import customer_repository, personnel_repository
|
||||
from app.schemas.customer import (
|
||||
CustomerCreateIn,
|
||||
CustomerOut,
|
||||
CustomerOwnershipIn,
|
||||
CustomerQuery,
|
||||
CustomerUpdateIn,
|
||||
OwnershipChangeLogOut,
|
||||
)
|
||||
from app.services import audit_service, personnel_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _to_out(customer: Customer, owner_name: str | None) -> CustomerOut:
|
||||
"""ORM 对象转响应模型。禁止把 ORM 对象直接当 response_model。"""
|
||||
return CustomerOut(
|
||||
id=customer.id,
|
||||
company_name=customer.company_name,
|
||||
owner_name=customer.owner_name,
|
||||
contact_person=customer.contact_person,
|
||||
contact_phone=customer.contact_phone,
|
||||
address=customer.address,
|
||||
industry=customer.industry,
|
||||
customer_type=customer.customer_type,
|
||||
owner_personnel_id=customer.owner_personnel_id,
|
||||
owner_personnel_name=owner_name,
|
||||
remark=customer.remark,
|
||||
)
|
||||
|
||||
|
||||
def _to_log_out(row: Row) -> OwnershipChangeLogOut:
|
||||
"""留痕行 (留痕, 旧归属人名, 新归属人名) 转响应模型。"""
|
||||
log, old_name, new_name = row
|
||||
return OwnershipChangeLogOut(
|
||||
id=log.id,
|
||||
customer_id=log.customer_id,
|
||||
old_owner_personnel_id=log.old_owner_personnel_id,
|
||||
new_owner_personnel_id=log.new_owner_personnel_id,
|
||||
old_owner_name=old_name,
|
||||
new_owner_name=new_name,
|
||||
change_reason=log.change_reason,
|
||||
operator_id=log.operator_id,
|
||||
operator_name=log.operator_name,
|
||||
create_time=log.create_time,
|
||||
)
|
||||
|
||||
|
||||
def _ensure_customer_type(customer_type: str) -> None:
|
||||
"""客户分类必须是注册表内的三个值之一(前端为受控下拉,后端仍须校验)。
|
||||
|
||||
customer_type 是 M3 计提规则匹配的锚点,脏值会让该客户在核算时匹配不到
|
||||
任何计提规则而静默漏算。
|
||||
"""
|
||||
if customer_type not in CUSTOMER_TYPES:
|
||||
raise BadRequestError("客户分类不合法")
|
||||
|
||||
|
||||
def _ensure_owner_personnel(session: Session, personnel_id: int) -> Personnel:
|
||||
"""归属人员必须存在且在职(共享校验收口于 personnel_service.ensure_active)。"""
|
||||
return personnel_service.ensure_active(session, personnel_id, label="归属")
|
||||
|
||||
|
||||
def _is_duplicate_entry(exc: IntegrityError) -> bool:
|
||||
"""判断 IntegrityError 是否为 MySQL 唯一键冲突(1062)。
|
||||
|
||||
customers 上还有归属人员外键(RESTRICT),并发窗口内删除人员等场景
|
||||
会抛 1452 —— 不能一并翻译成「已存在」,否则用户会被错误提示带偏;
|
||||
非 1062 原样上抛,由全局 IntegrityError handler 收敛 400(通用文案)。
|
||||
"""
|
||||
return is_duplicate_entry(exc)
|
||||
|
||||
|
||||
def list_customers(session: Session, query: CustomerQuery) -> PageResult[CustomerOut]:
|
||||
"""分页查询客户(附归属人员姓名)。"""
|
||||
rows = customer_repository.list_customers(
|
||||
session,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
keyword=query.keyword,
|
||||
customer_type=query.customer_type,
|
||||
owner_personnel_id=query.owner_personnel_id,
|
||||
)
|
||||
total = customer_repository.count_customers(
|
||||
session,
|
||||
keyword=query.keyword,
|
||||
customer_type=query.customer_type,
|
||||
owner_personnel_id=query.owner_personnel_id,
|
||||
)
|
||||
return PageResult[CustomerOut](
|
||||
records=[_to_out(customer, owner_name) for customer, owner_name in rows],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_customer(session: Session, customer_id: int) -> CustomerOut:
|
||||
"""客户详情。
|
||||
|
||||
:raises NotFoundError: 客户不存在
|
||||
"""
|
||||
row = customer_repository.get_with_owner_name(session, customer_id)
|
||||
if row is None:
|
||||
raise NotFoundError("客户不存在")
|
||||
customer, owner_name = row
|
||||
return _to_out(customer, owner_name)
|
||||
|
||||
|
||||
def create_customer(
|
||||
session: Session,
|
||||
payload: CustomerCreateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> CustomerOut:
|
||||
"""新增客户。
|
||||
|
||||
:raises BadRequestError: 客户分类不合法 / 归属人员不存在或已离职 /
|
||||
「公司名称+负责人」已存在(含并发兜底)
|
||||
"""
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_CUSTOMER,
|
||||
action=ACTION_CREATE,
|
||||
summary=f"新增客户 {payload.company_name}({payload.owner_name})",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 值域与归属校验在审计上下文内:失败(400)也要留痕 ——
|
||||
# 与 personnel_service._validate_refs 移入上下文的口径一致
|
||||
_ensure_customer_type(payload.customer_type)
|
||||
owner_name: str | None = None
|
||||
if payload.owner_personnel_id is not None:
|
||||
owner_name = _ensure_owner_personnel(session, payload.owner_personnel_id).personnel_name
|
||||
if (
|
||||
customer_repository.get_by_company_owner(
|
||||
session, payload.company_name, payload.owner_name
|
||||
)
|
||||
is not None
|
||||
):
|
||||
raise BadRequestError("该公司名称与负责人的客户已存在")
|
||||
|
||||
customer = Customer(
|
||||
company_name=payload.company_name,
|
||||
owner_name=payload.owner_name,
|
||||
contact_person=payload.contact_person,
|
||||
contact_phone=payload.contact_phone,
|
||||
address=payload.address,
|
||||
industry=payload.industry,
|
||||
customer_type=payload.customer_type,
|
||||
owner_personnel_id=payload.owner_personnel_id,
|
||||
remark=payload.remark,
|
||||
)
|
||||
try:
|
||||
customer_repository.create(session, customer)
|
||||
# 响应在 commit 之前构造(同 user_service 顶部说明)
|
||||
out = _to_out(customer, owner_name)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 先查后写不是原子操作:并发提交同一「公司名称+负责人」会撞
|
||||
# uk_customers_company_owner,回滚并翻译为可读的 400,而非 500
|
||||
session.rollback()
|
||||
if _is_duplicate_entry(exc):
|
||||
raise BadRequestError("该公司名称与负责人的客户已存在") from exc
|
||||
raise
|
||||
|
||||
logger.info("新增客户 | customer_id=%s | company=%s", customer.id, payload.company_name)
|
||||
return out
|
||||
|
||||
|
||||
def update_customer(
|
||||
session: Session,
|
||||
customer_id: int,
|
||||
payload: CustomerUpdateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> CustomerOut:
|
||||
"""编辑客户档案(全量替换)。
|
||||
|
||||
**不触归属**:owner_personnel_id 保持原值,调整统一走
|
||||
``PUT /{id}/ownership``(唯一写留痕的路径),见 ``CustomerUpdateIn`` 说明。
|
||||
|
||||
:raises NotFoundError: 客户不存在
|
||||
:raises BadRequestError: 客户分类不合法 / 「公司名称+负责人」已存在(含并发兜底)
|
||||
"""
|
||||
# 只读预取在审计上下文之前:目标不存在(NotFound 失败)时也能留下可读记录,
|
||||
# 摘要与回包都要用客户行;归属姓名本端点不变更,一并带出
|
||||
row = customer_repository.get_with_owner_name(session, customer_id)
|
||||
customer = row[0] if row else None
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_CUSTOMER,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改客户 {customer.company_name if customer else f'#{customer_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 值域校验在审计上下文内:分类非法的 400 也要留痕(同 create 口径)
|
||||
_ensure_customer_type(payload.customer_type)
|
||||
if row is None:
|
||||
raise NotFoundError("客户不存在")
|
||||
customer, owner_name = row
|
||||
|
||||
duplicate = customer_repository.get_by_company_owner(
|
||||
session, payload.company_name, payload.owner_name
|
||||
)
|
||||
if duplicate is not None and duplicate.id != customer_id:
|
||||
raise BadRequestError("该公司名称与负责人的客户已存在")
|
||||
|
||||
customer.company_name = payload.company_name
|
||||
customer.owner_name = payload.owner_name
|
||||
customer.contact_person = payload.contact_person
|
||||
customer.contact_phone = payload.contact_phone
|
||||
customer.address = payload.address
|
||||
customer.industry = payload.industry
|
||||
customer.customer_type = payload.customer_type
|
||||
# owner_personnel_id 刻意不赋值 —— 归属调整只走 /ownership
|
||||
|
||||
try:
|
||||
# 响应在 commit 之前构造(同 user_service 顶部说明)
|
||||
out = _to_out(customer, owner_name)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 把自身以外的组合改成已存在的「公司名称+负责人」时,先查后写
|
||||
# 的并发窗口会撞唯一键,兜底同 create_customer
|
||||
session.rollback()
|
||||
if _is_duplicate_entry(exc):
|
||||
raise BadRequestError("该公司名称与负责人的客户已存在") from exc
|
||||
raise
|
||||
|
||||
logger.info("修改客户 | customer_id=%s | company=%s", customer_id, payload.company_name)
|
||||
return out
|
||||
|
||||
|
||||
def delete_customer(
|
||||
session: Session,
|
||||
customer_id: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""删除客户(物理删除):被业务引用 → 400 引导处理业务单据。
|
||||
|
||||
businesses.customer_id 为 RESTRICT 外键,引用检查必须先于删除——
|
||||
否则并发窗口内的 FK 冲突会以 500 暴露(T4 时该检查占位、业务表就位
|
||||
后由本处补齐,留痕表是无外键固化不参与拦截)。
|
||||
|
||||
:raises NotFoundError: 客户不存在
|
||||
:raises BadRequestError: 客户已被业务单据引用
|
||||
"""
|
||||
customer = customer_repository.get_by_id(session, customer_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_CUSTOMER,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"删除客户 {customer.company_name if customer else f'#{customer_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if customer is None:
|
||||
raise NotFoundError("客户不存在")
|
||||
if customer_repository.count_business_refs(session, customer_id):
|
||||
raise BadRequestError("该客户已存在关联业务,请先处理相关业务单据")
|
||||
|
||||
company_name = customer.company_name # 固化:对象随删除失效
|
||||
try:
|
||||
customer_repository.delete(session, customer)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 先查后删的并发窗口:新业务挂上了该客户,FK RESTRICT 兜底为 400
|
||||
session.rollback()
|
||||
raise BadRequestError("该客户已存在关联业务,请先处理相关业务单据") from exc
|
||||
logger.info("删除客户 | customer_id=%s | company=%s", customer_id, company_name)
|
||||
|
||||
|
||||
def change_ownership(
|
||||
session: Session,
|
||||
customer_id: int,
|
||||
payload: CustomerOwnershipIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> CustomerOut:
|
||||
"""归属变更:同一事务内「改主表归属 + 插留痕」,一次 commit。
|
||||
|
||||
裁决口径为「只影响变更后核算,不回溯历史」(对照表 #19):历史核算结果
|
||||
已由 M3 台账固化,留痕仅承担追溯职责,故无 effective_date 时点化设计。
|
||||
|
||||
:raises NotFoundError: 客户不存在
|
||||
:raises BadRequestError: 归属人员不存在或已离职 / 归属未变化
|
||||
"""
|
||||
# 只读预取在审计上下文之前:摘要需要客户名与新旧归属人名;校验仍在
|
||||
# 上下文内进行,失败同样要留下可追溯的记录
|
||||
row = customer_repository.get_with_owner_name(session, customer_id)
|
||||
old_person = (
|
||||
personnel_repository.get_by_id(session, row[0].owner_personnel_id)
|
||||
if row is not None and row[0].owner_personnel_id is not None
|
||||
else None
|
||||
)
|
||||
new_person = (
|
||||
personnel_repository.get_by_id(session, payload.new_owner_personnel_id)
|
||||
if payload.new_owner_personnel_id is not None
|
||||
else None
|
||||
)
|
||||
old_label = old_person.personnel_name if old_person else "无"
|
||||
new_label = new_person.personnel_name if new_person else "无"
|
||||
customer_name = row[0].company_name if row else f"#{customer_id}"
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_CUSTOMER,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"调整客户归属 {customer_name}:{old_label} → {new_label}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if row is None:
|
||||
raise NotFoundError("客户不存在")
|
||||
customer, _ = row
|
||||
|
||||
if payload.new_owner_personnel_id is not None:
|
||||
_ensure_owner_personnel(session, payload.new_owner_personnel_id)
|
||||
old_owner_id = customer.owner_personnel_id
|
||||
if old_owner_id == payload.new_owner_personnel_id:
|
||||
raise BadRequestError("归属未变化")
|
||||
|
||||
# 主表更新与留痕插入同事务:只在本方法内一次 commit(见模块 docstring)
|
||||
customer.owner_personnel_id = payload.new_owner_personnel_id
|
||||
customer_repository.add_ownership_log(
|
||||
session,
|
||||
OwnershipChangeLog(
|
||||
owner_type=OWNER_TYPE_CUSTOMER,
|
||||
customer_id=customer.id,
|
||||
old_owner_personnel_id=old_owner_id,
|
||||
new_owner_personnel_id=payload.new_owner_personnel_id,
|
||||
change_reason=payload.reason,
|
||||
operator_id=operator.id,
|
||||
operator_name=operator.username,
|
||||
),
|
||||
)
|
||||
# 响应在 commit 之前构造(同 user_service 顶部说明);归属人名以新值为准
|
||||
out = _to_out(customer, new_person.personnel_name if new_person else None)
|
||||
session.commit()
|
||||
logger.info(
|
||||
"调整客户归属 | customer_id=%s | old=%s | new=%s",
|
||||
customer_id,
|
||||
old_owner_id,
|
||||
payload.new_owner_personnel_id,
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def list_ownership_logs(
|
||||
session: Session,
|
||||
customer_id: int,
|
||||
query: PageQuery,
|
||||
) -> PageResult[OwnershipChangeLogOut]:
|
||||
"""某客户的归属变更留痕(分页,按变更时间倒序)。
|
||||
|
||||
:raises NotFoundError: 客户不存在
|
||||
"""
|
||||
if customer_repository.get_by_id(session, customer_id) is None:
|
||||
raise NotFoundError("客户不存在")
|
||||
rows = customer_repository.list_ownership_logs(
|
||||
session,
|
||||
customer_id=customer_id,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
)
|
||||
total = customer_repository.count_ownership_logs(session, customer_id=customer_id)
|
||||
return PageResult[OwnershipChangeLogOut](
|
||||
records=[_to_log_out(row) for row in rows],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
@@ -0,0 +1,97 @@
|
||||
"""计提公式纯函数(无 IO、无会话)。
|
||||
|
||||
契约(与 M3 核算、计算预览共用,口径见 2026-10-12 业务裁决):
|
||||
- 参数值按**存储口径**传入(含单位:比例参数为 ‰ 数如 10、百分比参数为 % 数如 60)
|
||||
- 计算出的中间比率(如毛利润率)为**纯比例**(Fraction,如 9/20)
|
||||
- 金额用 Decimal、比率用 Fraction,全程禁 float;Fraction→Decimal 转换在
|
||||
分母仅含 2/5 因子时精确,否则按 Decimal 上下文精度(28 位)
|
||||
- 绩效 = 折算毛利润额 × 计提比例(乘法方向,对照表 #3,禁按"互为倒数"实现)
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
from fractions import Fraction
|
||||
|
||||
|
||||
def to_decimal(value: Fraction) -> Decimal:
|
||||
"""Fraction → Decimal。有限小数精确;循环小数按 Decimal 上下文精度(28 位)。"""
|
||||
return Decimal(value.numerator) / Decimal(value.denominator)
|
||||
|
||||
|
||||
# 模块内沿用私有名;公开别名供 service 层金额换算复用
|
||||
_to_decimal = to_decimal
|
||||
|
||||
|
||||
def payment_days(ship_date: date, receipt_date: date) -> int:
|
||||
"""回款天数:发货日首日计第 1 天(对照表 #1;需规「26 天」示例作废)。"""
|
||||
return (receipt_date - ship_date).days + 1
|
||||
|
||||
|
||||
def salesperson_rate(
|
||||
days: int,
|
||||
*,
|
||||
start: Fraction,
|
||||
slope: Fraction,
|
||||
floor: Fraction,
|
||||
boundary_days: int,
|
||||
) -> Fraction:
|
||||
"""业务员计提比例(纯比例)。
|
||||
|
||||
start/floor 为 ‰ 数、slope 为 ‰/天(存储口径,slope 为精确分数 4/360)。
|
||||
≤分界天数按「起始 − 天数×斜率」线性递减;超过分界天数固定取下限
|
||||
(对照表 #4:360 天=6‰,361 天起固定 4‰)。
|
||||
|
||||
先款后货的回款(payment_days 为负)钳制为 0 天:负天数线性外插会算出
|
||||
高于起始值的比例(多算绩效),钳到 0 天即按起始比例计提;payment_days
|
||||
的出参仍照实输出负值(回款登记照常入库,录入异常由台账留痕暴露)。
|
||||
"""
|
||||
days = max(days, 0)
|
||||
if days > boundary_days:
|
||||
return floor / 1000
|
||||
return (start - days * slope) / 1000
|
||||
|
||||
|
||||
def profit_rate(profit: Decimal, revenue: Decimal) -> Fraction:
|
||||
"""毛利润率(纯比例):毛利润额 / 销售额(**不含运费**口径,对照表 #2)。
|
||||
|
||||
销售额为 0 时返回 0(防除零;折算额随之为 0)。
|
||||
"""
|
||||
if revenue == 0:
|
||||
return Fraction(0)
|
||||
return Fraction(profit) / Fraction(revenue)
|
||||
|
||||
|
||||
def converted_profit(revenue: Decimal, rate: Fraction, threshold: Fraction) -> Decimal:
|
||||
"""折算毛利润额(化简式):销售额 × (毛利润率 − 阈值)。
|
||||
|
||||
rate 为纯比例(profit_rate 的输出);threshold 为 % 数(存储口径,如 30)。
|
||||
化简式等价于定义式「毛利润额 / 毛利润率 × (毛利润率 − 阈值)」,且避免
|
||||
毛利润率为 0 时除零(对照表 #12/#13)。毛利润率低于阈值时结果为负 ——
|
||||
业务确认负值正常计算、不归零。
|
||||
"""
|
||||
return _to_decimal(Fraction(revenue) * (rate - threshold / 100))
|
||||
|
||||
|
||||
def performance_amount(base: Decimal, rate: Fraction) -> Decimal:
|
||||
"""绩效金额 = 折算毛利润额 × 计提比例(乘法方向,对照表 #3)。"""
|
||||
return _to_decimal(Fraction(base) * rate)
|
||||
|
||||
|
||||
def apply_barter(amount: Decimal, discount: Fraction) -> Decimal:
|
||||
"""以物抵顶折算:应发绩效 × 折算比例(discount 为 % 数,默认 80,对照表 #24)。"""
|
||||
return _to_decimal(Fraction(amount) * discount / 100)
|
||||
|
||||
|
||||
def payment_weight(r: int) -> Fraction:
|
||||
"""支付权重 R×R(纯比例):R 为回款占销售额百分比向下取整(对照表 #22)。
|
||||
|
||||
60 → 36/100;100 → 1(全额)。
|
||||
"""
|
||||
return Fraction(r, 100) * Fraction(r, 100)
|
||||
|
||||
|
||||
def start_payment_ok(received: Decimal, revenue: Decimal, ratio: Fraction) -> bool:
|
||||
"""起付判定:单项业务回款额达到销售额(不含运费)的 ratio%(对照表 #21)。"""
|
||||
if revenue == 0:
|
||||
return False
|
||||
return Fraction(received) / Fraction(revenue) >= ratio / 100
|
||||
@@ -0,0 +1,49 @@
|
||||
"""单据编号生成器(业务 YW / 发货 SH / 回款 HK 共用)。
|
||||
|
||||
规则:``{前缀}{YYYYMMDD}-{当日4位序号}``,序号按自然日重置。
|
||||
并发安全:``SELECT MAX(no) ... FOR UPDATE`` 锁住当日序号区间 —— 后到的
|
||||
事务会等待先到者提交后再读到新 MAX,序号单调不重;残余竞态(锁等待超时
|
||||
等极端场景)由服务层捕唯一键冲突(1062)重试一次兜底。
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import func, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
|
||||
def today_prefix(prefix: str) -> str:
|
||||
"""当日编号前缀(如 YW20261013-),LIKE 匹配与拼号共用同一来源防漂移。"""
|
||||
return f"{prefix}{datetime.now().strftime('%Y%m%d')}-"
|
||||
|
||||
|
||||
def next_no(
|
||||
session: Session,
|
||||
*,
|
||||
model: type,
|
||||
column_name: str,
|
||||
prefix: str,
|
||||
seq_width: int = 4,
|
||||
) -> str:
|
||||
"""生成下一个编号。
|
||||
|
||||
:param model: 编号所在的 ORM 模型(businesses/shipments/receipts)
|
||||
:param column_name: 编号列名(business_no/shipment_no/receipt_batch_no)
|
||||
:param prefix: 单据前缀(NO_PREFIX_* 常量)
|
||||
:param seq_width: 序号位数(默认 4);超出宽度的序号按实际位数输出,
|
||||
VARCHAR(32) 余量充足、唯一性不受影响
|
||||
"""
|
||||
like_prefix = today_prefix(prefix)
|
||||
column = getattr(model, column_name)
|
||||
# 排序按「长度优先、同级字典序」:同前缀下序号位数增多(9999→10000)后
|
||||
# 纯字典序会反转("-10000" < "-9999",'1'<'9'),seq 将恒重算出同一号码、
|
||||
# 每笔建单都撞唯一键 —— 长度大即数值大,同级同长时字典序与数值序一致
|
||||
max_no = session.execute(
|
||||
select(column)
|
||||
.where(column.like(f"{like_prefix}%"))
|
||||
.order_by(func.length(column).desc(), column.desc())
|
||||
.limit(1)
|
||||
.with_for_update()
|
||||
).scalar()
|
||||
seq = int(max_no.rsplit("-", 1)[1]) + 1 if max_no else 1
|
||||
return f"{like_prefix}{seq:0{seq_width}d}"
|
||||
@@ -0,0 +1,338 @@
|
||||
"""计提参数目录注册表。
|
||||
|
||||
注册表是**迁移种子与运行期校验的唯一来源**:编码、默认值、取值域在此定义
|
||||
一次;新增参数 = 改这里 + 生成迁移种子(两者一致性由测试锁定)。
|
||||
值一律以 Fraction 可解析字符串表示(如 "4/360",禁 0.011111 —— 见算法红线)。
|
||||
"""
|
||||
|
||||
from dataclasses import dataclass
|
||||
from fractions import Fraction
|
||||
|
||||
from app.core.exceptions import BadRequestError
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class ParamSpec:
|
||||
"""单个参数的元数据(与 param_definitions 表字段一一对应)。"""
|
||||
|
||||
code: str
|
||||
name: str
|
||||
group: str
|
||||
value_type: str
|
||||
unit: str | None
|
||||
dimension_type: str
|
||||
options: tuple[str, ...] | None
|
||||
default_value: str | None
|
||||
value_min: str | None
|
||||
value_max: str | None
|
||||
description: str | None
|
||||
sort_order: int
|
||||
|
||||
|
||||
PARAM_REGISTRY: dict[str, ParamSpec] = {
|
||||
spec.code: spec
|
||||
for spec in [
|
||||
ParamSpec(
|
||||
code="salesperson.rate.start",
|
||||
name="业务员起始计提比例",
|
||||
group="业务员个人户",
|
||||
value_type="DECIMAL",
|
||||
unit="‰",
|
||||
dimension_type="BUSINESS_ROLE",
|
||||
options=None,
|
||||
default_value="10",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="线性递减段起始值:比例 = 起始 − 回款天数 × 斜率(≤分界天数)",
|
||||
sort_order=1,
|
||||
),
|
||||
ParamSpec(
|
||||
code="salesperson.rate.slope",
|
||||
name="业务员日递减斜率",
|
||||
group="业务员个人户",
|
||||
value_type="DECIMAL",
|
||||
unit="‰/天",
|
||||
dimension_type="BUSINESS_ROLE",
|
||||
options=None,
|
||||
default_value="4/360",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="精确分数 4/360‰/天(=1/90),禁止按 0.011111 截断存储",
|
||||
sort_order=2,
|
||||
),
|
||||
ParamSpec(
|
||||
code="salesperson.rate.floor",
|
||||
name="业务员计提下限",
|
||||
group="业务员个人户",
|
||||
value_type="DECIMAL",
|
||||
unit="‰",
|
||||
dimension_type="BUSINESS_ROLE",
|
||||
options=None,
|
||||
default_value="4",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="回款天数超过分界天数后固定取此比例(≥361 天 = 4‰)",
|
||||
sort_order=3,
|
||||
),
|
||||
ParamSpec(
|
||||
code="salesperson.days.boundary",
|
||||
name="线性递减分界天数",
|
||||
group="业务员个人户",
|
||||
value_type="INT",
|
||||
unit="天",
|
||||
dimension_type="BUSINESS_ROLE",
|
||||
options=None,
|
||||
default_value="360",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="≤分界天数按公式线性递减(360 天=6‰);超过则取下限",
|
||||
sort_order=4,
|
||||
),
|
||||
ParamSpec(
|
||||
code="manager.share.team",
|
||||
name="经理本团队分成比例",
|
||||
group="经理分成",
|
||||
value_type="DECIMAL",
|
||||
unit="%",
|
||||
dimension_type="BUSINESS_ROLE",
|
||||
options=None,
|
||||
default_value="12.5",
|
||||
value_min="0",
|
||||
value_max="100",
|
||||
description="∑本人带领业务员绩效 × 此比例(限本团队)",
|
||||
sort_order=5,
|
||||
),
|
||||
ParamSpec(
|
||||
code="manager.share.company",
|
||||
name="经理全公司分成比例",
|
||||
group="经理分成",
|
||||
value_type="DECIMAL",
|
||||
unit="%",
|
||||
dimension_type="BUSINESS_ROLE",
|
||||
options=None,
|
||||
default_value="5",
|
||||
value_min="0",
|
||||
value_max="100",
|
||||
description="∑全部业务员绩效 × 此比例(全公司)",
|
||||
sort_order=6,
|
||||
),
|
||||
ParamSpec(
|
||||
code="enterprise.rate",
|
||||
name="企业户计提比例",
|
||||
group="企业户",
|
||||
value_type="DECIMAL",
|
||||
unit="‰",
|
||||
dimension_type="PRODUCT_CATEGORY",
|
||||
options=None,
|
||||
default_value="3",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="所有企业户适用;2026-08-13 起由 2‰ 提高至 3‰",
|
||||
sort_order=7,
|
||||
),
|
||||
ParamSpec(
|
||||
code="info.rate",
|
||||
name="信息员计提比例",
|
||||
group="信息员",
|
||||
value_type="DECIMAL",
|
||||
unit="‰",
|
||||
dimension_type="BUSINESS_ROLE",
|
||||
options=None,
|
||||
default_value="1",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="信息员绩效 = 本人销售额 × 此比例",
|
||||
sort_order=8,
|
||||
),
|
||||
ParamSpec(
|
||||
code="prepay.rate",
|
||||
name="预付款计提比例",
|
||||
group="支付环节",
|
||||
value_type="DECIMAL",
|
||||
unit="‰",
|
||||
dimension_type="NONE",
|
||||
options=None,
|
||||
default_value="10",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="预付款统一按此比例计提",
|
||||
sort_order=9,
|
||||
),
|
||||
ParamSpec(
|
||||
code="barter.discount",
|
||||
name="以物抵顶折算比例",
|
||||
group="支付环节",
|
||||
value_type="DECIMAL",
|
||||
unit="%",
|
||||
dimension_type="NONE",
|
||||
options=None,
|
||||
default_value="80",
|
||||
value_min="0",
|
||||
value_max="100",
|
||||
description="以物抵顶回款绩效按应发绩效的此比例折算",
|
||||
sort_order=10,
|
||||
),
|
||||
ParamSpec(
|
||||
code="payment.start.ratio",
|
||||
name="支付起付比例",
|
||||
group="支付环节",
|
||||
value_type="DECIMAL",
|
||||
unit="%",
|
||||
dimension_type="NONE",
|
||||
options=None,
|
||||
default_value="60",
|
||||
value_min="0",
|
||||
value_max="100",
|
||||
description="单项业务回款额达销售额(不含运费)此比例后起付;达标前累计",
|
||||
sort_order=11,
|
||||
),
|
||||
ParamSpec(
|
||||
code="payment.weight.mode",
|
||||
name="支付权重应用方式",
|
||||
group="支付环节",
|
||||
value_type="ENUM",
|
||||
unit=None,
|
||||
dimension_type="NONE",
|
||||
options=("FULL", "BALANCE"),
|
||||
default_value="FULL",
|
||||
value_min=None,
|
||||
value_max=None,
|
||||
description="FULL=按 R×R 乘当月全额应发绩效;BALANCE=乘余额(语义待 M3 前确认)",
|
||||
sort_order=12,
|
||||
),
|
||||
ParamSpec(
|
||||
code="product.threshold",
|
||||
name="折算毛利润额阈值",
|
||||
group="产品阈值",
|
||||
value_type="DECIMAL",
|
||||
unit="%",
|
||||
dimension_type="PRODUCT_CATEGORY",
|
||||
options=None,
|
||||
default_value="30",
|
||||
value_min="0",
|
||||
value_max="100",
|
||||
description="折算毛利润额 = 销售额 ×(毛利润率 − 阈值);市政水利 30%、轨交 20%",
|
||||
sort_order=13,
|
||||
),
|
||||
ParamSpec(
|
||||
code="salary.basic.mode",
|
||||
name="月工资基本工资口径",
|
||||
group="月工资口径",
|
||||
value_type="ENUM",
|
||||
unit=None,
|
||||
dimension_type="BUSINESS_ROLE",
|
||||
options=("INCLUDE", "DEDUCT", "EXCLUDE"),
|
||||
default_value="INCLUDE",
|
||||
value_min=None,
|
||||
value_max=None,
|
||||
description="INCLUDE含基本工资 / DEDUCT扣除基本工资 / EXCLUDE不计",
|
||||
sort_order=14,
|
||||
),
|
||||
ParamSpec(
|
||||
code="probation.annual.threshold",
|
||||
name="试用期年累计结算阈值",
|
||||
group="月工资口径",
|
||||
value_type="DECIMAL",
|
||||
unit="元",
|
||||
dimension_type="NONE",
|
||||
options=None,
|
||||
default_value="18000",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="试用期年累计绩效超过此值部分年底一次性结算",
|
||||
sort_order=15,
|
||||
),
|
||||
ParamSpec(
|
||||
code="probation.salary.basic",
|
||||
name="试用期基本工资标准",
|
||||
group="月工资口径",
|
||||
value_type="DECIMAL",
|
||||
unit="元",
|
||||
dimension_type="NONE",
|
||||
options=None,
|
||||
default_value="3000",
|
||||
value_min="0",
|
||||
value_max=None,
|
||||
description="试用期仅发基本工资、不发放绩效(归属待 M2 复核)",
|
||||
sort_order=16,
|
||||
),
|
||||
ParamSpec(
|
||||
code="approval.secondary_allocation.enabled",
|
||||
name="二次分配审批开关",
|
||||
group="审批开关",
|
||||
value_type="BOOL",
|
||||
unit=None,
|
||||
dimension_type="NONE",
|
||||
options=None,
|
||||
default_value="0",
|
||||
value_min=None,
|
||||
value_max=None,
|
||||
description=(
|
||||
"0=二次分配方案提交即生效(系统自动通过全节点留痕,留痕不断链);"
|
||||
"1=提交后进入财务复核→领导审核审批流(2026-10-15 复核审批补充需求)"
|
||||
),
|
||||
sort_order=17,
|
||||
),
|
||||
ParamSpec(
|
||||
code="approval.monthly_settlement.enabled",
|
||||
name="月度结算审批开关",
|
||||
group="审批开关",
|
||||
value_type="BOOL",
|
||||
unit=None,
|
||||
dimension_type="NONE",
|
||||
options=None,
|
||||
default_value="0",
|
||||
value_min=None,
|
||||
value_max=None,
|
||||
description=(
|
||||
"预留参数:月度结算审批链开关(M3 ④ 月结子块接入时消费);"
|
||||
"0=结算生成即生效,1=走财务复核→领导审核审批流"
|
||||
),
|
||||
sort_order=18,
|
||||
),
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
def get_spec(code: str) -> ParamSpec:
|
||||
"""取参数元数据。未注册编码属代码缺陷(500),不是用户错误。"""
|
||||
spec = PARAM_REGISTRY.get(code)
|
||||
if spec is None:
|
||||
raise ValueError(f"参数编码未注册:{code}")
|
||||
return spec
|
||||
|
||||
|
||||
def parse_fraction(text: str) -> Fraction:
|
||||
"""Fraction 精确解析("4/360" → 1/90,不经 float)。非法输入抛 400。"""
|
||||
try:
|
||||
return Fraction(text.strip())
|
||||
except (ValueError, ZeroDivisionError) as exc:
|
||||
raise BadRequestError(f"参数值无法解析为数值:{text}") from exc
|
||||
|
||||
|
||||
def validate_and_normalize(spec: ParamSpec, raw: str) -> str:
|
||||
"""按元数据校验并规范化参数值,返回可入库字符串。
|
||||
|
||||
DECIMAL:Fraction 解析 + 取值域校验,分数式原样保留("4/360" 不截断);
|
||||
INT:必须整数;BOOL:仅 0/1;ENUM:必须命中 options;TEXT:原样返回。
|
||||
"""
|
||||
value = raw.strip()
|
||||
if spec.value_type in {"DECIMAL", "INT"}:
|
||||
fraction = parse_fraction(value)
|
||||
if spec.value_type == "INT" and fraction.denominator != 1:
|
||||
raise BadRequestError(f"参数 {spec.code} 必须为整数:{raw}")
|
||||
if spec.value_min is not None and fraction < parse_fraction(spec.value_min):
|
||||
raise BadRequestError(f"参数 {spec.code} 低于取值下限 {spec.value_min}:{raw}")
|
||||
if spec.value_max is not None and fraction > parse_fraction(spec.value_max):
|
||||
raise BadRequestError(f"参数 {spec.code} 高于取值上限 {spec.value_max}:{raw}")
|
||||
return value
|
||||
if spec.value_type == "BOOL":
|
||||
if value not in {"0", "1"}:
|
||||
raise BadRequestError(f"参数 {spec.code} 仅接受 0/1:{raw}")
|
||||
return value
|
||||
if spec.value_type == "ENUM":
|
||||
if not spec.options or value not in spec.options:
|
||||
allowed = "/".join(spec.options or ())
|
||||
raise BadRequestError(f"参数 {spec.code} 取值须为 {allowed}:{raw}")
|
||||
return value
|
||||
return value
|
||||
@@ -0,0 +1,691 @@
|
||||
"""计提参数服务:时点化取值、版本管理(变更/撤回/历史/对比)、计算预览与导出。
|
||||
|
||||
ParamSnapshot 是 M3 核算与计算预览共用的输入契约:按业务日期(回款到账日)
|
||||
冻结当时口径,禁读「当前值」计算历史数据(算法红线)。
|
||||
变更批次 = 版本(一次提交一批次);条目逐项留痕(旧值/新值),append-only。
|
||||
"""
|
||||
|
||||
import logging
|
||||
from collections.abc import Iterable
|
||||
from dataclasses import dataclass
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
from fractions import Fraction
|
||||
from io import BytesIO
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_DELETE,
|
||||
ACTION_UPDATE,
|
||||
MODULE_PARAM,
|
||||
NO_PREFIX_PARAM,
|
||||
PRODUCT_CATEGORIES,
|
||||
)
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.core.response import PageResult
|
||||
from app.models import ParamChangeBatch, ParamDefinition, ParamValue, User
|
||||
from app.repositories import business_role_repository, param_repository
|
||||
from app.schemas.param import (
|
||||
ParamBatchDetailOut,
|
||||
ParamBatchItemOut,
|
||||
ParamBatchOut,
|
||||
ParamBatchQuery,
|
||||
ParamCatalogItemOut,
|
||||
ParamChangeBatchOut,
|
||||
ParamChangeIn,
|
||||
ParamChangeItemIn,
|
||||
ParamDiffOut,
|
||||
ParamDimensionValueOut,
|
||||
ParamHistoryOut,
|
||||
ParamHistoryQuery,
|
||||
ParamPreviewIn,
|
||||
ParamPreviewOut,
|
||||
ParamUsedOut,
|
||||
)
|
||||
from app.services import audit_service, formula
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
from app.services.formula import to_decimal
|
||||
from app.services.no_generator import next_no
|
||||
from app.services.param_registry import get_spec, parse_fraction, validate_and_normalize
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ==================== 快照 ====================
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class ParamSnapshot:
|
||||
"""某业务日期下的参数快照(冻结不可变,核算期间保持一致)。
|
||||
|
||||
覆盖链:角色维度 > 产品类别维度 > 默认行('');均无匹配时回退注册表默认值。
|
||||
"""
|
||||
|
||||
biz_date: date
|
||||
_values: dict[str, dict[str, str]]
|
||||
_effective: dict[tuple[str, str], date]
|
||||
|
||||
@classmethod
|
||||
def from_rows(
|
||||
cls, biz_date: date, rows: Iterable[tuple[str, str, str, date]]
|
||||
) -> "ParamSnapshot":
|
||||
"""由 (param_code, dimension_value, value_text, effective_date) 行构造。
|
||||
|
||||
rows 须按仓储输出顺序(同一 (code, dim) 的最新生效值在前)——以先出现者为准。
|
||||
"""
|
||||
values: dict[str, dict[str, str]] = {}
|
||||
effective: dict[tuple[str, str], date] = {}
|
||||
for code, dimension, value_text, effective_date in rows:
|
||||
if (code, dimension) in effective:
|
||||
continue
|
||||
effective[(code, dimension)] = effective_date
|
||||
values.setdefault(code, {}).setdefault(dimension, value_text)
|
||||
return cls(biz_date=biz_date, _values=values, _effective=effective)
|
||||
|
||||
def get(
|
||||
self, code: str, *, role_code: str | None = None, product_category: str | None = None
|
||||
) -> str:
|
||||
"""取参数原始值(覆盖链解析)。无值且无注册表默认值时抛 400。"""
|
||||
candidates = self._values.get(code)
|
||||
if candidates:
|
||||
for dimension in (role_code, product_category, ""):
|
||||
if dimension is not None and dimension in candidates:
|
||||
return candidates[dimension]
|
||||
spec = get_spec(code) # 未注册编码 → ValueError(代码缺陷)
|
||||
if spec.default_value is None:
|
||||
raise BadRequestError(f"参数 {code} 无生效值且无默认值,请先在系统设置中维护")
|
||||
return spec.default_value
|
||||
|
||||
def effective_date_of(
|
||||
self, code: str, *, role_code: str | None = None, product_category: str | None = None
|
||||
) -> date | None:
|
||||
"""取参数当前生效值的生效日期(回退注册表默认值时为 None)。"""
|
||||
candidates = self._values.get(code)
|
||||
if candidates:
|
||||
for dimension in (role_code, product_category, ""):
|
||||
if dimension is not None and (code, dimension) in self._effective:
|
||||
return self._effective[(code, dimension)]
|
||||
return None
|
||||
|
||||
def iter_items(self) -> Iterable[tuple[str, str, str]]:
|
||||
"""遍历快照全部 (param_code, dimension_value, value_text),供对比。"""
|
||||
for code, dims in self._values.items():
|
||||
for dimension, value_text in dims.items():
|
||||
yield code, dimension, value_text
|
||||
|
||||
def fraction(
|
||||
self, code: str, *, role_code: str | None = None, product_category: str | None = None
|
||||
) -> Fraction:
|
||||
"""取参数值并精确解析为 Fraction("4/360" → 1/90,不经 float)。"""
|
||||
return parse_fraction(
|
||||
self.get(code, role_code=role_code, product_category=product_category)
|
||||
)
|
||||
|
||||
def integer(
|
||||
self, code: str, *, role_code: str | None = None, product_category: str | None = None
|
||||
) -> int:
|
||||
"""取参数值为整数。配置成非整数属数据缺陷(写入经校验,不应发生)。"""
|
||||
value = self.fraction(code, role_code=role_code, product_category=product_category)
|
||||
if value.denominator != 1:
|
||||
raise ValueError(f"参数 {code} 配置为非整数:{value}")
|
||||
return int(value)
|
||||
|
||||
def boolean(
|
||||
self, code: str, *, role_code: str | None = None, product_category: str | None = None
|
||||
) -> bool:
|
||||
"""取布尔参数(0/1)。"""
|
||||
return self.get(code, role_code=role_code, product_category=product_category) == "1"
|
||||
|
||||
def text(
|
||||
self, code: str, *, role_code: str | None = None, product_category: str | None = None
|
||||
) -> str:
|
||||
"""取参数原文(枚举码/文本)。"""
|
||||
return self.get(code, role_code=role_code, product_category=product_category)
|
||||
|
||||
|
||||
def resolve_snapshot(session: Session, biz_date: date) -> ParamSnapshot:
|
||||
"""按业务日期解析全量参数快照(M3 核算与计算预览共用入口)。"""
|
||||
return ParamSnapshot.from_rows(biz_date, param_repository.resolve_values(session, biz_date))
|
||||
|
||||
|
||||
# ==================== 目录 ====================
|
||||
|
||||
|
||||
def get_catalog(session: Session, *, as_of: date | None = None) -> list[ParamCatalogItemOut]:
|
||||
"""参数目录:全部启用定义 + 各维度截至 asOf(默认今日)的生效值。"""
|
||||
biz_date = as_of or date.today()
|
||||
resolved = param_repository.resolve_values(session, biz_date)
|
||||
by_code: dict[str, list[ParamDimensionValueOut]] = {}
|
||||
for code, dimension, value_text, effective_date in resolved:
|
||||
by_code.setdefault(code, []).append(
|
||||
ParamDimensionValueOut(
|
||||
dimension_value=dimension, value_text=value_text, effective_date=effective_date
|
||||
)
|
||||
)
|
||||
items: list[ParamCatalogItemOut] = []
|
||||
for definition in param_repository.list_definitions(session, status=1):
|
||||
spec = get_spec(definition.param_code)
|
||||
items.append(
|
||||
ParamCatalogItemOut(
|
||||
param_code=definition.param_code,
|
||||
param_name=definition.param_name,
|
||||
param_group=definition.param_group,
|
||||
value_type=definition.value_type,
|
||||
unit=definition.unit,
|
||||
dimension_type=definition.dimension_type,
|
||||
options=list(spec.options or ()),
|
||||
default_value=definition.default_value,
|
||||
value_min=definition.value_min,
|
||||
value_max=definition.value_max,
|
||||
description=definition.description,
|
||||
values=by_code.get(definition.param_code, []),
|
||||
)
|
||||
)
|
||||
return items
|
||||
|
||||
|
||||
# ==================== 变更与版本管理 ====================
|
||||
|
||||
|
||||
def _normalize_items(
|
||||
session: Session, items: list[ParamChangeItemIn]
|
||||
) -> list[tuple[ParamDefinition, str, str]]:
|
||||
"""全量校验条目并归一为 (定义, 规范维度值, 规范值),任何一项不合法整批拒绝。
|
||||
|
||||
定义与岗位各一条 IN 批量查询预载(逐条查询在批次扩大时是写侧 N+1);
|
||||
岗位预载收集全部非空维度值 —— 集合可能略大于实际所需,但省去按维度
|
||||
类型先分类的第二轮遍历,无害多取由校验逻辑自行过滤。
|
||||
|
||||
:raises BadRequestError: 参数未定义 / 维度不合法 / 值校验失败 / 同批次重复条目
|
||||
"""
|
||||
codes = list({item.param_code for item in items})
|
||||
definitions = param_repository.list_definitions_by_codes(session, codes)
|
||||
dimension_values = list({item.dimension_value for item in items if item.dimension_value})
|
||||
# 预载字典键归一为 casefold:单条版 get_by_code 走 SQL ci 校对(大小写
|
||||
# 变形可命中),批量版改字典查找后须自行等价归一,否则变形大小写会
|
||||
# 被误判「不是已存在的岗位」;岗位编码均为 ascii 小写蛇形,casefold 足够
|
||||
roles = {
|
||||
code.casefold(): role
|
||||
for code, role in business_role_repository.list_by_codes(session, dimension_values).items()
|
||||
}
|
||||
normalized: list[tuple[ParamDefinition, str, str]] = []
|
||||
seen: set[tuple[str, str]] = set()
|
||||
for item in items:
|
||||
definition = definitions.get(item.param_code)
|
||||
if definition is None:
|
||||
# 用户输入先行查库给 400;未注册编码出现在库里属数据与注册表漂移
|
||||
raise BadRequestError(f"参数 {item.param_code} 未在系统中定义")
|
||||
# ci 校对规则下大小写变形也能命中库,此后一律用库里的规范值:
|
||||
# 注册表 get_spec 与快照字典均按精确键匹配,原始大小写入库会导致
|
||||
# 取值链静默不命中(按错误参数算钱且无报错)
|
||||
spec = get_spec(definition.param_code)
|
||||
dimension = item.dimension_value
|
||||
if spec.dimension_type == "NONE" and dimension != "":
|
||||
raise BadRequestError(f"参数 {item.param_code} 不带维度,维度值须为空")
|
||||
if spec.dimension_type == "BUSINESS_ROLE" and dimension:
|
||||
role = roles.get(dimension.casefold())
|
||||
if role is None:
|
||||
raise BadRequestError(
|
||||
f"参数 {item.param_code} 的维度值 {dimension!r} 不是已存在的岗位"
|
||||
)
|
||||
dimension = role.role_code
|
||||
if (
|
||||
spec.dimension_type == "PRODUCT_CATEGORY"
|
||||
and dimension
|
||||
and dimension not in PRODUCT_CATEGORIES
|
||||
):
|
||||
raise BadRequestError(
|
||||
f"参数 {item.param_code} 的维度值 {dimension!r} 不是合法的产品类别"
|
||||
)
|
||||
value = validate_and_normalize(spec, item.value)
|
||||
key = (item.param_code, dimension)
|
||||
if key in seen:
|
||||
raise BadRequestError(
|
||||
f"同一批次内重复提交参数 {item.param_code}({dimension or '默认'})"
|
||||
)
|
||||
seen.add(key)
|
||||
normalized.append((definition, dimension, value))
|
||||
return normalized
|
||||
|
||||
|
||||
def submit_change(
|
||||
session: Session,
|
||||
payload: ParamChangeIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ParamChangeBatchOut:
|
||||
"""提交变更批次:全量校验 → 建批次 → 逐项写条目(旧值取提交时生效值)。
|
||||
|
||||
:raises BadRequestError: 参数未定义 / 维度不合法 / 值校验失败 / 生效日期早于今日 /
|
||||
同批次重复条目
|
||||
"""
|
||||
effective = payload.effective_date if payload.change_type == 2 else date.today()
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PARAM,
|
||||
action=ACTION_UPDATE,
|
||||
summary=(
|
||||
f"提交计提参数变更 {len(payload.items)} 项,"
|
||||
f"{'立即生效' if payload.change_type == 1 else f'{effective} 起生效'}"
|
||||
),
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if payload.change_type == 2 and effective < date.today():
|
||||
raise BadRequestError("指定生效日期不得早于今日")
|
||||
|
||||
# 先全量校验、再写入:任何一项不合法整批拒绝(不留半批脏数据)
|
||||
normalized = _normalize_items(session, payload.items)
|
||||
|
||||
try:
|
||||
batch = param_repository.create_batch(
|
||||
session,
|
||||
ParamChangeBatch(
|
||||
# 版本号与三单据同口径:MAX FOR UPDATE 锁当日序号区间;
|
||||
# 残余并发冲突由下方 IntegrityError 分支翻译为可重试 400
|
||||
version_no=next_no(
|
||||
session,
|
||||
model=ParamChangeBatch,
|
||||
column_name="version_no",
|
||||
prefix=NO_PREFIX_PARAM,
|
||||
seq_width=2,
|
||||
),
|
||||
effective_date=effective,
|
||||
change_type=payload.change_type,
|
||||
remark=payload.remark,
|
||||
operator_id=operator.id,
|
||||
operator_name=operator.username,
|
||||
item_count=len(normalized),
|
||||
),
|
||||
)
|
||||
# 旧值留痕取「本条目生效日时点」的值:存在多个未来生效批次时,
|
||||
# 每条记录的是它实际顶替的那一版(而非提交时刻的当前值)
|
||||
for definition, dimension, value in normalized:
|
||||
old = param_repository.latest_value_before(
|
||||
session, definition.id, dimension, effective
|
||||
)
|
||||
param_repository.create_value(
|
||||
session,
|
||||
ParamValue(
|
||||
param_id=definition.id,
|
||||
dimension_value=dimension,
|
||||
effective_date=effective,
|
||||
value_text=value,
|
||||
old_value_text=old.value_text if old else None,
|
||||
batch_id=batch.id,
|
||||
),
|
||||
)
|
||||
except IntegrityError as exc:
|
||||
# version_no 唯一键的并发冲突:回滚并翻译为可重试的 400
|
||||
session.rollback()
|
||||
raise BadRequestError("提交冲突(版本号生成重复),请重试") from exc
|
||||
session.commit()
|
||||
logger.info("提交参数变更 | version_no=%s | items=%s", batch.version_no, batch.item_count)
|
||||
return ParamChangeBatchOut(
|
||||
id=batch.id,
|
||||
version_no=batch.version_no,
|
||||
effective_date=batch.effective_date,
|
||||
change_type=batch.change_type,
|
||||
remark=batch.remark,
|
||||
operator_name=batch.operator_name,
|
||||
item_count=batch.item_count,
|
||||
create_time=batch.create_time,
|
||||
)
|
||||
|
||||
|
||||
def withdraw_batch(
|
||||
session: Session, batch_id: int, *, operator: User, meta: RequestMeta | None = None
|
||||
) -> None:
|
||||
"""撤回未生效批次。已生效禁撤;条目删除后解析自然回退到更早版本。
|
||||
|
||||
:raises NotFoundError: 批次不存在
|
||||
:raises BadRequestError: 批次已生效
|
||||
"""
|
||||
batch = param_repository.get_batch_by_id(session, batch_id, for_update=True)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PARAM,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"撤回参数变更批次 {batch.version_no if batch else f'#{batch_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if batch is None:
|
||||
raise NotFoundError("变更批次不存在")
|
||||
if batch.effective_date <= date.today():
|
||||
raise BadRequestError("批次已生效,不可撤回")
|
||||
|
||||
param_repository.delete_values_by_batch(session, batch.id)
|
||||
param_repository.delete_batch(session, batch)
|
||||
session.commit()
|
||||
logger.info("撤回参数变更批次 | version_no=%s", batch.version_no)
|
||||
|
||||
|
||||
def get_history(
|
||||
session: Session, param_code: str, query: ParamHistoryQuery
|
||||
) -> PageResult[ParamHistoryOut]:
|
||||
"""单参数版本历史(分页,最新在前)。
|
||||
|
||||
:raises NotFoundError: 参数不存在
|
||||
"""
|
||||
definition = param_repository.get_definition_by_code(session, param_code)
|
||||
if definition is None:
|
||||
raise NotFoundError("参数不存在")
|
||||
rows = param_repository.list_history(
|
||||
session,
|
||||
definition.id,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
dimension_value=query.dimension_value,
|
||||
)
|
||||
total = param_repository.count_history(
|
||||
session, definition.id, dimension_value=query.dimension_value
|
||||
)
|
||||
return PageResult[ParamHistoryOut](
|
||||
records=[
|
||||
ParamHistoryOut(
|
||||
version_no=batch.version_no,
|
||||
dimension_value=value.dimension_value,
|
||||
old_value_text=value.old_value_text,
|
||||
value_text=value.value_text,
|
||||
effective_date=value.effective_date,
|
||||
operator_name=batch.operator_name,
|
||||
create_time=value.create_time,
|
||||
)
|
||||
for value, batch in rows
|
||||
],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def list_batches(session: Session, query: ParamBatchQuery) -> PageResult[ParamBatchOut]:
|
||||
"""变更批次分页(按创建时间倒序)。"""
|
||||
batches = param_repository.list_batches(
|
||||
session,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
start_date=query.start_date,
|
||||
end_date=query.end_date,
|
||||
)
|
||||
total = param_repository.count_batches(
|
||||
session, start_date=query.start_date, end_date=query.end_date
|
||||
)
|
||||
return PageResult[ParamBatchOut](
|
||||
records=[
|
||||
ParamBatchOut(
|
||||
id=batch.id,
|
||||
version_no=batch.version_no,
|
||||
effective_date=batch.effective_date,
|
||||
change_type=batch.change_type,
|
||||
remark=batch.remark,
|
||||
operator_name=batch.operator_name,
|
||||
item_count=batch.item_count,
|
||||
create_time=batch.create_time,
|
||||
)
|
||||
for batch in batches
|
||||
],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_batch_detail(session: Session, batch_id: int) -> ParamBatchDetailOut:
|
||||
"""批次明细:批次头 + 逐项旧值 → 新值。
|
||||
|
||||
:raises NotFoundError: 批次不存在
|
||||
"""
|
||||
batch = param_repository.get_batch_by_id(session, batch_id)
|
||||
if batch is None:
|
||||
raise NotFoundError("变更批次不存在")
|
||||
items = [
|
||||
ParamBatchItemOut(
|
||||
param_code=definition.param_code,
|
||||
param_name=definition.param_name,
|
||||
dimension_value=value.dimension_value,
|
||||
old_value_text=value.old_value_text,
|
||||
value_text=value.value_text,
|
||||
effective_date=value.effective_date,
|
||||
)
|
||||
for value, definition in param_repository.list_values_by_batch(session, batch_id)
|
||||
]
|
||||
return ParamBatchDetailOut(
|
||||
id=batch.id,
|
||||
version_no=batch.version_no,
|
||||
effective_date=batch.effective_date,
|
||||
change_type=batch.change_type,
|
||||
remark=batch.remark,
|
||||
operator_name=batch.operator_name,
|
||||
item_count=batch.item_count,
|
||||
create_time=batch.create_time,
|
||||
items=items,
|
||||
)
|
||||
|
||||
|
||||
# ==================== 对比与预览 ====================
|
||||
|
||||
|
||||
def compare(session: Session, *, from_date: date, to_date: date) -> list[ParamDiffOut]:
|
||||
"""两日期快照逐项对比(全量参数,changed 标记变化)。
|
||||
|
||||
:raises BadRequestError: 起始日期晚于截止日期
|
||||
"""
|
||||
if from_date > to_date:
|
||||
raise BadRequestError("起始日期不得晚于截止日期")
|
||||
old_items = {
|
||||
(code, dimension): value
|
||||
for code, dimension, value in resolve_snapshot(session, from_date).iter_items()
|
||||
}
|
||||
new_items = {
|
||||
(code, dimension): value
|
||||
for code, dimension, value in resolve_snapshot(session, to_date).iter_items()
|
||||
}
|
||||
out: list[ParamDiffOut] = []
|
||||
for code, dimension in sorted(set(old_items) | set(new_items)):
|
||||
spec = get_spec(code)
|
||||
old_value = old_items.get((code, dimension))
|
||||
new_value = new_items.get((code, dimension))
|
||||
out.append(
|
||||
ParamDiffOut(
|
||||
param_code=code,
|
||||
param_name=spec.name,
|
||||
param_group=spec.group,
|
||||
dimension_value=dimension,
|
||||
old_value=old_value,
|
||||
new_value=new_value,
|
||||
changed=old_value != new_value,
|
||||
)
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def _preview_rate(
|
||||
session: Session,
|
||||
payload: ParamPreviewIn,
|
||||
snapshot: ParamSnapshot,
|
||||
days: int,
|
||||
take,
|
||||
) -> tuple[Fraction, str, Decimal | None]:
|
||||
"""按岗位模板分派计提比例,返回(纯比例, 人读说明, 绩效基数覆盖值)。
|
||||
|
||||
基数覆盖值非 None 表示该模板的绩效基数不是折算毛利润额(如信息员按
|
||||
「本人销售额」计提),预览层直接采用并跳过折算与阈值。
|
||||
聚合模板(营销经理 12.5%+5%)依赖月度团队数据,不支持单笔预览。
|
||||
"""
|
||||
if payload.customer_type == "enterprise":
|
||||
# 存储口径为 ‰ 数(如 "3"),除以 1000 转纯比例 —— performance_amount
|
||||
# 按纯比例相乘,漏换算会把绩效金额放大 1000 倍(与业务员分支同防线)
|
||||
rate = take("enterprise.rate") / 1000
|
||||
return rate, "企业户固定计提比例", None
|
||||
|
||||
role_code = payload.business_role
|
||||
template = "TPL_SALESPERSON_DECAY"
|
||||
if role_code:
|
||||
role = business_role_repository.get_by_code(session, role_code)
|
||||
if role is None:
|
||||
raise BadRequestError(f"岗位 {role_code!r} 不存在")
|
||||
template = role.calc_template
|
||||
|
||||
if template == "TPL_MANAGER_SHARE":
|
||||
raise BadRequestError(
|
||||
"营销经理绩效为团队聚合口径(本团队 12.5% + 全公司 5%),不支持单笔预览"
|
||||
)
|
||||
if template == "TPL_INFO_SALES_FIXED":
|
||||
# ‰ 存储口径 → 纯比例,同企业户分支(不换算则绩效放大 1000 倍)
|
||||
rate = take("info.rate") / 1000
|
||||
# 信息员的基数是本人销售额(无折算与阈值),覆盖默认基数
|
||||
return rate, "信息员:本人销售额 × 计提比例", Decimal(payload.revenue)
|
||||
if template == "TPL_SALESPERSON_DECAY":
|
||||
start = take("salesperson.rate.start")
|
||||
slope = take("salesperson.rate.slope")
|
||||
floor = take("salesperson.rate.floor")
|
||||
boundary = int(take("salesperson.days.boundary"))
|
||||
rate = formula.salesperson_rate(
|
||||
days, start=start, slope=slope, floor=floor, boundary_days=boundary
|
||||
)
|
||||
return (
|
||||
rate,
|
||||
f"业务员递减:{to_decimal(start)}‰ 起,{days} 天(分界 {boundary} 天,超界取 {to_decimal(floor)}‰)",
|
||||
None,
|
||||
)
|
||||
raise BadRequestError(f"公式模板 {template} 暂不支持预览")
|
||||
|
||||
|
||||
def preview(session: Session, payload: ParamPreviewIn) -> ParamPreviewOut:
|
||||
"""计算预览:入参(发货/回款/金额/岗位)→ 公式纯函数 → 出参(含所用参数)。"""
|
||||
# 参数按回款到账日取值(对照表 #11)
|
||||
snapshot = resolve_snapshot(session, payload.receipt_date)
|
||||
revenue = Decimal(payload.revenue)
|
||||
profit = Decimal(payload.profit)
|
||||
received = Decimal(payload.received_amount)
|
||||
used: list[ParamUsedOut] = []
|
||||
|
||||
def take(code: str) -> Fraction:
|
||||
raw = snapshot.get(
|
||||
code,
|
||||
role_code=payload.business_role,
|
||||
product_category=payload.product_category,
|
||||
)
|
||||
used.append(
|
||||
ParamUsedOut(
|
||||
param_code=code,
|
||||
value_text=raw,
|
||||
effective_date=snapshot.effective_date_of(
|
||||
code,
|
||||
role_code=payload.business_role,
|
||||
product_category=payload.product_category,
|
||||
),
|
||||
)
|
||||
)
|
||||
return parse_fraction(raw)
|
||||
|
||||
if payload.product_category and payload.product_category not in PRODUCT_CATEGORIES:
|
||||
raise BadRequestError(
|
||||
f"产品类别 {payload.product_category!r} 不存在,可选:municipal_water / rail_transit"
|
||||
)
|
||||
|
||||
days = formula.payment_days(payload.ship_date, payload.receipt_date)
|
||||
rate, rate_text, base_override = _preview_rate(session, payload, snapshot, days, take)
|
||||
|
||||
profit_rate = formula.profit_rate(profit, revenue)
|
||||
if base_override is not None:
|
||||
# 基数覆盖(信息员按本人销售额计提):不走折算与阈值
|
||||
converted = base_override
|
||||
else:
|
||||
threshold = take("product.threshold")
|
||||
converted = formula.converted_profit(revenue, profit_rate, threshold)
|
||||
performance = formula.performance_amount(converted, rate)
|
||||
|
||||
barter_applied = payload.barter
|
||||
after_barter: Decimal | None = None
|
||||
if barter_applied:
|
||||
discount = take("barter.discount")
|
||||
after_barter = formula.apply_barter(performance, discount)
|
||||
|
||||
start_ratio = take("payment.start.ratio")
|
||||
start_ok = formula.start_payment_ok(received, revenue, start_ratio)
|
||||
# R 按「回款占销售额百分比向下取整」口径封顶封底:received 非负时 int()
|
||||
# 即向下取整;min/max 同时是红字冲销(负数回款)接入时的方向防线
|
||||
weight_r = (
|
||||
max(0, min(100, int(Fraction(received) / Fraction(revenue) * 100))) if revenue > 0 else 0
|
||||
)
|
||||
weight = formula.payment_weight(weight_r)
|
||||
base_amount = after_barter if barter_applied else performance
|
||||
payable = to_decimal(Fraction(base_amount) * weight)
|
||||
|
||||
probation_note: str | None = None
|
||||
if payload.probation:
|
||||
annual = take("probation.annual.threshold")
|
||||
probation_note = f"试用期绩效照算不发放;年累计超 {to_decimal(annual)} 元部分年底一次性结算"
|
||||
|
||||
return ParamPreviewOut(
|
||||
payment_days=days,
|
||||
rate=str(rate),
|
||||
rate_text=rate_text,
|
||||
profit_rate=str(profit_rate),
|
||||
converted_profit=str(converted),
|
||||
performance_amount=str(performance),
|
||||
barter_applied=barter_applied,
|
||||
performance_after_barter=str(after_barter) if after_barter is not None else None,
|
||||
start_payment_ok=start_ok,
|
||||
payment_weight_r=weight_r,
|
||||
payment_weight=str(weight),
|
||||
payable_amount=str(payable),
|
||||
probation_note=probation_note,
|
||||
params_used=used,
|
||||
)
|
||||
|
||||
|
||||
# ==================== 导出 ====================
|
||||
|
||||
|
||||
def export_changes(
|
||||
session: Session, *, start_date: date | None = None, end_date: date | None = None
|
||||
) -> bytes:
|
||||
"""变更记录导出 Excel(openpyxl)。列:版本号/变更人/变更时间/生效日期/参数/维度/旧值/新值。"""
|
||||
from openpyxl import Workbook
|
||||
|
||||
rows = param_repository.list_export_rows(session, start_date=start_date, end_date=end_date)
|
||||
workbook = Workbook()
|
||||
sheet = workbook.active
|
||||
sheet.title = "参数变更记录"
|
||||
sheet.append(
|
||||
[
|
||||
"版本号",
|
||||
"变更人",
|
||||
"变更时间",
|
||||
"生效日期",
|
||||
"参数编码",
|
||||
"参数名称",
|
||||
"维度值",
|
||||
"旧值",
|
||||
"新值",
|
||||
]
|
||||
)
|
||||
for batch, value, definition in rows:
|
||||
sheet.append(
|
||||
[
|
||||
batch.version_no,
|
||||
batch.operator_name,
|
||||
batch.create_time.strftime("%Y-%m-%d %H:%M:%S"),
|
||||
value.effective_date.strftime("%Y-%m-%d"),
|
||||
definition.param_code,
|
||||
definition.param_name,
|
||||
value.dimension_value,
|
||||
value.old_value_text,
|
||||
value.value_text,
|
||||
]
|
||||
)
|
||||
buffer = BytesIO()
|
||||
workbook.save(buffer)
|
||||
return buffer.getvalue()
|
||||
@@ -0,0 +1,438 @@
|
||||
"""营销人员管理业务编排(需求 2.1.1:人员档案 + 辐射区域 + 拓展计划)。
|
||||
|
||||
业务规则(前端会做提示,**后端校验是唯一防线**):
|
||||
|
||||
- 岗位必须存在且启用 —— 岗位决定计提公式模板,挂到停用/不存在的岗位
|
||||
会让 M3 核算找不到模板
|
||||
- 直属经理不能是自己、目标须存在且在职 —— 自引用关系是 M3 经理 12.5%
|
||||
聚合的展开锚点,环引用或悬空引用会让聚合死循环/漏算
|
||||
- 删除保护:被团队成员(personnel.manager_id)或客户归属
|
||||
(customers.owner_personnel_id)引用的人员**禁删**,应改为离职 ——
|
||||
历史核算与客户归属都要能回溯到人,物理删除会留下悬空引用
|
||||
- 金额红线:salary_standard 以字符串进出、服务层转 Decimal,全程不经 float
|
||||
|
||||
辐射区域与拓展计划为整表替换维护:先删、立即 flush、再插入
|
||||
(防御同一 flush 先 INSERT 后 DELETE 撞唯一键,见 personnel_repository)。
|
||||
"""
|
||||
|
||||
import logging
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
ACTION_DELETE,
|
||||
ACTION_UPDATE,
|
||||
MODULE_PERSONNEL,
|
||||
)
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.core.response import PageResult
|
||||
from app.models import BusinessRole, Personnel, PersonnelPlan, PersonnelRegion, User
|
||||
from app.models.personnel import PERSONNEL_STATUS_ACTIVE
|
||||
from app.repositories import business_role_repository, personnel_repository
|
||||
from app.schemas.personnel import (
|
||||
PersonnelCreateIn,
|
||||
PersonnelDetailOut,
|
||||
PersonnelOut,
|
||||
PersonnelPlanOut,
|
||||
PersonnelQuery,
|
||||
PersonnelRegionOut,
|
||||
PlanReplaceIn,
|
||||
RegionReplaceIn,
|
||||
)
|
||||
from app.services import audit_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 删除保护的统一文案:三种引用(团队成员/客户归属/业务归属)共享同一提示,
|
||||
# 引导管理员走「离职」而非删除
|
||||
_DELETE_BLOCKED = "存在团队成员、客户归属或业务归属引用,请改为离职而非删除"
|
||||
|
||||
|
||||
def ensure_active(session: Session, personnel_id: int, *, label: str) -> Personnel:
|
||||
"""归属人员必须存在且在职,返回人员行(业务/客户两侧归属校验共用)。
|
||||
|
||||
「不存在」与「已离职」合并为同一文案:人员 ID 是否有效不构成需要向
|
||||
调用方区分的信息(同登录防枚举的思路);label 落文案(负责/协助/归属)。
|
||||
收口单点:在职状态值取 models.personnel.PERSONNEL_STATUS_ACTIVE,
|
||||
此前 business/customer 两 service 各持常量与校验,仅靠注释维持同步。
|
||||
|
||||
:raises BadRequestError: {label}人员不存在或已离职
|
||||
"""
|
||||
person = personnel_repository.get_by_id(session, personnel_id)
|
||||
if person is None or person.status != PERSONNEL_STATUS_ACTIVE:
|
||||
raise BadRequestError(f"{label}人员不存在或已离职")
|
||||
return person
|
||||
|
||||
|
||||
def list_personnel(session: Session, query: PersonnelQuery) -> PageResult[PersonnelOut]:
|
||||
"""分页查询人员(含离职)。"""
|
||||
rows = personnel_repository.list_personnel(
|
||||
session,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
keyword=query.keyword,
|
||||
status=query.status,
|
||||
business_role_id=query.business_role_id,
|
||||
)
|
||||
total = personnel_repository.count_personnel(
|
||||
session,
|
||||
keyword=query.keyword,
|
||||
status=query.status,
|
||||
business_role_id=query.business_role_id,
|
||||
)
|
||||
return PageResult[PersonnelOut](
|
||||
records=[
|
||||
_to_out(personnel, role_name, manager_name)
|
||||
for personnel, role_name, manager_name in rows
|
||||
],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_detail(session: Session, personnel_id: int) -> PersonnelDetailOut:
|
||||
"""人员详情(含区域与拓展计划,供编辑抽屉回显)。
|
||||
|
||||
:raises NotFoundError: 人员不存在
|
||||
"""
|
||||
row = personnel_repository.get_with_names(session, personnel_id)
|
||||
if row is None:
|
||||
raise NotFoundError("人员不存在")
|
||||
personnel, role_name, manager_name = row
|
||||
return PersonnelDetailOut(
|
||||
**_to_out(personnel, role_name, manager_name).model_dump(),
|
||||
regions=[
|
||||
PersonnelRegionOut.model_validate(item)
|
||||
for item in personnel_repository.list_regions(session, personnel_id)
|
||||
],
|
||||
plans=[
|
||||
PersonnelPlanOut.model_validate(item)
|
||||
for item in personnel_repository.list_plans(session, personnel_id)
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
def create_personnel(
|
||||
session: Session,
|
||||
payload: PersonnelCreateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> PersonnelOut:
|
||||
"""新增人员,默认在职。
|
||||
|
||||
:raises BadRequestError: 岗位不存在或已停用 / 直属经理不合法
|
||||
"""
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PERSONNEL,
|
||||
action=ACTION_CREATE,
|
||||
summary=f"新增人员 {payload.personnel_name}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 引用校验放在审计上下文内:失败同样要留痕(与 update_personnel 口径
|
||||
# 一致)——「谁在何时试图把人挂到停用岗位/离职经理上」是审计对象,
|
||||
# 校验留在上下文外会让这类失败操作无据可查
|
||||
role, manager_name = _validate_refs(
|
||||
session, payload.business_role_id, payload.manager_id, None
|
||||
)
|
||||
personnel = Personnel(
|
||||
personnel_name=payload.personnel_name,
|
||||
business_role_id=payload.business_role_id,
|
||||
manager_id=payload.manager_id,
|
||||
phone=payload.phone,
|
||||
hire_date=payload.hire_date,
|
||||
is_probation=payload.is_probation,
|
||||
salary_standard=_parse_salary(payload.salary_standard),
|
||||
status=1,
|
||||
remark=payload.remark,
|
||||
)
|
||||
try:
|
||||
personnel_repository.create(session, personnel)
|
||||
out = _to_out(personnel, role.role_name, manager_name)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 先查后写不是原子操作:岗位/经理行被并发删除时 FK RESTRICT 令写入失败
|
||||
session.rollback()
|
||||
raise BadRequestError("岗位或直属经理引用已失效,请刷新后重试") from exc
|
||||
|
||||
logger.info("新增人员 | personnel_id=%s | name=%s", personnel.id, payload.personnel_name)
|
||||
return out
|
||||
|
||||
|
||||
def update_personnel(
|
||||
session: Session,
|
||||
personnel_id: int,
|
||||
payload: PersonnelCreateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> PersonnelOut:
|
||||
"""编辑人员(全量替换,不含状态)。
|
||||
|
||||
经理自引用校验以**被编辑人员的 id** 为准:把经理改成自己是环引用。
|
||||
|
||||
:raises NotFoundError: 人员不存在
|
||||
:raises BadRequestError: 岗位不存在或已停用 / 直属经理不合法
|
||||
"""
|
||||
row = personnel_repository.get_with_names(session, personnel_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PERSONNEL,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改人员 {row[0].personnel_name if row else f'#{personnel_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if row is None:
|
||||
raise NotFoundError("人员不存在")
|
||||
personnel = row[0]
|
||||
role, manager_name = _validate_refs(
|
||||
session, payload.business_role_id, payload.manager_id, personnel.id
|
||||
)
|
||||
personnel.personnel_name = payload.personnel_name
|
||||
personnel.business_role_id = payload.business_role_id
|
||||
personnel.manager_id = payload.manager_id
|
||||
personnel.phone = payload.phone
|
||||
personnel.hire_date = payload.hire_date
|
||||
personnel.is_probation = payload.is_probation
|
||||
personnel.salary_standard = _parse_salary(payload.salary_standard)
|
||||
personnel.remark = payload.remark
|
||||
# 响应与后置动作全部在 commit 之前完成(见 user_service 顶部说明)
|
||||
out = _to_out(personnel, role.role_name, manager_name)
|
||||
session.commit()
|
||||
logger.info("修改人员 | personnel_id=%s", personnel_id)
|
||||
return out
|
||||
|
||||
|
||||
def delete_personnel(
|
||||
session: Session,
|
||||
personnel_id: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""删除人员。有团队成员或客户归属引用时禁删,引导走「离职」。
|
||||
|
||||
查询走 ``FOR UPDATE`` 锁行:校验与删除之间若发生并发引用,锁行使
|
||||
并发外键写入在删除时失败(可见的 400)而非引用被静默悬空。
|
||||
|
||||
:raises NotFoundError: 人员不存在
|
||||
:raises BadRequestError: 存在团队成员或客户归属引用
|
||||
"""
|
||||
personnel = personnel_repository.get_by_id(session, personnel_id, for_update=True)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PERSONNEL,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"删除人员 {personnel.personnel_name if personnel else f'#{personnel_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if personnel is None:
|
||||
raise NotFoundError("人员不存在")
|
||||
|
||||
ids = [personnel_id]
|
||||
if (
|
||||
personnel_repository.count_team_members(session, ids)
|
||||
or personnel_repository.count_customer_ownerships(session, ids)
|
||||
or personnel_repository.count_business_roles_refs(session, ids)
|
||||
):
|
||||
# 业务归属引用(负责/协助)随业务表就位一并纳入删除保护——
|
||||
# 漏检会让删除以 FK RESTRICT 的 500 暴露而非可读的 400
|
||||
raise BadRequestError(_DELETE_BLOCKED)
|
||||
|
||||
name = personnel.personnel_name # 固化:对象随删除失效
|
||||
try:
|
||||
personnel_repository.delete(session, personnel)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 校验与删除之间并发新增了团队成员/客户归属,FK RESTRICT 令删除失败
|
||||
session.rollback()
|
||||
raise BadRequestError(_DELETE_BLOCKED) from exc
|
||||
logger.info("删除人员 | personnel_id=%s | name=%s", personnel_id, name)
|
||||
|
||||
|
||||
def set_status(
|
||||
session: Session,
|
||||
personnel_id: int,
|
||||
status: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> PersonnelOut:
|
||||
"""在职/离职切换。
|
||||
|
||||
人员语义不用「启用/禁用」词表,action 记 ACTION_UPDATE、摘要写明去向。
|
||||
|
||||
:raises NotFoundError: 人员不存在
|
||||
"""
|
||||
row = personnel_repository.get_with_names(session, personnel_id)
|
||||
verb = "设为在职" if status == 1 else "设为离职"
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PERSONNEL,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"{verb} {row[0].personnel_name if row else f'#{personnel_id}'}",
|
||||
request_data={"status": status},
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if row is None:
|
||||
raise NotFoundError("人员不存在")
|
||||
personnel, role_name, manager_name = row
|
||||
personnel.status = status
|
||||
out = _to_out(personnel, role_name, manager_name)
|
||||
session.commit()
|
||||
logger.info("变更人员状态 | personnel_id=%s | status=%s", personnel_id, status)
|
||||
return out
|
||||
|
||||
|
||||
def replace_regions(
|
||||
session: Session,
|
||||
personnel_id: int,
|
||||
payload: RegionReplaceIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""全量替换辐射区域,空列表即清空。
|
||||
|
||||
:raises NotFoundError: 人员不存在
|
||||
"""
|
||||
row = personnel_repository.get_with_names(session, personnel_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PERSONNEL,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"维护辐射区域 {row[0].personnel_name if row else f'#{personnel_id}'}",
|
||||
request_data=payload.model_dump(),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if row is None:
|
||||
raise NotFoundError("人员不存在")
|
||||
rows = [
|
||||
PersonnelRegion(
|
||||
personnel_id=personnel_id, region_name=item.region_name, remark=item.remark
|
||||
)
|
||||
for item in payload.items
|
||||
]
|
||||
personnel_repository.replace_regions(session, personnel_id, rows)
|
||||
session.commit()
|
||||
logger.info("维护辐射区域 | personnel_id=%s | 条目数=%s", personnel_id, len(rows))
|
||||
|
||||
|
||||
def replace_plans(
|
||||
session: Session,
|
||||
personnel_id: int,
|
||||
payload: PlanReplaceIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""全量替换拓展计划,空列表即清空。
|
||||
|
||||
:raises NotFoundError: 人员不存在
|
||||
"""
|
||||
row = personnel_repository.get_with_names(session, personnel_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PERSONNEL,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"维护拓展计划 {row[0].personnel_name if row else f'#{personnel_id}'}",
|
||||
request_data=payload.model_dump(),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if row is None:
|
||||
raise NotFoundError("人员不存在")
|
||||
rows = [
|
||||
PersonnelPlan(
|
||||
personnel_id=personnel_id,
|
||||
plan_period=item.plan_period,
|
||||
plan_content=item.plan_content,
|
||||
target_desc=item.target_desc,
|
||||
)
|
||||
for item in payload.items
|
||||
]
|
||||
personnel_repository.replace_plans(session, personnel_id, rows)
|
||||
session.commit()
|
||||
logger.info("维护拓展计划 | personnel_id=%s | 条目数=%s", personnel_id, len(rows))
|
||||
|
||||
|
||||
def _to_out(personnel: Personnel, role_name: str | None, manager_name: str | None) -> PersonnelOut:
|
||||
"""ORM 对象转响应模型。禁止把 ORM 对象直接当 response_model。"""
|
||||
return PersonnelOut(
|
||||
id=personnel.id,
|
||||
personnel_name=personnel.personnel_name,
|
||||
business_role_id=personnel.business_role_id,
|
||||
role_name=role_name,
|
||||
manager_id=personnel.manager_id,
|
||||
manager_name=manager_name,
|
||||
phone=personnel.phone,
|
||||
hire_date=personnel.hire_date,
|
||||
is_probation=personnel.is_probation,
|
||||
salary_standard=(
|
||||
str(personnel.salary_standard) if personnel.salary_standard is not None else None
|
||||
),
|
||||
status=personnel.status,
|
||||
remark=personnel.remark,
|
||||
)
|
||||
|
||||
|
||||
def _validate_refs(
|
||||
session: Session,
|
||||
business_role_id: int,
|
||||
manager_id: int | None,
|
||||
self_id: int | None,
|
||||
) -> tuple[BusinessRole, str | None]:
|
||||
"""新增/编辑共用的引用校验:岗位须存在且启用;经理不能是自己且须在职。
|
||||
|
||||
``self_id`` 编辑时传被编辑人员的 id、新增时传 None(新增不存在「自己」)。
|
||||
返回岗位行与经理姓名供响应 DTO 复用,避免提交后再查一次。
|
||||
|
||||
:raises BadRequestError: 岗位不存在或已停用 / 直属经理不合法
|
||||
"""
|
||||
role = business_role_repository.get_by_id(session, business_role_id)
|
||||
if role is None or role.status != 1:
|
||||
raise BadRequestError("岗位不存在或已停用")
|
||||
|
||||
manager_name: str | None = None
|
||||
if manager_id is not None:
|
||||
if manager_id == self_id:
|
||||
raise BadRequestError("直属经理不能是自己")
|
||||
manager = personnel_repository.get_by_id(session, manager_id)
|
||||
if manager is None or manager.status != 1:
|
||||
raise BadRequestError("直属经理不存在或已离职")
|
||||
manager_name = manager.personnel_name
|
||||
return role, manager_name
|
||||
|
||||
|
||||
def _parse_salary(value: str | None) -> Decimal | None:
|
||||
"""入参字符串转 Decimal 存库。
|
||||
|
||||
格式、非负与容量已在 schema 层校验,此处只做类型转换 ——
|
||||
金额红线:全程 Decimal,不经 float。
|
||||
"""
|
||||
return Decimal(value) if value is not None else None
|
||||
@@ -0,0 +1,314 @@
|
||||
"""产品管理业务编排。
|
||||
|
||||
产品主数据的两条硬约束(违反会算错钱):
|
||||
|
||||
- ``product_category`` 是**折算阈值的行级锚点**:混合业务按产品逐条计算
|
||||
(对照表 #14),阈值由 M1 参数 ``product.threshold`` 按 PRODUCT_CATEGORY
|
||||
维度承担。类别游离于合法值域之外时,核算按类别回溯参数会取不到阈值,
|
||||
故值域校验是业务规则而非格式校验
|
||||
- 数量/单价全程 ``Decimal``:schema 层已拦格式与非负(金额红线入口),
|
||||
service 层负责字符串到 Decimal 的转换与落库
|
||||
|
||||
另:``spec_model`` 归一为**空串而非 NULL** —— 它参与 uk_products_name_spec
|
||||
组合唯一键,MySQL 组合索引对 NULL 不去重,归 NULL 会放行重名同规格数据。
|
||||
删除为物理删除,被业务明细引用的保护检查待业务数据表(V5)就位后补充。
|
||||
"""
|
||||
|
||||
import logging
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
ACTION_DELETE,
|
||||
ACTION_DISABLE,
|
||||
ACTION_ENABLE,
|
||||
ACTION_UPDATE,
|
||||
MODULE_PRODUCT,
|
||||
PRODUCT_CATEGORIES,
|
||||
)
|
||||
from app.core.db_errors import is_duplicate_entry
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.core.response import PageResult
|
||||
from app.models import Product, User
|
||||
from app.repositories import product_repository
|
||||
from app.schemas.product import (
|
||||
ProductCreateIn,
|
||||
ProductOut,
|
||||
ProductQuery,
|
||||
ProductUpdateIn,
|
||||
)
|
||||
from app.services import audit_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _to_out(product: Product) -> ProductOut:
|
||||
"""ORM 对象转响应模型。禁止把 ORM 对象直接当 response_model。"""
|
||||
return ProductOut(
|
||||
id=product.id,
|
||||
product_name=product.product_name,
|
||||
spec_model=product.spec_model,
|
||||
unit=product.unit,
|
||||
stock_quantity=str(product.stock_quantity) if product.stock_quantity is not None else None,
|
||||
sale_price=str(product.sale_price) if product.sale_price is not None else None,
|
||||
product_category=product.product_category,
|
||||
status=product.status,
|
||||
remark=product.remark,
|
||||
create_time=product.create_time,
|
||||
update_time=product.update_time,
|
||||
)
|
||||
|
||||
|
||||
def _to_decimal(value: str | None) -> Decimal | None:
|
||||
"""数字字符串转 Decimal(可空列的空串/None 透传 None)。
|
||||
|
||||
入参已 str 化再进 Decimal:即使上游口径变化传入数字类型,也不经 float
|
||||
二进制近似,金额红线在最后一道转换处仍然成立。schema 已保证可解析,
|
||||
此处不再重复校验。
|
||||
"""
|
||||
if not value:
|
||||
return None
|
||||
return Decimal(str(value))
|
||||
|
||||
|
||||
def _ensure_category(product_category: str) -> None:
|
||||
"""类别必须 ∈ PRODUCT_CATEGORIES(前端下拉仅是展示约束,后端校验是唯一防线)。"""
|
||||
if product_category not in PRODUCT_CATEGORIES:
|
||||
raise BadRequestError("产品类别不合法")
|
||||
|
||||
|
||||
def _is_duplicate_entry(exc: IntegrityError) -> bool:
|
||||
"""判断 IntegrityError 是否为 MySQL 1062(唯一键冲突)。
|
||||
|
||||
只有 1062 是「已存在」语义,可转业务提示;其余完整性错误(外键、
|
||||
数据溢出等)语义未知,必须原样上抛交由全局处理器记 500,不能吞成 400。
|
||||
"""
|
||||
return is_duplicate_entry(exc)
|
||||
|
||||
|
||||
def _raise_if_duplicate(exc: IntegrityError) -> None:
|
||||
"""唯一键冲突统一转业务提示;其余完整性错误原样重抛。"""
|
||||
if _is_duplicate_entry(exc):
|
||||
raise BadRequestError("已存在同名称同规格的产品") from exc
|
||||
raise exc
|
||||
|
||||
|
||||
def list_products(session: Session, query: ProductQuery) -> PageResult[ProductOut]:
|
||||
"""分页查询产品(含停用)。"""
|
||||
products = product_repository.list_products(
|
||||
session,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
keyword=query.keyword,
|
||||
product_category=query.product_category,
|
||||
status=query.status,
|
||||
)
|
||||
total = product_repository.count_products(
|
||||
session,
|
||||
keyword=query.keyword,
|
||||
product_category=query.product_category,
|
||||
status=query.status,
|
||||
)
|
||||
return PageResult[ProductOut](
|
||||
records=[_to_out(product) for product in products],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_product(session: Session, product_id: int) -> ProductOut:
|
||||
"""产品详情。
|
||||
|
||||
:raises NotFoundError: 产品不存在
|
||||
"""
|
||||
product = product_repository.get_by_id(session, product_id)
|
||||
if product is None:
|
||||
raise NotFoundError("产品不存在")
|
||||
return _to_out(product)
|
||||
|
||||
|
||||
def create_product(
|
||||
session: Session,
|
||||
payload: ProductCreateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ProductOut:
|
||||
"""新增产品。类别须在合法值域内,新产品固定启用。
|
||||
|
||||
:raises BadRequestError: 产品类别不合法 / 已存在同名称同规格的产品
|
||||
"""
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PRODUCT,
|
||||
action=ACTION_CREATE,
|
||||
summary=f"新增产品 {payload.product_name}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 值域校验在审计上下文内:类别非法的 400 也要留痕(成功与失败都记)
|
||||
_ensure_category(payload.product_category)
|
||||
spec_model = payload.spec_model or "" # 归一空串:组合唯一键对 NULL 不去重
|
||||
if (
|
||||
product_repository.get_by_name_spec(session, payload.product_name, spec_model)
|
||||
is not None
|
||||
):
|
||||
raise BadRequestError("已存在同名称同规格的产品")
|
||||
|
||||
product = Product(
|
||||
product_name=payload.product_name,
|
||||
spec_model=spec_model,
|
||||
unit=payload.unit,
|
||||
stock_quantity=_to_decimal(payload.stock_quantity),
|
||||
sale_price=_to_decimal(payload.sale_price),
|
||||
product_category=payload.product_category,
|
||||
status=1,
|
||||
remark=payload.remark,
|
||||
)
|
||||
try:
|
||||
product_repository.create(session, product)
|
||||
# 响应与后置动作全部在 commit 之前完成(见 business_role_service 同处说明)
|
||||
out = _to_out(product)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 先查后写不是原子操作:并发提交同名称同规格会撞 uk_products_name_spec
|
||||
session.rollback()
|
||||
_raise_if_duplicate(exc)
|
||||
|
||||
logger.info("新增产品 | product_id=%s | category=%s", product.id, payload.product_category)
|
||||
return out
|
||||
|
||||
|
||||
def update_product(
|
||||
session: Session,
|
||||
product_id: int,
|
||||
payload: ProductUpdateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ProductOut:
|
||||
"""编辑产品基本信息(全量替换,不含状态;启停走独立端点)。
|
||||
|
||||
:raises NotFoundError: 产品不存在
|
||||
:raises BadRequestError: 产品类别不合法 / 已存在同名称同规格的产品
|
||||
"""
|
||||
product = product_repository.get_by_id(session, product_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PRODUCT,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改产品 {product.product_name if product else f'#{product_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 值域校验在审计上下文内:类别非法的 400 也要留痕(同 create 口径)
|
||||
_ensure_category(payload.product_category)
|
||||
if product is None:
|
||||
raise NotFoundError("产品不存在")
|
||||
|
||||
product.product_name = payload.product_name
|
||||
product.spec_model = payload.spec_model or ""
|
||||
product.unit = payload.unit
|
||||
product.stock_quantity = _to_decimal(payload.stock_quantity)
|
||||
product.sale_price = _to_decimal(payload.sale_price)
|
||||
product.product_category = payload.product_category
|
||||
product.remark = payload.remark
|
||||
out = _to_out(product)
|
||||
try:
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 改名/改规格可能撞 uk_products_name_spec(本行改值与他人既有数据重合)
|
||||
session.rollback()
|
||||
_raise_if_duplicate(exc)
|
||||
|
||||
logger.info("修改产品 | product_id=%s | category=%s", product_id, payload.product_category)
|
||||
return out
|
||||
|
||||
|
||||
def set_status(
|
||||
session: Session,
|
||||
product_id: int,
|
||||
status: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ProductOut:
|
||||
"""启用或停用产品。停用为主(模型约定),物理删除仅限误录数据。
|
||||
|
||||
:raises NotFoundError: 产品不存在
|
||||
"""
|
||||
product = product_repository.get_by_id(session, product_id)
|
||||
verb = "启用" if status == 1 else "停用"
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PRODUCT,
|
||||
action=ACTION_ENABLE if status == 1 else ACTION_DISABLE,
|
||||
summary=f"{verb}产品 {product.product_name if product else f'#{product_id}'}",
|
||||
request_data={"status": status},
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if product is None:
|
||||
raise NotFoundError("产品不存在")
|
||||
|
||||
product.status = status
|
||||
out = _to_out(product)
|
||||
session.commit()
|
||||
logger.info("变更产品状态 | product_id=%s | status=%s", product_id, status)
|
||||
return out
|
||||
|
||||
|
||||
def delete_product(
|
||||
session: Session,
|
||||
product_id: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""物理删除产品(仅限误录数据,常规下架用停用)。
|
||||
|
||||
被业务明细/发货明细引用(RESTRICT 外键)的产品禁删:先 count_refs
|
||||
给出可读 400(引导改走停用),校验与删除之间的并发引用由锁行 +
|
||||
IntegrityError 兜底(customer_service.delete_customer 同款结构)。
|
||||
|
||||
:raises NotFoundError: 产品不存在
|
||||
:raises BadRequestError: 产品已被业务或发货明细引用
|
||||
"""
|
||||
product = product_repository.get_by_id(session, product_id, for_update=True)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_PRODUCT,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"删除产品 {product.product_name if product else f'#{product_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if product is None:
|
||||
raise NotFoundError("产品不存在")
|
||||
if product_repository.count_refs(session, product_id):
|
||||
raise BadRequestError("产品已被业务或发货明细引用,无法删除(可改为停用)")
|
||||
|
||||
product_name = product.product_name # 固化:对象随删除失效
|
||||
try:
|
||||
product_repository.delete(session, product)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 先查后删的并发窗口:新明细挂上了该产品,FK RESTRICT 兜底为 400
|
||||
session.rollback()
|
||||
raise BadRequestError("产品已被业务或发货明细引用,无法删除(可改为停用)") from exc
|
||||
logger.info("删除产品 | product_name=%s", product_name)
|
||||
@@ -0,0 +1,280 @@
|
||||
"""客户评级等级配置业务编排。
|
||||
|
||||
评级计算器定位(对照表 #25):仅打分工具、不影响绩效金额,评分记录不落库
|
||||
——本表承载的等级映射是**判定表**,判定规则为按 sort_order 升序取首个
|
||||
min_score ≤ 总分的等级,max_score 仅展示。两条硬约束(违反会算错等级):
|
||||
|
||||
- 分值全程 ``Decimal``:入参出参 str、schema 拦格式,service 层负责字符串
|
||||
到 Decimal 的转换与落库;0≤min≤max≤100 的区间校验在**审计上下文内**
|
||||
完成,失败的 400 同样留痕(2026-10-13 定稿口径)
|
||||
- 区间互不重叠:重叠会让同一总分命中多个等级(或两段都跳过),判定表
|
||||
失效。判定为**闭区间两两相交**:任一其他等级满足
|
||||
``other.min_score <= 新 max 且 新 min <= other.max_score`` 即重叠。
|
||||
边界相邻不算重叠(前段 max=89、后段 min=90)—— 种子 A/B/C/D 即按
|
||||
相邻铺满 0-100,且判定本身是单边 min_score ≤ 总分,边界归 sort_order
|
||||
靠前的等级,相邻无歧义
|
||||
|
||||
删除允许清空:等级表无下游引用(评分记录不落库,判定只读本表现值、不
|
||||
回溯历史快照),物理删除无悬空风险;全部删空后计算器只显示总分、不出
|
||||
等级(前端已对应提示),故不强制保留任何一条。
|
||||
"""
|
||||
|
||||
import logging
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
ACTION_DELETE,
|
||||
ACTION_UPDATE,
|
||||
MODULE_RATING,
|
||||
)
|
||||
from app.core.db_errors import is_duplicate_entry
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.models import CustomerRatingGrade, User
|
||||
from app.repositories import rating_repository
|
||||
from app.schemas.rating import RatingGradeCreateIn, RatingGradeOut, RatingGradeUpdateIn
|
||||
from app.services import audit_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 分值域上下界(Decimal 常量,禁用 float 参与比较)
|
||||
_SCORE_FLOOR = Decimal("0")
|
||||
_SCORE_CEIL = Decimal("100")
|
||||
|
||||
|
||||
def _to_out(grade: CustomerRatingGrade) -> RatingGradeOut:
|
||||
"""ORM 对象转响应模型。分值 Decimal → str(分值红线出参口径)。"""
|
||||
return RatingGradeOut(
|
||||
id=grade.id,
|
||||
grade_name=grade.grade_name,
|
||||
min_score=str(grade.min_score),
|
||||
max_score=str(grade.max_score),
|
||||
sort_order=grade.sort_order,
|
||||
remark=grade.remark,
|
||||
create_time=grade.create_time,
|
||||
update_time=grade.update_time,
|
||||
)
|
||||
|
||||
|
||||
def _to_decimal(value: str) -> Decimal:
|
||||
"""数字字符串转 Decimal。
|
||||
|
||||
入参已 str 化再进 Decimal:即使上游口径变化传入数字类型,也不经 float
|
||||
二进制近似,分值红线在最后一道转换处仍然成立。schema 已保证可解析,
|
||||
此处不再重复校验。
|
||||
"""
|
||||
return Decimal(str(value))
|
||||
|
||||
|
||||
def _ensure_score_range(min_score: Decimal, max_score: Decimal) -> None:
|
||||
"""区间合法性:0 ≤ min_score ≤ max_score ≤ 100。
|
||||
|
||||
超界/倒挂任一不满足即「分值区间不合法」——统一一条消息不区分具体
|
||||
越界方式,前端据此整体提示。须在审计上下文内调用,失败也要留痕。
|
||||
"""
|
||||
if not (_SCORE_FLOOR <= min_score <= max_score <= _SCORE_CEIL):
|
||||
raise BadRequestError("分值区间不合法")
|
||||
|
||||
|
||||
def _ensure_no_overlap(
|
||||
grades: list[CustomerRatingGrade],
|
||||
new_min: Decimal,
|
||||
new_max: Decimal,
|
||||
*,
|
||||
exclude_id: int | None = None,
|
||||
) -> None:
|
||||
"""新区间与既有等级**不得重叠**(闭区间两两相交判定)。
|
||||
|
||||
任一其他等级满足 ``other.min_score <= new_max 且 new_min <= other.max_score``
|
||||
即重叠,400 并点名冲突等级,便于前端定位到具体行。边界相邻不算重叠
|
||||
(见模块 docstring)。exclude_id 供编辑时排除自身。
|
||||
|
||||
:raises BadRequestError: 分值区间与等级 X 重叠
|
||||
"""
|
||||
for other in grades:
|
||||
if exclude_id is not None and other.id == exclude_id:
|
||||
continue
|
||||
if other.min_score <= new_max and new_min <= other.max_score:
|
||||
raise BadRequestError(f"分值区间与等级 {other.grade_name} 重叠")
|
||||
|
||||
|
||||
def _is_duplicate_entry(exc: IntegrityError) -> bool:
|
||||
"""判断 IntegrityError 是否为 MySQL 1062(唯一键冲突)。
|
||||
|
||||
只有 1062 是「已存在」语义,可转业务提示;其余完整性错误语义未知,
|
||||
原样上抛 —— 由全局 IntegrityError handler 收敛为 400(通用文案),
|
||||
500 只留给程序缺陷。
|
||||
"""
|
||||
return is_duplicate_entry(exc)
|
||||
|
||||
|
||||
def _raise_if_duplicate(exc: IntegrityError) -> None:
|
||||
"""唯一键冲突统一转业务提示;其余完整性错误原样重抛。"""
|
||||
if _is_duplicate_entry(exc):
|
||||
raise BadRequestError("该等级名称已存在") from exc
|
||||
raise exc
|
||||
|
||||
|
||||
def list_grades(session: Session) -> list[RatingGradeOut]:
|
||||
"""全量等级列表,按判定顺序(sort_order 升序)直出。
|
||||
|
||||
不分页:等级映射是判定表,数量个位数,分页无意义。
|
||||
"""
|
||||
return [_to_out(grade) for grade in rating_repository.list_all(session)]
|
||||
|
||||
|
||||
def create_grade(
|
||||
session: Session,
|
||||
payload: RatingGradeCreateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> RatingGradeOut:
|
||||
"""新增评级等级。
|
||||
|
||||
区间须 0≤min≤max≤100 且与既有等级不重叠(新增同样判重叠:判定表
|
||||
语义下重叠即脏配置,没有「先停用旧区间」之类的两阶段配置手段)。
|
||||
|
||||
:raises BadRequestError: 分值区间不合法 / 分值区间与等级 X 重叠 / 该等级名称已存在
|
||||
"""
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_RATING,
|
||||
action=ACTION_CREATE,
|
||||
summary=f"新增评级等级 {payload.grade_name}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 值域校验在审计上下文内:分值非法的 400 也要留痕(成功与失败都记)
|
||||
new_min = _to_decimal(payload.min_score)
|
||||
new_max = _to_decimal(payload.max_score)
|
||||
_ensure_score_range(new_min, new_max)
|
||||
_ensure_no_overlap(rating_repository.list_all(session, for_update=True), new_min, new_max)
|
||||
if rating_repository.get_by_name(session, payload.grade_name) is not None:
|
||||
raise BadRequestError("该等级名称已存在")
|
||||
|
||||
grade = CustomerRatingGrade(
|
||||
grade_name=payload.grade_name,
|
||||
min_score=new_min,
|
||||
max_score=new_max,
|
||||
sort_order=payload.sort_order,
|
||||
remark=payload.remark,
|
||||
)
|
||||
try:
|
||||
rating_repository.create(session, grade)
|
||||
# 响应与后置动作全部在 commit 之前完成(见 product_service 同处说明)
|
||||
out = _to_out(grade)
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 先查后写不是原子操作:并发提交同名等级会撞 uk_customer_rating_grades_grade_name
|
||||
session.rollback()
|
||||
_raise_if_duplicate(exc)
|
||||
|
||||
logger.info("新增评级等级 | grade_id=%s | name=%s", grade.id, payload.grade_name)
|
||||
return out
|
||||
|
||||
|
||||
def update_grade(
|
||||
session: Session,
|
||||
grade_id: int,
|
||||
payload: RatingGradeUpdateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> RatingGradeOut:
|
||||
"""编辑评级等级(全量替换)。
|
||||
|
||||
区间与其他等级不得重叠 —— 重叠判定以**修改后的区间**对全部既有等级
|
||||
(排除自身)两两相交,命中即 400 并点名冲突等级。
|
||||
|
||||
:raises NotFoundError: 评级等级不存在
|
||||
:raises BadRequestError: 分值区间不合法 / 分值区间与等级 X 重叠 / 该等级名称已存在
|
||||
"""
|
||||
grade = rating_repository.get_by_id(session, grade_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_RATING,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改评级等级 {grade.grade_name if grade else f'#{grade_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 值域校验在审计上下文内(同 create 口径)
|
||||
new_min = _to_decimal(payload.min_score)
|
||||
new_max = _to_decimal(payload.max_score)
|
||||
_ensure_score_range(new_min, new_max)
|
||||
if grade is None:
|
||||
raise NotFoundError("评级等级不存在")
|
||||
|
||||
_ensure_no_overlap(
|
||||
rating_repository.list_all(session, for_update=True),
|
||||
new_min,
|
||||
new_max,
|
||||
exclude_id=grade_id,
|
||||
)
|
||||
existed = rating_repository.get_by_name(session, payload.grade_name)
|
||||
if existed is not None and existed.id != grade_id:
|
||||
raise BadRequestError("该等级名称已存在")
|
||||
|
||||
grade.grade_name = payload.grade_name
|
||||
grade.min_score = new_min
|
||||
grade.max_score = new_max
|
||||
grade.sort_order = payload.sort_order
|
||||
grade.remark = payload.remark
|
||||
out = _to_out(grade)
|
||||
try:
|
||||
session.commit()
|
||||
except IntegrityError as exc:
|
||||
# 改名可能撞 uk_customer_rating_grades_grade_name(本行改值与他人既有数据重合)
|
||||
session.rollback()
|
||||
_raise_if_duplicate(exc)
|
||||
|
||||
logger.info("修改评级等级 | grade_id=%s | name=%s", grade_id, payload.grade_name)
|
||||
return out
|
||||
|
||||
|
||||
def delete_grade(
|
||||
session: Session,
|
||||
grade_id: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""物理删除评级等级。
|
||||
|
||||
等级表无下游引用 —— 评级是纯计算器不落评分记录(对照表 #25),判定
|
||||
只读本表现值、不回溯历史快照,故可物理删除且无需锁行防并发引用。
|
||||
|
||||
**允许清空**:全部删空后计算器只显示总分、不出等级(前端已对应提示),
|
||||
不强制保留任何一条。
|
||||
|
||||
:raises NotFoundError: 评级等级不存在
|
||||
"""
|
||||
grade = rating_repository.get_by_id(session, grade_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_RATING,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"删除评级等级 {grade.grade_name if grade else f'#{grade_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if grade is None:
|
||||
raise NotFoundError("评级等级不存在")
|
||||
|
||||
grade_name = grade.grade_name # 固化:对象随删除失效
|
||||
rating_repository.delete(session, grade)
|
||||
session.commit()
|
||||
logger.info("删除评级等级 | grade_name=%s", grade_name)
|
||||
@@ -0,0 +1,349 @@
|
||||
"""回款管理业务编排(需求 2.2.3)。
|
||||
|
||||
事务边界在本层:repository 只 flush,commit/rollback 只写在这里。
|
||||
|
||||
- **写操作前 FOR UPDATE 锁业务行**(delete_business 先例):同业务的
|
||||
发货/回款/编辑相互串行化,防止并发写后 ``_recalc_totals`` 重算
|
||||
total_received_amount 互相覆盖(丢失更新);批次号生成(MAX+FOR
|
||||
UPDATE 锁当日序号区间)与唯一键(1062)冲突重试一次兜底,模式同
|
||||
business_service
|
||||
- **shipment_id 同业务强校验**(数据完整性红线):指定的发货单必须存在
|
||||
且与本回款同属一个业务 —— 跨业务指定会让回款天数与台账归属漂移;
|
||||
存在性与归属两类失败统一同一文案(防通过响应差异探测发货单存在性,
|
||||
与登录判定的防枚举同哲学),FK RESTRICT 是最终防线
|
||||
- **settlement_status 是 M3 核算防重锚点**(需规 2.3.3「每笔回款仅核算
|
||||
一次」):已核算回款禁改禁删 —— 改金额/删行会让 M3 台账与源数据漂移;
|
||||
M2 只写入 0(未核算),置 1 由 M3 核算服务负责
|
||||
- 回款合计回写统一收口 ``business_service._recalc_totals``(增删改后
|
||||
都重算,禁各处手写 SUM)
|
||||
- payment_days 为**只读派生值**:shipment_id 非空且发货单在库时按
|
||||
``formula.payment_days(ship_date, receipt_date)`` 实时计算(发货日首日
|
||||
计第 1 天),不落库;未指定批次为 None
|
||||
- 一期禁负数金额(≥0):schema 拒绝;红字/退款冲销需求出现时先补设计
|
||||
"""
|
||||
|
||||
import logging
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
ACTION_DELETE,
|
||||
ACTION_UPDATE,
|
||||
MODULE_RECEIPT,
|
||||
NO_PREFIX_RECEIPT,
|
||||
)
|
||||
from app.core.db_errors import is_duplicate_entry
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.core.response import PageResult
|
||||
from app.models import Receipt
|
||||
from app.models.business import BUSINESS_STATUS_ACTIVE
|
||||
from app.models.receipt import SETTLEMENT_DONE, SETTLEMENT_PENDING
|
||||
from app.repositories import business_repository, receipt_repository
|
||||
from app.schemas.receipt import (
|
||||
ReceiptCreateIn,
|
||||
ReceiptOut,
|
||||
ReceiptQuery,
|
||||
ReceiptUpdateIn,
|
||||
)
|
||||
from app.services import audit_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
from app.services.business_service import _recalc_totals
|
||||
from app.services.formula import payment_days
|
||||
from app.services.no_generator import next_no
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 编号唯一键冲突后的重试次数(模式同 business_service._NO_RETRY)
|
||||
_NO_RETRY = 1
|
||||
|
||||
|
||||
def _to_out(row: tuple) -> ReceiptOut:
|
||||
"""(receipt, business_no, shipment_no, ship_date) → 响应模型。
|
||||
|
||||
金额出参 str;payment_days 为派生值 —— ship_date 为 None(未指定批次)
|
||||
时输出 None;回款日早于发货日时按公式照实输出负值,忠实反映源数据
|
||||
(钳制会掩盖录入异常,M3 台账同口径)。
|
||||
"""
|
||||
receipt, business_no, shipment_no, ship_date = row
|
||||
return ReceiptOut(
|
||||
id=receipt.id,
|
||||
receipt_batch_no=receipt.receipt_batch_no,
|
||||
business_id=receipt.business_id,
|
||||
business_no=business_no,
|
||||
shipment_id=receipt.shipment_id,
|
||||
shipment_no=shipment_no,
|
||||
receipt_date=receipt.receipt_date,
|
||||
amount=str(receipt.amount),
|
||||
is_barter=receipt.is_barter,
|
||||
settlement_status=receipt.settlement_status,
|
||||
payment_days=(
|
||||
payment_days(ship_date, receipt.receipt_date) if ship_date is not None else None
|
||||
),
|
||||
remark=receipt.remark,
|
||||
)
|
||||
|
||||
|
||||
def _generate_no(session: Session) -> str:
|
||||
"""生成回款批次号(HK 前缀;MAX+FOR UPDATE 与 1062 兜底见 no_generator)。"""
|
||||
return next_no(session, model=Receipt, column_name="receipt_batch_no", prefix=NO_PREFIX_RECEIPT)
|
||||
|
||||
|
||||
def _ensure_shipment_of_business(
|
||||
session: Session, shipment_id: int | None, business_id: int
|
||||
) -> tuple[str | None, object | None]:
|
||||
"""发货批次同业务强校验,返回 (shipment_no, ship_date) 供 DTO 组装。
|
||||
|
||||
「必须存在且 business_id 相同」两类失败统一同一文案(防探测发货单
|
||||
存在性);shipment_id 为 None = 暂未指定,直接放行。
|
||||
|
||||
:raises BadRequestError: 发货批次不存在或不属于该业务
|
||||
"""
|
||||
if shipment_id is None:
|
||||
return None, None
|
||||
shipment = receipt_repository.get_shipment(session, shipment_id)
|
||||
if shipment is None or shipment.business_id != business_id:
|
||||
raise BadRequestError("发货批次不属于该业务,无法指定")
|
||||
return shipment.shipment_no, shipment.ship_date
|
||||
|
||||
|
||||
def _ensure_business_writable(session: Session, business_id: int, action: str):
|
||||
"""锁业务行并要求状态=1 执行中(新增/编辑/删除共用的写准入)。
|
||||
|
||||
锁在判定之前取:判定结果基于锁定后的行,配合 _recalc_totals 的重算
|
||||
同事务提交,并发写不会丢失更新。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
:raises BadRequestError: 业务已完成或已终止
|
||||
"""
|
||||
business = business_repository.get_by_id(session, business_id, for_update=True)
|
||||
if business is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
if business.status != BUSINESS_STATUS_ACTIVE:
|
||||
raise BadRequestError(f"业务已完成或已终止,禁止{action}回款")
|
||||
return business
|
||||
|
||||
|
||||
def list_receipts(session: Session, query: ReceiptQuery) -> PageResult[ReceiptOut]:
|
||||
"""分页查询回款(附业务号/发货单号与 payment_days 派生值)。"""
|
||||
rows = receipt_repository.list_receipts(
|
||||
session,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
business_id=query.business_id,
|
||||
date_from=query.date_from,
|
||||
date_to=query.date_to,
|
||||
is_barter=query.is_barter,
|
||||
settlement_status=query.settlement_status,
|
||||
)
|
||||
total = receipt_repository.count_receipts(
|
||||
session,
|
||||
business_id=query.business_id,
|
||||
date_from=query.date_from,
|
||||
date_to=query.date_to,
|
||||
is_barter=query.is_barter,
|
||||
settlement_status=query.settlement_status,
|
||||
)
|
||||
return PageResult[ReceiptOut](
|
||||
records=[_to_out(row) for row in rows],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_detail(session: Session, receipt_id: int) -> ReceiptOut:
|
||||
"""回款详情(同列表 DTO,含 payment_days 派生值)。
|
||||
|
||||
:raises NotFoundError: 回款不存在
|
||||
"""
|
||||
row = receipt_repository.get_with_refs(session, receipt_id)
|
||||
if row is None:
|
||||
raise NotFoundError("回款不存在")
|
||||
return _to_out(row)
|
||||
|
||||
|
||||
def create_receipt(
|
||||
session: Session,
|
||||
payload: ReceiptCreateIn,
|
||||
*,
|
||||
operator,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ReceiptOut:
|
||||
"""新增回款:锁业务行 → 校验 → 建行 + 重算合计,一个事务。
|
||||
|
||||
摘要三要素(批次号/业务号/金额)在进入审计前就绪:业务号取自锁行
|
||||
结果、批次号先行生成(SELECT MAX FOR UPDATE,不产生未提交变更)、
|
||||
金额来自入参;引用校验(业务状态/发货批次同业务)在审计上下文内,
|
||||
失败也留痕 —— 失败路径回滚释放已取序号,当日序号出现空洞无害
|
||||
(唯一性不依赖连续)。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
:raises BadRequestError: 业务已完成或已终止 / 发货批次不属于该业务
|
||||
"""
|
||||
business = business_repository.get_by_id(session, payload.business_id, for_update=True)
|
||||
batch_no = _generate_no(session)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_RECEIPT,
|
||||
action=ACTION_CREATE,
|
||||
summary=(
|
||||
f"新增回款 {batch_no}"
|
||||
f"(业务 {business.business_no if business else f'#{payload.business_id}'},"
|
||||
f"金额 {payload.amount})"
|
||||
),
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 批次号唯一键冲突的重试整体收在审计上下文内(模式同
|
||||
# business_service.create_business):rollback 释放旧锁,重试前重新
|
||||
# 锁业务行与生成批次号——成功/最终失败各只记一条审计,无递归
|
||||
for attempt in range(_NO_RETRY + 1):
|
||||
try:
|
||||
if business is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
if business.status != BUSINESS_STATUS_ACTIVE:
|
||||
raise BadRequestError("业务已完成或已终止,禁止新增回款")
|
||||
shipment_no, ship_date = _ensure_shipment_of_business(
|
||||
session, payload.shipment_id, payload.business_id
|
||||
)
|
||||
receipt = receipt_repository.create(
|
||||
session,
|
||||
Receipt(
|
||||
receipt_batch_no=batch_no,
|
||||
business_id=payload.business_id,
|
||||
shipment_id=payload.shipment_id,
|
||||
receipt_date=payload.receipt_date,
|
||||
amount=Decimal(payload.amount),
|
||||
is_barter=payload.is_barter,
|
||||
settlement_status=SETTLEMENT_PENDING,
|
||||
remark=payload.remark,
|
||||
),
|
||||
)
|
||||
_recalc_totals(session, business)
|
||||
out = _to_out((receipt, business.business_no, shipment_no, ship_date))
|
||||
new_id, new_no = receipt.id, batch_no # 固化:commit 后不碰 ORM
|
||||
session.commit()
|
||||
break
|
||||
except IntegrityError as exc:
|
||||
session.rollback()
|
||||
if _is_duplicate_entry(exc) and attempt < _NO_RETRY:
|
||||
business = business_repository.get_by_id(
|
||||
session, payload.business_id, for_update=True
|
||||
)
|
||||
batch_no = _generate_no(session)
|
||||
continue
|
||||
raise
|
||||
|
||||
logger.info(
|
||||
"新增回款 | receipt_id=%s | no=%s | business_id=%s",
|
||||
new_id,
|
||||
new_no,
|
||||
payload.business_id,
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def update_receipt(
|
||||
session: Session,
|
||||
receipt_id: int,
|
||||
payload: ReceiptUpdateIn,
|
||||
*,
|
||||
operator,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ReceiptOut:
|
||||
"""编辑回款(全量替换)+ 重算合计,一个事务。
|
||||
|
||||
**已核算回款禁止修改**(M3 防重锚点):M3 台账已按该行固化核算,
|
||||
改金额/到账日/批次指定会让台账与源数据漂移。shipment_id 变更后
|
||||
重新做同业务强校验(全量替换语义下每次编辑都校验,无「未变即免检」
|
||||
的旁路)。
|
||||
|
||||
:raises NotFoundError: 回款不存在 / 业务不存在
|
||||
:raises BadRequestError: 已核算禁改 / 业务已完成或已终止 / 发货批次不属于该业务
|
||||
"""
|
||||
receipt = receipt_repository.get_by_id(session, receipt_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_RECEIPT,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改回款 {receipt.receipt_batch_no if receipt else f'#{receipt_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if receipt is None:
|
||||
raise NotFoundError("回款不存在")
|
||||
if receipt.settlement_status == SETTLEMENT_DONE:
|
||||
raise BadRequestError("已核算回款禁止修改")
|
||||
business = _ensure_business_writable(session, receipt.business_id, "修改")
|
||||
# 校验返回的 (shipment_no, ship_date) 即新批次 DTO 所需 —— shipment_id
|
||||
# 已被赋为 payload 新值,与重查 get_with_refs 同源,省一次三表 join
|
||||
shipment_no, ship_date = _ensure_shipment_of_business(
|
||||
session, payload.shipment_id, receipt.business_id
|
||||
)
|
||||
|
||||
receipt.receipt_date = payload.receipt_date
|
||||
receipt.shipment_id = payload.shipment_id
|
||||
receipt.amount = Decimal(payload.amount)
|
||||
receipt.is_barter = payload.is_barter
|
||||
receipt.remark = payload.remark
|
||||
_recalc_totals(session, business)
|
||||
out = _to_out((receipt, business.business_no, shipment_no, ship_date))
|
||||
batch_no = receipt.receipt_batch_no
|
||||
session.commit()
|
||||
# commit 后不再触碰 ORM 属性(audit_service 约定):批次号已固化
|
||||
logger.info("修改回款 | receipt_id=%s | no=%s", receipt_id, batch_no)
|
||||
return out
|
||||
|
||||
|
||||
def delete_receipt(
|
||||
session: Session,
|
||||
receipt_id: int,
|
||||
*,
|
||||
operator,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""删除回款(物理删除)+ 重算合计,一个事务。
|
||||
|
||||
**已核算回款禁止删除**(M3 防重锚点,理由同编辑);业务须状态=1
|
||||
执行中 —— 终态业务的回款是 M3 核算与报表的既成事实,不得删改。
|
||||
|
||||
:raises NotFoundError: 回款不存在 / 业务不存在
|
||||
:raises BadRequestError: 已核算禁删 / 业务已完成或已终止
|
||||
"""
|
||||
receipt = receipt_repository.get_by_id(session, receipt_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_RECEIPT,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"删除回款 {receipt.receipt_batch_no if receipt else f'#{receipt_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if receipt is None:
|
||||
raise NotFoundError("回款不存在")
|
||||
if receipt.settlement_status == SETTLEMENT_DONE:
|
||||
raise BadRequestError("已核算回款禁止删除")
|
||||
business = _ensure_business_writable(session, receipt.business_id, "删除")
|
||||
|
||||
batch_no = receipt.receipt_batch_no
|
||||
receipt_repository.delete(session, receipt)
|
||||
_recalc_totals(session, business)
|
||||
session.commit()
|
||||
# commit 后不再触碰 ORM 属性(audit_service 约定):批次号已固化
|
||||
logger.info("删除回款 | receipt_id=%s | no=%s", receipt_id, batch_no)
|
||||
|
||||
|
||||
def _is_duplicate_entry(exc: IntegrityError) -> bool:
|
||||
"""识别 MySQL 唯一键冲突(1062),与 business_service 同口径。"""
|
||||
return is_duplicate_entry(exc)
|
||||
@@ -1,17 +1,20 @@
|
||||
"""角色管理业务编排。
|
||||
|
||||
需求 2.5.1 只定义 admin / user 两个角色,本模块属用户确认的**自主完善**
|
||||
(轻量版:不含权限点分配 —— `permissions` / `role_permissions` 表继续闲置,
|
||||
待业务方给出权限清单后再启用)。
|
||||
需求 2.5.1 定义 admin / user 两个登录角色;2026-10-15 复核审批补充需求
|
||||
新增营销后勤/财务/领导三个职能登录角色(营销后勤与财务/领导分区于审批
|
||||
节点准入)。本模块仍为轻量版(不含权限点分配 —— `permissions` /
|
||||
`role_permissions` 表继续闲置,待业务方给出权限清单后再启用)。
|
||||
|
||||
保护规则(都是系统自举与授权安全的最低防线,不只是界面体验):
|
||||
|
||||
- `admin` 角色**禁删禁停** —— `cli` 建管理员与 `require_admin` 判定都依赖
|
||||
该编码存在,删除会使系统无法自举
|
||||
- **内置角色禁删禁停**(`BUILTIN_ROLE_CODES`:admin / marketing_ops /
|
||||
finance / leader)—— `admin` 被删除会使系统无法自举(cli 建管理员与
|
||||
`require_admin` 判定依赖);财务/领导是审批节点准入锚点,被删会让
|
||||
在途审批流失去可操作人
|
||||
- **有用户绑定的角色禁删** —— `user_roles` 外键是 CASCADE,直接删除会静默
|
||||
剥离绑定用户的权限,属安全与审计事故;删除前的校验走 `FOR UPDATE`
|
||||
锁行,堵住「校验与删除之间并发绑定」的窗口
|
||||
- `role_code` 创建后不可改 —— 它是授权判定(`ROLE_ADMIN` 常量按编码比对)的锚点
|
||||
- `role_code` 创建后不可改 —— 它是授权判定(`BUILTIN_ROLE_CODES` 白名单按编码比对)的锚点
|
||||
- 停用角色**不解除绑定、不影响既有授权**(授权判定只看编码、不看状态),
|
||||
但**不可再分配给用户**(`user_service._resolve_roles` 拦截)
|
||||
"""
|
||||
@@ -27,8 +30,8 @@ from app.core.constants import (
|
||||
ACTION_DISABLE,
|
||||
ACTION_ENABLE,
|
||||
ACTION_UPDATE,
|
||||
BUILTIN_ROLE_CODES,
|
||||
MODULE_ROLE,
|
||||
ROLE_ADMIN,
|
||||
)
|
||||
from app.core.exceptions import BadRequestError, ForbiddenError, NotFoundError
|
||||
from app.core.response import PageResult
|
||||
@@ -177,10 +180,10 @@ def set_status(
|
||||
|
||||
停用不解除用户绑定、不影响既有授权(授权判定只看编码不看状态),
|
||||
但该角色不可再分配给用户(`user_service._resolve_roles` 拦截);
|
||||
内置管理员角色不可停用。
|
||||
内置角色不可停用。
|
||||
|
||||
:raises NotFoundError: 角色不存在
|
||||
:raises ForbiddenError: 试图停用内置管理员角色
|
||||
:raises ForbiddenError: 试图停用内置角色
|
||||
"""
|
||||
role = role_repository.get_by_id(session, role_id)
|
||||
verb = "启用" if status == 1 else "禁用"
|
||||
@@ -198,8 +201,8 @@ def set_status(
|
||||
if role is None:
|
||||
raise NotFoundError("角色不存在")
|
||||
|
||||
if role.role_code == ROLE_ADMIN and status == 0:
|
||||
raise ForbiddenError("内置管理员角色不可停用")
|
||||
if role.role_code in BUILTIN_ROLE_CODES and status == 0:
|
||||
raise ForbiddenError("内置角色不可停用")
|
||||
|
||||
role.status = status
|
||||
out = _to_out(role, _user_count(session, role_id))
|
||||
@@ -217,12 +220,12 @@ def delete_role(
|
||||
) -> None:
|
||||
"""删除角色。
|
||||
|
||||
内置管理员角色不可删除;仍有关联用户的角色不可删除(提示先解除绑定)。
|
||||
内置角色不可删除(admin 与三个审批职能角色,见 BUILTIN_ROLE_CODES);仍有关联用户的角色不可删除(提示先解除绑定)。
|
||||
查询走 `FOR UPDATE` 锁行:校验与删除之间若发生并发绑定,CASCADE 会把
|
||||
新绑定一并静默剥离 —— 锁行使并发绑定失败(可见)而非数据被吞(不可见)。
|
||||
|
||||
:raises NotFoundError: 角色不存在
|
||||
:raises ForbiddenError: 试图删除内置管理员角色
|
||||
:raises ForbiddenError: 试图删除内置角色
|
||||
:raises BadRequestError: 角色下仍有绑定的用户
|
||||
"""
|
||||
role = role_repository.get_by_id(session, role_id, for_update=True)
|
||||
@@ -239,8 +242,8 @@ def delete_role(
|
||||
if role is None:
|
||||
raise NotFoundError("角色不存在")
|
||||
|
||||
if role.role_code == ROLE_ADMIN:
|
||||
raise ForbiddenError("内置管理员角色不可删除")
|
||||
if role.role_code in BUILTIN_ROLE_CODES:
|
||||
raise ForbiddenError("内置角色不可删除")
|
||||
|
||||
# user_roles 外键是 CASCADE:不拦截的话,删除会静默剥离绑定用户的权限
|
||||
user_count = _user_count(session, role_id)
|
||||
|
||||
@@ -0,0 +1,368 @@
|
||||
"""发货管理业务编排(需求 2.2.2)。
|
||||
|
||||
事务边界在本层:repository 只 flush,commit/rollback 只写在这里。
|
||||
|
||||
- 行金额(amount)与发货单总金额(total_amount)服务层按 数量×单价 计算
|
||||
固化,不信任前端传值;单价可空时行金额记 0(对齐业务明细口径)
|
||||
- 业务级汇总(发货/运费合计)回写统一收口 ``business_service._recalc_totals``,
|
||||
本模块不另写聚合逻辑;发货单 total_amount 由 repository 行 SUM 重算
|
||||
- **写操作前 FOR UPDATE 锁业务行**(receipt_service 同款写准入):发货与
|
||||
回款并发写同一业务时相互串行化,防 ``_recalc_totals`` 重算互相覆盖
|
||||
(丢失更新);锁序统一「业务行 → 单据编号区间」,与业务/回款同构
|
||||
- 业务状态门槛:仅执行中(1)业务可写发货单 —— 终态业务的发货单禁改禁删
|
||||
(一期保守口径:编辑不影响已核算回款、核算未发生,但会改业务级汇总
|
||||
基线,设计未定项待业务确认后可放开终态编辑)
|
||||
- 删除保护:被回款批次指定(receipts.shipment_id)的发货单禁删,先解除
|
||||
回款的批次指定;删除连带明细行并重算业务级汇总
|
||||
- 编号 SH 生成复用 no_generator.next_no;残余竞态以唯一键(1062)冲突
|
||||
重试一次兜底,模式同 business_service.create_business
|
||||
- 审计:锁行与编号生成放在进入审计前(不产生未提交变更),状态校验在
|
||||
审计上下文内,失败也留痕 —— 失败回滚释放已取序号,当日序号空洞无害
|
||||
(唯一性不依赖连续);ship_date 是回款天数基准日,编辑即时生效(M3 按
|
||||
编辑后基准日实时派生,无固化快照可漂移)
|
||||
"""
|
||||
|
||||
import logging
|
||||
from decimal import ROUND_HALF_UP, Decimal
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
ACTION_DELETE,
|
||||
ACTION_UPDATE,
|
||||
MODULE_SHIPMENT,
|
||||
NO_PREFIX_SHIPMENT,
|
||||
)
|
||||
from app.core.db_errors import is_duplicate_entry
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.core.response import PageResult
|
||||
from app.models import Business, Shipment, ShipmentItem, User
|
||||
from app.models.business import BUSINESS_STATUS_ACTIVE
|
||||
from app.repositories import business_repository, shipment_repository
|
||||
from app.schemas.shipment import (
|
||||
ShipmentCreateIn,
|
||||
ShipmentDetailOut,
|
||||
ShipmentItemIn,
|
||||
ShipmentItemOut,
|
||||
ShipmentOut,
|
||||
ShipmentQuery,
|
||||
ShipmentUpdateIn,
|
||||
)
|
||||
from app.services import audit_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
from app.services.business_service import _recalc_totals
|
||||
from app.services.no_generator import next_no
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 编号唯一键冲突后的重试次数(模式同 business_service._NO_RETRY)
|
||||
_NO_RETRY = 1
|
||||
|
||||
|
||||
def _to_out(row: tuple[Shipment, str]) -> ShipmentOut:
|
||||
"""(shipment, business_no) → 响应模型;金额出参 str。"""
|
||||
shipment, business_no = row
|
||||
return ShipmentOut(
|
||||
id=shipment.id,
|
||||
shipment_no=shipment.shipment_no,
|
||||
business_id=shipment.business_id,
|
||||
business_no=business_no,
|
||||
ship_date=shipment.ship_date,
|
||||
freight_amount=str(shipment.freight_amount),
|
||||
total_amount=str(shipment.total_amount),
|
||||
remark=shipment.remark,
|
||||
)
|
||||
|
||||
|
||||
def _item_to_out(item: ShipmentItem) -> ShipmentItemOut:
|
||||
return ShipmentItemOut(
|
||||
id=item.id,
|
||||
product_id=item.product_id,
|
||||
product_name=item.product_name,
|
||||
spec_model=item.spec_model,
|
||||
unit=item.unit,
|
||||
quantity=str(item.quantity),
|
||||
sale_price=str(item.sale_price) if item.sale_price is not None else None,
|
||||
amount=str(item.amount),
|
||||
)
|
||||
|
||||
|
||||
def _amount_or_zero(value: str | None) -> Decimal:
|
||||
"""可空金额入参转 Decimal,空记 0(运费可缺省的统一归一)。"""
|
||||
return Decimal(value) if value is not None else Decimal("0")
|
||||
|
||||
|
||||
def _build_item_rows(items: list[ShipmentItemIn]) -> list[ShipmentItem]:
|
||||
"""入参明细行转 ORM 行:amount 服务层按 数量×单价 计算固化。
|
||||
|
||||
不信任前端传值(schema 亦无 amount 入参)——单价可空时行金额记 0,
|
||||
由用户在编辑中补价后重算;shipment_id 由 replace_items 统一回填。
|
||||
乘积显式 quantize 两位固化(模式同 business_service._build_item_rows):
|
||||
数量(2位)×单价(4位) 可产 6 位小数,直写 DECIMAL(14,2) 会被 MySQL
|
||||
静默舍入且回显漂移。
|
||||
"""
|
||||
rows: list[ShipmentItem] = []
|
||||
for item in items:
|
||||
quantity = Decimal(item.quantity)
|
||||
sale_price = Decimal(item.sale_price) if item.sale_price is not None else None
|
||||
amount = (
|
||||
(quantity * sale_price).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
|
||||
if sale_price is not None
|
||||
else Decimal("0.00")
|
||||
)
|
||||
rows.append(
|
||||
ShipmentItem(
|
||||
product_id=item.product_id,
|
||||
product_name=item.product_name,
|
||||
spec_model=item.spec_model or "",
|
||||
unit=item.unit,
|
||||
quantity=quantity,
|
||||
sale_price=sale_price,
|
||||
amount=amount,
|
||||
)
|
||||
)
|
||||
return rows
|
||||
|
||||
|
||||
def _generate_no(session: Session) -> str:
|
||||
"""生成发货单号(SH 前缀;MAX+FOR UPDATE 与 1062 兜底见 no_generator)。"""
|
||||
return next_no(session, model=Shipment, column_name="shipment_no", prefix=NO_PREFIX_SHIPMENT)
|
||||
|
||||
|
||||
def _ensure_business_writable(session: Session, business_id: int, action: str) -> Business:
|
||||
"""锁业务行并要求状态=1 执行中(新增/编辑/删除共用的写准入)。
|
||||
|
||||
锁在判定之前取:判定结果基于锁定后的行,配合 _recalc_totals 的重算
|
||||
同事务提交,并发写不会丢失更新。与 receipt_service._ensure_business_writable
|
||||
同构 —— 文案单据名落到发货单(私有函数各自保留,不为一个字符串上提
|
||||
公共层)。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
:raises BadRequestError: 业务已完成或已终止
|
||||
"""
|
||||
business = business_repository.get_by_id(session, business_id, for_update=True)
|
||||
if business is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
if business.status != BUSINESS_STATUS_ACTIVE:
|
||||
raise BadRequestError(f"业务已完成或已终止,禁止{action}")
|
||||
return business
|
||||
|
||||
|
||||
def _is_duplicate_entry(exc: IntegrityError) -> bool:
|
||||
"""识别 MySQL 唯一键冲突(1062),与 business/receipt_service 同口径。"""
|
||||
return is_duplicate_entry(exc)
|
||||
|
||||
|
||||
def list_shipments(session: Session, query: ShipmentQuery) -> PageResult[ShipmentOut]:
|
||||
"""分页查询发货单(附业务号;business_id 可空=全量,一期按业务维度查看为主)。"""
|
||||
rows = shipment_repository.list_shipments(
|
||||
session,
|
||||
offset=query.offset,
|
||||
limit=query.page_size,
|
||||
business_id=query.business_id,
|
||||
ship_date_from=query.ship_date_from,
|
||||
ship_date_to=query.ship_date_to,
|
||||
)
|
||||
total = shipment_repository.count_shipments(
|
||||
session,
|
||||
business_id=query.business_id,
|
||||
ship_date_from=query.ship_date_from,
|
||||
ship_date_to=query.ship_date_to,
|
||||
)
|
||||
return PageResult[ShipmentOut](
|
||||
records=[_to_out(row) for row in rows],
|
||||
total=total,
|
||||
page_num=query.page_num,
|
||||
page_size=query.page_size,
|
||||
)
|
||||
|
||||
|
||||
def get_detail(session: Session, shipment_id: int) -> ShipmentDetailOut:
|
||||
"""发货单详情(附明细行,供编辑抽屉回显)。
|
||||
|
||||
:raises NotFoundError: 发货单不存在
|
||||
"""
|
||||
row = shipment_repository.get_with_business_no(session, shipment_id)
|
||||
if row is None:
|
||||
raise NotFoundError("发货单不存在")
|
||||
out = ShipmentDetailOut(**_to_out(row).model_dump())
|
||||
out.items = [
|
||||
_item_to_out(item) for item in shipment_repository.list_items(session, shipment_id)
|
||||
]
|
||||
return out
|
||||
|
||||
|
||||
def create_shipment(
|
||||
session: Session,
|
||||
payload: ShipmentCreateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ShipmentOut:
|
||||
"""新增发货单:锁业务行 → 校验 → 建单 + 明细 + 双重汇总回写,一个事务。
|
||||
|
||||
摘要两号(发货单号/业务号)在进入审计前就绪:业务号取自锁行结果、
|
||||
发货单号先行生成(SELECT MAX FOR UPDATE,不产生未提交变更);状态
|
||||
校验在审计上下文内,失败也留痕 —— 失败路径回滚释放已取序号,当日
|
||||
序号出现空洞无害(唯一性不依赖连续)。
|
||||
|
||||
:raises NotFoundError: 业务不存在
|
||||
:raises BadRequestError: 业务已完成或已终止,禁止新发货
|
||||
"""
|
||||
business = business_repository.get_by_id(session, payload.business_id, for_update=True)
|
||||
shipment_no = _generate_no(session)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_SHIPMENT,
|
||||
action=ACTION_CREATE,
|
||||
summary=(
|
||||
f"新增发货单 {shipment_no}"
|
||||
f"(业务 {business.business_no if business else f'#{payload.business_id}'},"
|
||||
f"明细 {len(payload.items)} 行)"
|
||||
),
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
# 单号唯一键冲突的重试整体收在审计上下文内(模式同
|
||||
# business_service.create_business):rollback 释放旧锁,重试前重新
|
||||
# 锁业务行与生成编号——成功/最终失败各只记一条审计,无递归
|
||||
for attempt in range(_NO_RETRY + 1):
|
||||
try:
|
||||
if business is None:
|
||||
raise NotFoundError("业务不存在")
|
||||
if business.status != BUSINESS_STATUS_ACTIVE:
|
||||
raise BadRequestError("业务已完成或已终止,禁止新发货")
|
||||
|
||||
shipment = Shipment(
|
||||
shipment_no=shipment_no,
|
||||
business_id=payload.business_id,
|
||||
ship_date=payload.ship_date,
|
||||
freight_amount=_amount_or_zero(payload.freight_amount),
|
||||
total_amount=Decimal("0"),
|
||||
remark=payload.remark,
|
||||
)
|
||||
shipment_repository.create(session, shipment)
|
||||
shipment_repository.replace_items(
|
||||
session, shipment.id, _build_item_rows(payload.items)
|
||||
)
|
||||
total = shipment_repository.sum_item_amount(session, shipment.id)
|
||||
shipment.total_amount = total if total is not None else Decimal("0")
|
||||
_recalc_totals(session, business)
|
||||
out = _to_out((shipment, business.business_no))
|
||||
new_id, new_no = shipment.id, shipment_no # 固化:commit 后不碰 ORM
|
||||
session.commit()
|
||||
break
|
||||
except IntegrityError as exc:
|
||||
session.rollback()
|
||||
if _is_duplicate_entry(exc) and attempt < _NO_RETRY:
|
||||
business = business_repository.get_by_id(
|
||||
session, payload.business_id, for_update=True
|
||||
)
|
||||
shipment_no = _generate_no(session)
|
||||
continue
|
||||
raise
|
||||
|
||||
logger.info(
|
||||
"新增发货单 | shipment_id=%s | no=%s | business_id=%s",
|
||||
new_id,
|
||||
new_no,
|
||||
payload.business_id,
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def update_shipment(
|
||||
session: Session,
|
||||
shipment_id: int,
|
||||
payload: ShipmentUpdateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> ShipmentOut:
|
||||
"""编辑发货单(明细全量替换)+ 双重汇总回写,一个事务。
|
||||
|
||||
business_id 不在编辑入参内 —— 发货单挂靠的业务创建时定死,改挂会让
|
||||
已指定本发货单的回款语义断裂。终态业务的发货单禁改(与回款写准入同
|
||||
口径;一期保守处理,设计未定项待业务确认后可放开——发货编辑不影响
|
||||
已核算回款,核算未发生,无固化快照可漂移)。
|
||||
|
||||
:raises NotFoundError: 发货单不存在 / 业务不存在
|
||||
:raises BadRequestError: 业务已完成或已终止
|
||||
"""
|
||||
shipment = shipment_repository.get_by_id(session, shipment_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_SHIPMENT,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改发货单 {shipment.shipment_no if shipment else f'#{shipment_id}'}",
|
||||
request_data=payload.model_dump(exclude_none=True),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if shipment is None:
|
||||
raise NotFoundError("发货单不存在")
|
||||
business = _ensure_business_writable(session, shipment.business_id, "编辑发货单")
|
||||
|
||||
shipment.ship_date = payload.ship_date
|
||||
shipment.freight_amount = _amount_or_zero(payload.freight_amount)
|
||||
shipment.remark = payload.remark
|
||||
shipment_repository.replace_items(session, shipment_id, _build_item_rows(payload.items))
|
||||
total = shipment_repository.sum_item_amount(session, shipment_id)
|
||||
shipment.total_amount = total if total is not None else Decimal("0")
|
||||
_recalc_totals(session, business)
|
||||
# business_id 创建时定死不可改挂,锁定的 business.business_no 与重查同源
|
||||
out = _to_out((shipment, business.business_no))
|
||||
shipment_no = shipment.shipment_no
|
||||
session.commit()
|
||||
# commit 后不再触碰 ORM 属性(audit_service 约定):单号已固化
|
||||
logger.info("修改发货单 | shipment_id=%s | no=%s", shipment_id, shipment_no)
|
||||
return out
|
||||
|
||||
|
||||
def delete_shipment(
|
||||
session: Session,
|
||||
shipment_id: int,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> None:
|
||||
"""删除发货单(物理删除,连带明细行)+ 业务级汇总回写,一个事务。
|
||||
|
||||
被回款批次指定(receipts.shipment_id 引用)→ 400 引导先解除回款的
|
||||
批次指定;业务须状态=1 执行中(终态业务的发货单禁删,与回款写准入
|
||||
同口径)—— 发货单的运费/金额是业务级汇总与 M3 核算的源数据,终态后
|
||||
不得变动。
|
||||
|
||||
:raises NotFoundError: 发货单不存在 / 业务不存在
|
||||
:raises BadRequestError: 业务已完成或已终止 / 已被回款批次指定
|
||||
"""
|
||||
shipment = shipment_repository.get_by_id(session, shipment_id)
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_SHIPMENT,
|
||||
action=ACTION_DELETE,
|
||||
summary=f"删除发货单 {shipment.shipment_no if shipment else f'#{shipment_id}'}",
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
if shipment is None:
|
||||
raise NotFoundError("发货单不存在")
|
||||
business = _ensure_business_writable(session, shipment.business_id, "删除发货单")
|
||||
if shipment_repository.count_receipt_refs(session, shipment_id):
|
||||
raise BadRequestError("已被回款批次指定,请先解除回款的批次指定")
|
||||
|
||||
shipment_no = shipment.shipment_no
|
||||
shipment_repository.delete_with_items(session, shipment_id)
|
||||
_recalc_totals(session, business)
|
||||
session.commit()
|
||||
# commit 后不再触碰 ORM 属性(audit_service 约定):单号已固化
|
||||
logger.info("删除发货单 | shipment_id=%s | no=%s", shipment_id, shipment_no)
|
||||
@@ -0,0 +1,165 @@
|
||||
"""系统设置(公司信息)业务编排。
|
||||
|
||||
单例行语义:整个系统恒一行(id=1,迁移种子保底)。logo 只存**相对路径**
|
||||
(uploads/logo/ 下固定名覆盖),文件不入库的理由:图片进数据库会让每次
|
||||
读取与备份放大传输,且无法独立替换;DB 只持有一行指针。
|
||||
|
||||
logo 安全:后缀白名单 + magic bytes 双重校验(上传内容不可信,仅看文件名
|
||||
后缀可被伪造);固定文件名落盘,**不使用上传方文件名**——杜绝路径拼接与
|
||||
覆盖任意文件。
|
||||
"""
|
||||
|
||||
import logging
|
||||
from pathlib import Path
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.config import get_settings
|
||||
from app.core.constants import ACTION_UPDATE, MODULE_SYSTEM_SETTINGS
|
||||
from app.core.exceptions import BadRequestError, NotFoundError
|
||||
from app.models import SystemSetting, User
|
||||
from app.schemas.setting import SettingOut, SettingPublicOut, SettingUpdateIn
|
||||
from app.services import audit_service
|
||||
from app.services.audit_service import AuditRecord, RequestMeta
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# magic bytes:PNG 固定 8 字节签名;JPEG 以 SOI + APP0/JFIF 起始
|
||||
_MAGIC = {
|
||||
"png": b"\x89PNG\r\n\x1a\n",
|
||||
"jpg": b"\xff\xd8\xff",
|
||||
}
|
||||
LOGO_MAX_BYTES = 2 * 1024 * 1024 # 2MB:页眉/登录页展示尺寸上限,防上传滥用
|
||||
|
||||
SETTINGS_ID = 1 # 全系统单行主键
|
||||
|
||||
|
||||
def get_setting(session: Session) -> SystemSetting:
|
||||
"""取公司信息单行(种子保底 id=1;防御式兜底:极端环境下缺行则补建)。"""
|
||||
setting = session.get(SystemSetting, SETTINGS_ID)
|
||||
if setting is None:
|
||||
setting = SystemSetting(id=SETTINGS_ID, company_name="衍水集团")
|
||||
session.add(setting)
|
||||
session.flush()
|
||||
return setting
|
||||
|
||||
|
||||
def to_out(setting: SystemSetting) -> SettingOut:
|
||||
"""管理端出参(logo_url 带更新时间版本参数,替换图片后浏览器不再用旧缓存)。"""
|
||||
return SettingOut(
|
||||
company_name=setting.company_name,
|
||||
logo_url=_logo_url(setting),
|
||||
)
|
||||
|
||||
|
||||
def to_public_out(setting: SystemSetting) -> SettingPublicOut:
|
||||
"""匿名端点出参(白名单字段,独立 schema 见模块说明)。"""
|
||||
return SettingPublicOut(
|
||||
company_name=setting.company_name,
|
||||
logo_url=_logo_url(setting),
|
||||
)
|
||||
|
||||
|
||||
def _logo_url(setting: SystemSetting) -> str | None:
|
||||
if not setting.logo_path:
|
||||
return None
|
||||
version = int(setting.update_time.timestamp()) if setting.update_time else 0
|
||||
return f"/api/v1/system/settings/logo/public?v={version}"
|
||||
|
||||
|
||||
def update_company(
|
||||
session: Session,
|
||||
payload: SettingUpdateIn,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> SettingOut:
|
||||
"""更新公司名称(审计留痕)。"""
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_SYSTEM_SETTINGS,
|
||||
action=ACTION_UPDATE,
|
||||
summary=f"修改公司名称为「{payload.company_name}」",
|
||||
request_data=payload.model_dump(),
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
setting = get_setting(session)
|
||||
setting.company_name = payload.company_name.strip()
|
||||
session.commit()
|
||||
return to_out(setting)
|
||||
|
||||
|
||||
def save_logo(
|
||||
session: Session,
|
||||
content: bytes,
|
||||
ext: str,
|
||||
*,
|
||||
operator: User,
|
||||
meta: RequestMeta | None = None,
|
||||
) -> SettingOut:
|
||||
"""上传 logo:校验 → 固定名覆盖落盘 → 更新相对路径(审计留痕)。
|
||||
|
||||
旧扩展名文件一并清理(logo.png 换 jpg 后残留文件会继续占盘)。
|
||||
"""
|
||||
ext = ext.lower()
|
||||
if ext not in _MAGIC:
|
||||
raise BadRequestError("logo 仅支持 png/jpg 格式")
|
||||
if len(content) > LOGO_MAX_BYTES:
|
||||
raise BadRequestError("logo 文件不能超过 2MB")
|
||||
if not content.startswith(_MAGIC[ext]):
|
||||
raise BadRequestError("文件内容与扩展名不符(仅接受真实图片)")
|
||||
|
||||
with audit_service.audit(
|
||||
session,
|
||||
operator=operator,
|
||||
record=AuditRecord(
|
||||
module=MODULE_SYSTEM_SETTINGS,
|
||||
action=ACTION_UPDATE,
|
||||
summary="更新公司 logo",
|
||||
request_data={"ext": ext, "size": len(content)},
|
||||
),
|
||||
meta=meta,
|
||||
):
|
||||
setting = get_setting(session)
|
||||
old_path = setting.logo_path
|
||||
|
||||
# 旧扩展名清理必须在写新文件**之前**:同扩展名覆盖时先写后删会把
|
||||
# 刚落盘的新文件一并删掉(回读 404)
|
||||
old_ext = Path(old_path).suffix.lstrip(".") if old_path else None
|
||||
if old_ext and old_ext != ext:
|
||||
_cleanup_old_logo(old_ext)
|
||||
|
||||
target = _logo_dir() / f"logo.{ext}"
|
||||
target.write_bytes(content)
|
||||
|
||||
setting.logo_path = f"logo/logo.{ext}"
|
||||
session.commit()
|
||||
logger.info("更新公司 logo | size=%s ext=%s", len(content), ext)
|
||||
return to_out(setting)
|
||||
|
||||
|
||||
def read_logo(session: Session) -> tuple[Path, str]:
|
||||
"""按库中记录定位 logo 文件,返回 (路径, 扩展名)。未上传抛 404。"""
|
||||
setting = get_setting(session)
|
||||
if not setting.logo_path:
|
||||
raise NotFoundError("尚未上传 logo")
|
||||
path = get_settings().upload_dir / setting.logo_path
|
||||
if not path.is_file():
|
||||
raise NotFoundError("logo 文件不存在,请重新上传")
|
||||
return path, path.suffix.lstrip(".")
|
||||
|
||||
|
||||
def _logo_dir() -> Path:
|
||||
directory = get_settings().upload_dir / "logo"
|
||||
directory.mkdir(parents=True, exist_ok=True)
|
||||
return directory
|
||||
|
||||
|
||||
def _cleanup_old_logo(old_ext: str) -> None:
|
||||
if old_ext in _MAGIC:
|
||||
old_file = _logo_dir() / f"logo.{old_ext}"
|
||||
if old_file.exists():
|
||||
old_file.unlink(missing_ok=True)
|
||||
@@ -34,6 +34,8 @@ dependencies = [
|
||||
# 图形验证码(纯 Python,依赖 Pillow)
|
||||
"captcha>=0.6",
|
||||
"pillow>=11.0",
|
||||
"openpyxl>=3.1.5",
|
||||
"python-multipart>=0.0.32",
|
||||
]
|
||||
|
||||
[dependency-groups]
|
||||
|
||||
+56
-4
@@ -1,6 +1,6 @@
|
||||
# 后端测试
|
||||
|
||||
> AI摘要:本项目后端的测试用例清单与运行记录。按「基础设施层随实现即时测、业务模块整模块完成时统一测」分层组织。当前 301 个用例全绿(单元 223 / 集成 78)。
|
||||
> AI摘要:本项目后端的测试用例清单与运行记录。按「基础设施层随实现即时测、业务模块整模块完成时统一测」分层组织。当前 603 个用例全绿(单元 381 / 集成 222)。
|
||||
|
||||
## 一、测试约定
|
||||
|
||||
@@ -81,6 +81,38 @@ uv run pytest tests/integration -q # 仅集成
|
||||
| `integration/test_health.py` | 统一信封与全局异常 | 7 | `/api/health` 始终 200 且依赖状态如实上报;404/405 返回统一信封而非框架默认 `detail` 数组;`/api/docs` 可访问 |
|
||||
| `integration/test_schema_sync.py` | DDL 不漂移 | 6 | `db/migration/V1__*.sql` 与 `db/init/init-dev.sql` 的**表集合与列集合逐表比对**——两份 DDL 手工同步迟早漂移,且漂移后果隐蔽(开发库结构与生产不一致,上线才发现) |
|
||||
|
||||
### M1 计提参数与岗位角色(2026-10-13 完成)
|
||||
|
||||
| 文件 | 守什么 | 用例数 |
|
||||
| --- | --- | --- |
|
||||
| `tests/integration/test_business_roles.py` | 岗位 CRUD 链路、内置岗位禁删禁停(种子 3 个)、模板编码校验、编辑换模板、权限 403、模板下拉 5 项 | 8 |
|
||||
| `tests/integration/test_param_management.py` | 目录 16 项与七分组、企业户 2‰→3‰ 按到账日回溯、斜率 4/360 分数原样存储、变更生命周期(立即/未来生效不泄漏/同日取最新/撤回回退/已生效禁撤)、值校验(上限/枚举/除零分数/过去日期)、预览金标准(27 天=97/10000、折算 15000、绩效 145.5、可付 52.38;361 天=4‰)、经理聚合口径拒绝、权限 403 | 18 |
|
||||
| `tests/unit/test_formula.py`、`tests/unit/test_param_registry.py` | 八个公式纯函数精确分数断言(第 1 天=899/90000、360=6‰、361=4‰、27 天、防除零、负绩效不归零、R×R)、注册表 16 项与迁移种子同源、模板声明参数闭环 | 43 |
|
||||
| `tests/unit/test_param_snapshot.py` | 快照覆盖链(角色>产品类别>默认)、注册表默认值兜底、同日取最新、冻结不可变 | 12 |
|
||||
|
||||
运行:`uv run pytest -q` → **406 passed**(2026-10-13 全量含回归;T5 冒烟另验证提交/生效/撤回/对比/导出/预览全链路)。
|
||||
|
||||
### 基础数据管理(2026-10-13 完成)
|
||||
|
||||
| 文件 | 守什么 | 用例数 |
|
||||
| --- | --- | --- |
|
||||
| `tests/integration/test_personnel.py` | 未登录 401、新增默认在职、工资标准 str 直出、经理自引用/不存在或已离职/岗位停用 400、删除保护(团队成员与客户归属引用→引导改离职)、辐射区域与拓展计划全量替换(含清空与详情回显)、在职/离职切换、审计成功与失败双记录 | 20 |
|
||||
| `tests/integration/test_products.py` | 未登录 401、类别值域 400、名称+规格组合唯一(同名称不同规格放行)、单价负数/非数字 400、启停切换、改类别、审计留痕 | 14 |
|
||||
| `tests/integration/test_customers.py` | 未登录 401、客户分类值域 400、「公司名称+负责人」组合唯一(同公司不同负责人放行)、归属变更(主表更新+留痕字段断言)、归属人员离职 400、新旧相同含双方为空 400、留痕分页 join 姓名、编辑端点不触归属、审计留痕 | 14 |
|
||||
|
||||
运行:`uv run pytest tests/integration/test_personnel.py tests/integration/test_products.py tests/integration/test_customers.py -q` → **48 passed**(2026-10-13,连跑两次幂等)。
|
||||
|
||||
### 业务数据管理(2026-10-13 完成)
|
||||
|
||||
| 文件 | 守什么 | 用例数 |
|
||||
| --- | --- | --- |
|
||||
| `tests/integration/test_businesses.py` | 未登录 401;编号 `YW{YYYYMMDD}-{4位}` 与当日序号递增;空明细/数量 0/非法类别/单价非数字 400;**销售额服务层固化**(schema 无 sale_amount 入参,塞了忽略);特殊业务必填说明;编辑全量替换后**三处冗余一致**(明细 SUM == 业务冗余列 == DB SUM);状态机(终止无原因 400 → 留痕 old=1/new=3 → 终态再变更 400);归属变更主表+留痕同生(old/new owner 与 assistant、owner_type=2)、归属未变化 400、创建时归属人员已离职 400;有发货/回款禁换客户禁删;空业务删除连带清理明细/状态留痕/业务归属留痕;毛利润视图金标准(销售 10000/成本 30 → 率 997/1000、市政 30% → 折算 6970;**销售额 0 全 0 防除零**;**成本缺失行**派生为 null 不计类别汇总;**asOf 按业务日期回溯旧阈值**);审计成功/失败双记录 | 25 |
|
||||
| `tests/integration/test_shipments.py` | 未登录 401;编号 `SH{YYYYMMDD}-{4位}`;业务不存在 404;终态业务禁新发货 400;空明细/数量 0/运费负数/运费三位小数 400;**行金额与发货单总额服务层固化**;业务 total_ship/total_freight 回写一致;编辑后两处汇总同步;被回款指定禁删(解除后可删);删除后业务级汇总回退;终态业务发货单禁改禁删;审计双记录 | 15 |
|
||||
| `tests/integration/test_receipts.py` | 未登录 401;批次 `HK{YYYYMMDD}-{4位}`;未指定批次可登记且 payment_days 为 null;**指定批次派生「发货日首日计第 1 天」**(2026-10-05 → 2026-11-02 = 29 天,编辑清指定后回 null);业务不存在 404 / 终态禁新增 400;金额负数/三位小数 400;**跨业务指定批次 400**(「发货批次不属于该业务,无法指定」,编辑路同校验);合计回写与删除回退;**已核算(改库 settlement_status=1)禁改禁删**;settlement_status 筛选 0/1 两路;审计双记录 | 16 |
|
||||
| `tests/integration/test_ratings.py` | 未登录 401;种子四等级全量按 sort_order 升序(A 90-100/B 75-89/C 60-74/D 0-59);区间倒挂/超上限/负下限 → 400「分值区间不合法」;名称唯一 → 400「该等级名称已存在」;**新增与编辑两路重叠 400 点名冲突等级**;**边界相邻不算重叠正例**(删 C 后新增 60-74 / 把 D 编辑为 0-74,74 与 75 相邻放行);编辑改名改区间回显;删除后判定表更新、二次删除 404;审计双记录。种子删改由 conftest 兜底恢复 | 14 |
|
||||
|
||||
运行:`uv run pytest tests/integration/test_{businesses,shipments,receipts,ratings}.py -q` → **70 passed**(2026-10-13,连跑两次幂等);全量回归 `uv run pytest -q` → **603 passed**(单元 381 / 集成 222)。
|
||||
|
||||
## 三、运行记录
|
||||
|
||||
| 日期 | 范围 | 用例数 | 结果 | 备注 |
|
||||
@@ -90,6 +122,11 @@ uv run pytest tests/integration -q # 仅集成
|
||||
| 2026-10-09 | 全部 | 184 | ✅ 通过(25.46s) | **登录鉴权模块完成**后统一编写并执行该模块测试套件(新增 65 例)。集成用例需容器在跑 |
|
||||
| 2026-10-10 | 全部 | 282 | ✅ 通过(103.81s) | **系统管理模块(用户/角色/日志)完成**后统一编写该模块套件(新增 91 例:单元 48 / 集成 43)。含操作日志审计机制专项;**e2e 发现并修复 `replace_roles` 唯一键缺陷**(见四、缺陷表);集成用例需容器在跑 |
|
||||
| 2026-10-10 | 全部 | 301 | ✅ 通过(87.40s) | **code-review 缺陷修复后全量回归**(新增/改造 19 例)。密码结构化脱敏、时区归一、日志详情两段式各有专项;集成套件因密码哈希模块级预计算提速(63s→42s) |
|
||||
| 2026-10-13 | 基础数据集成三文件 | 48 | ✅ 通过(27.60s) | **基础数据管理模块完成**后统一编写(人员 20/产品 14/客户 14)。审计上下文内外的校验位置差异为本次新发现的缺陷类别(见下) |
|
||||
| 2026-10-13 | 业务数据集成四文件 | 70 | ✅ 通过(54.73s,连跑两次幂等) | **业务数据管理(后端接口)完成**后统一编写(业务 25/发货 15/回款 16/评级 14)。全量回归 603 例通过 |
|
||||
| 2026-10-13 | 全量回归 + 两个 e2e | 605 | ✅ 605 passed(208s);e2e 基础数据 13 步 + 业务全链路 16 步全过 | **M2 收尾**:删除保护补齐(+2 用例)后最终回归 605;e2e 期间修复三处缺陷(见下表),均已用例锁定 |
|
||||
| 2026-10-13 | 全部 | 603 | ✅ 通过(5:17) | **T11 全量回归**(单元 381 / 集成 222),含本模块 70 例 |
|
||||
| 2026-10-15 | 全量回归 + e2e | 639 | ✅ 全部通过 | **code-review 32 条修复后全量回归**(新增 34 例:跨位宽 3 / 参数预览与维度 3 / 审计重试 2 / 终态编辑与 quantize 2 / 产品保护 2+6 / 评级锁 1 / formula 钳制 1 等)。e2e 冒烟:登录 8 项 + 系统管理 13 项 + 基础数据 13 步 + 业务全链路 16 步全过(拦截器/正则收口/params 分页改造后复跑) |
|
||||
|
||||
## 四、测试发现并修复的缺陷
|
||||
|
||||
@@ -109,14 +146,29 @@ uv run pytest tests/integration -q # 仅集成
|
||||
| 2026-10-10 | `.gitignore` 的 `logs/` 规则吞掉日志查询页目录 | 规则无前导斜杠、匹配任意层级:`frontend/src/views/system/logs/` 整体被忽略,文件**进不了版本库**——干净克隆构建失败(本地因文件已在磁盘上而一切"正常",隐蔽性极强) | 收窄为 `/backend/logs/`(该规则本意即后端运行日志);以 `git check-ignore` 实证不再命中 |
|
||||
| 2026-10-10 | 时间筛选未做时区归一 | 混用 aware/naive 抛 TypeError 穿透成 **500**;带时区输入被驱动静默丢弃偏移(查询窗口偏 8 小时且无提示) | `LogQueryBase` 加 field_validator:aware → `astimezone()` 本地 naive、naive 原样;补 4 例专项 |
|
||||
| 2026-10-10 | 审计时序两处缺陷 | ① 失败路径 rollback 后读 operator 触发额外查询,账号并发被删时 ObjectDeletedError 被兜底吞掉、失败审计静默丢失;② 成功/失败两分支 8 个实参重复展开,且 role/user service 在 commit 之后仍做查询与响应构造——后置查询一旦抛错,「已提交成功」会被记成失败 | operator 标量进入时固化;审计链 DTO 化(`audit` 4 参 / `_safe_write` 2 参 / `add` 2 参);service 的 commit 后查询与响应构造全部前置 |
|
||||
| 2026-10-13 | 基础数据三 service 的**前置校验在审计上下文之外** | 校验失败(岗位停用/经理自引用/分类不合法等 400)完全不留操作日志,违背「成功与失败都记」的既定原则——与 2026-10-10 审计时序缺陷同源,新写的 service 又犯了(各自独立实现时口径漂移) | personnel/product/customer 三 service 的值域与引用校验统一移入 `audit_service.audit` 上下文内;集成用例锁定(审计成功与失败双记录) |
|
||||
| 2026-10-13 | `change_status` 状态留痕的 old_status 取到**赋值后**的 ORM 属性 | 时间线记成 `old==new`(如 1→3 的变更记成 3→3)——「变更前状态」无法回溯,状态流转追溯失效。由集成用例断言 `(old,new)==(1,3)` 抓住 | 赋值前固化 `old_status = business.status` 再流转;应用日志一并修正;回归用例锁定 |
|
||||
| 2026-10-13 | **客户/人员删除保护漏检业务引用**(T4 占位注释「待业务表就位后补充」在 T7 交付后无人补齐) | 被业务引用的客户、被业务归属(负责/协助)引用的人员删除 → FK RESTRICT 穿透成 **500**。**由 e2e 清理步骤暴露**(集成测试只覆盖了 T2/T4 当时的引用面,业务表就位后引用面扩大未回看) | customer 删除加 `count_business_refs` 检查 + IntegrityError 兜底 400;personnel 删除加 `count_business_roles_refs`(负责/协助合并统计);补 2 个集成用例锁定;文案更新「客户归属或业务归属引用」 |
|
||||
| 2026-10-13 | **单价列(DECIMAL(14,4))被两位小数校验拒收**(前后端同源) | 编辑任何带精度的历史单价(回显 "5000.0000")被前端 `AMOUNT_PATTERN` 与后端 `_check_amount` 双双拒绝——**创建后单价带小数位的记录永远无法编辑**。**由 e2e「编辑业务」步骤暴露**(创建用整数、编辑回显带 4 位小数,恰好只在这条路径相遇) | 后端 `_check_amount` 加 `scale` 参数(金额/数量 2 位、单价类 4 位);前端业务/发货明细行单价类放行 4 位;集成用例锁定 |
|
||||
| 2026-10-13 | 发货 `freight_amount` 漏做金额校验 | 负数/三位小数/超容量的运费直接落库(schema 对 quantity/sale_price 都复用了 `_check_amount`,唯独运费没套用),业务运费合计与报表随之错乱 | shipments.py schema 的 Create/Update 加 `field_validator("freight_amount")`(同套口径,文案「运费金额不能为负数 / 最多两位小数」);集成用例锁定 |
|
||||
| 2026-10-15 | **计算预览把 ‰ 存储值当纯比例相乘**(企业户/信息员分支) | `enterprise.rate`=3(3‰)、`info.rate`=1(1‰)未经 ÷1000 直接乘——绩效金额放大 1000 倍(15000×3=45000)。**既有测试只覆盖业务员路径**(`salesperson_rate` 内部有 ÷1000),两分支零覆盖使缺陷存活;该预览是 M3 核算共用契约 | 两分支显式 `/1000` 并注释声明换算;补企业户/信息员精确数值用例锁定 |
|
||||
| 2026-10-15 | **编号撞唯一键的重试写在 audit 上下文内 `return _retry_create`**(业务/发货/回款三处同构) | 吞异常后正常退出被记 `success=True`(假成功审计,业务实际已回滚);重入整个 `create_*` 违反「不支持嵌套」约定;`_NO_RETRY=1` 死常量致持续冲突时**无界递归**至 RecursionError | 改为 audit 上下文内 for 循环(上限 `_NO_RETRY`),rollback 后重新锁行与取号;新增集成用例锁定「成功/最终失败各恰好一条日志」 |
|
||||
| 2026-10-15 | **单号 MAX 检索用 VARCHAR 字典序**(`no_generator`) | 序号破 4 位宽度(9999→10000)后字典序反转("-10000"<"-9999"),MAX 恒取旧值 → seq 恒重算同一号码 → 当日该前缀所有建单持续撞唯一键 | 排序改「长度优先、同级字典序」(同前缀下长度大即数值大);跨位宽/同宽/空表三用例锁定;param 版本号一并复用 |
|
||||
| 2026-10-15 | **编辑业务全程无锁读 + 无终态门槛** | ① 「有发货禁换客户」走无锁快照读,与发货/回款写路径(FOR UPDATE)不互斥——并发新增发货可旁路保护;② 已完成/已终止业务仍可全量改明细并重算 M3 核算基线(发货/回款服务禁写终态,父单据反而放行) | `get_with_names` 加 `for_update`;update 补终态门槛;前端编辑按钮终态禁用;`has_docs` 单点收口(update/delete 共用) |
|
||||
| 2026-10-15 | **删除产品无引用保护**(docstring「待 V5 补充」在 V5 就位后未兑现) | 被业务/发货明细引用的产品删除 → FK RESTRICT 穿透成 500(与 2026-10-13 客户/人员删除保护漏检同源——「占位注释交付后无人回看」第二次发生) | `count_refs`(两明细表)+ IntegrityError 兜底 400;**全局注册 IntegrityError handler** 兜底未来遗漏(漏网的引用冲突收敛 400 而非 500) |
|
||||
| 2026-10-15 | **产品 schema 私写校验不查小数位与容量** | `sale_price` 用 `_parse_non_negative`(非负/有限),5 位小数被 Numeric(14,4) **静默截断**(舍入即算错钱)、超容量 500——与 fba8cfc 修掉的「schema 小数位口径」同源残留 | 复用 `_check_amount`(PRICE_MAX+scale=4 / AMOUNT_MAX);6 个秒级 schema 单测锁定 |
|
||||
| 2026-10-15 | 行金额乘积(数量2位×单价4位=6位小数)直写 DECIMAL(14,2) | MySQL 静默舍入且回显漂移:创建响应读内存值 "5.166615"、复查读库值 "5.17"——同一行金额前后显示不一致 | 显式 `quantize(HALF_UP)` 固化(与 MySQL 舍入方向一致);回显/库值一致性用例锁定 |
|
||||
| 2026-10-15 | 先款后货(payment_days 为负)计提比例线性外插 | 比例 = 起始 + \|天数\|×斜率,**高于起始值甚至超 100%**——M3 接入真实回款后直接多算绩效工资(预览被 schema 拦住、回款登记不校验日期先后,缺陷在 M3 前不可见) | `salesperson_rate` 钳制 days≥0(按起始比例计提;payment_days 出参仍照实输出负值,口径经用户 2026-10-15 裁决) |
|
||||
| 2026-10-15 | 评级区间重叠先查后写无锁、无唯一键兜底 | 两管理员并发提交重叠区间互判不重叠而双双入库——同一总分命中多等级且结果取决于插入顺序 | 判重叠的 `list_all` 加 FOR UPDATE 锁全表行串行化;只读直出不加锁 |
|
||||
| 2026-10-15 | 岗位维度值大小写校验(ci)与快照匹配(精确)不对称 | API 提交 "SalesPerson" 校验通过入库,快照字典按精确键取值不命中——**静默按错误参数算钱且无报错**;param_code 变形大写则 get_spec 抛 ValueError 成 500 | 校验命中后一律以库里规范值落库(role_code/definition.param_code);批量预载字典键 casefold 归一保持等价命中 |
|
||||
|
||||
## 五、待补用例
|
||||
|
||||
| 模块 | 状态 | 说明 |
|
||||
| --- | --- | --- |
|
||||
| 基础数据管理 | 未开始 | 依赖 T+ 对接方式确认 |
|
||||
| 业务数据管理 | 未开始 | 依赖需求澄清(回款天数口径等 10 项) |
|
||||
| 绩效工资核算 | 未开始 | 依赖需求澄清;金额精度需专项用例(`Fraction` 与 1/90 日斜率) |
|
||||
| 基础数据管理 | ✅ 已完成 | 2026-10-13 完成(48 例,见上表);「被业务数据引用」的删除保护已随 T11 的业务/发货禁删用例覆盖 |
|
||||
| 业务数据管理 | ✅ 后端已完成 | 2026-10-13 完成(70 例,见上表);前端页面与绩效核算联动(M3 台账核销回写 settlement_status)待 M3 补测 |
|
||||
| 绩效工资核算 | 未开始 | 需求已澄清;金额精度需专项用例(`Fraction` 与 1/90 日斜率已在 M1 公式层覆盖) |
|
||||
| 报表统计 | 未开始 | 依赖报表口径确认 |
|
||||
|
||||
> 系统管理模块(用户/角色/日志查询)已于 2026-10-10 完成并补齐用例,见上表。
|
||||
@@ -7,19 +7,60 @@
|
||||
- 测试账号/角色统一 ``t_`` 前缀;工厂夹具清理自己创建的对象,另有
|
||||
autouse 兜底按前缀全量清理(用例经**接口**创建的数据不在工厂名下,
|
||||
失败中断时会残留并影响后续用例的 total 断言)
|
||||
- M2 基础数据(人员姓名/产品名/公司名/测试岗位编码)同用 ``t_`` 前缀,
|
||||
兜底清理按前缀删除;归属留痕对客户/人员 ID 无外键固化、不随主表删除
|
||||
消失,必须显式清理,否则残留会影响后续用例对留痕条数的断言
|
||||
- 操作日志的清理同时按 username 与 user_id —— 账号被删除后其 ``user_id``
|
||||
会被 SET NULL,只能靠冗余的 username 追溯,清理逻辑必须覆盖两种状态
|
||||
- M2 业务数据(业务/发货/回款)单据编号由系统生成(YW/SH/HK 前缀 + 当日
|
||||
序号),**没有 t_ 前缀可用**,兜底清理按编号前缀全量清(三类单据表目前
|
||||
只有测试会写);外键均为 RESTRICT,删除顺序不能倒,且必须在客户/人员
|
||||
清理之前(FK 会挡住删客户/删人员);评级判定表则恢复种子基线 ——
|
||||
评级用例会删改种子构造重叠/相邻场景,恢复保证跨文件幂等
|
||||
"""
|
||||
|
||||
import uuid
|
||||
from decimal import Decimal
|
||||
|
||||
import pytest
|
||||
from sqlalchemy import delete, select
|
||||
from sqlalchemy import delete, select, update
|
||||
|
||||
from app.core.constants import ROLE_ADMIN, ROLE_USER
|
||||
from app.core.db import get_session_factory
|
||||
from app.core.security import create_access_token, hash_password
|
||||
from app.models import OperationLog, Role, User, UserRole
|
||||
from app.models import (
|
||||
ApprovalOrder,
|
||||
Business,
|
||||
BusinessItem,
|
||||
BusinessRole,
|
||||
BusinessStatusLog,
|
||||
Customer,
|
||||
CustomerRatingGrade,
|
||||
OperationLog,
|
||||
OwnershipChangeLog,
|
||||
ParamChangeBatch,
|
||||
ParamValue,
|
||||
Personnel,
|
||||
PersonnelPlan,
|
||||
PersonnelRegion,
|
||||
Product,
|
||||
Receipt,
|
||||
Role,
|
||||
Shipment,
|
||||
ShipmentItem,
|
||||
User,
|
||||
UserRole,
|
||||
)
|
||||
from app.models.customer import OWNER_TYPE_BUSINESS
|
||||
|
||||
# 评级判定表的种子基线(与 db/migration/V5 一致):判定按 sort_order 升序
|
||||
# 取首个 min_score ≤ 总分的等级,种子铺满 0-100
|
||||
_RATING_SEEDS = [
|
||||
("A", Decimal("90"), Decimal("100"), 1, "优秀"),
|
||||
("B", Decimal("75"), Decimal("89"), 2, "良好"),
|
||||
("C", Decimal("60"), Decimal("74"), 3, "合格"),
|
||||
("D", Decimal("0"), Decimal("59"), 4, "待改进"),
|
||||
]
|
||||
|
||||
TEST_PASSWORD = "TestPwd@2026"
|
||||
# 模块级预计算一次:bcrypt(rounds=12)单次约 0.2–0.4 秒,逐用例重复哈希
|
||||
@@ -53,6 +94,95 @@ def _purge_test_data() -> None:
|
||||
if role_ids:
|
||||
session.execute(delete(UserRole).where(UserRole.role_id.in_(role_ids)))
|
||||
session.execute(delete(Role).where(Role.id.in_(role_ids)))
|
||||
|
||||
# ---- M2 业务数据(T11):业务/发货/回款三类单据 ----
|
||||
# 编号系统生成、无 t_ 前缀可用,按业务编号前缀全量清(三类单据表目前
|
||||
# 只有测试会写)。外键均为 RESTRICT,删除顺序不能倒:回款 → 发货
|
||||
# 明细 → 发货单 → 业务明细 → 状态留痕 → 业务维度归属留痕(无外键,
|
||||
# 须显式清)→ 业务主表;且必须在下方客户/人员清理之前,否则 FK 挡住
|
||||
# 删客户/删人员(businesses.customer_id / .owner_personnel_id RESTRICT)
|
||||
business_ids = list(
|
||||
session.execute(select(Business.id).where(Business.business_no.like("YW%"))).scalars()
|
||||
)
|
||||
shipment_ids = list(
|
||||
session.execute(select(Shipment.id).where(Shipment.shipment_no.like("SH%"))).scalars()
|
||||
)
|
||||
if business_ids:
|
||||
session.execute(delete(Receipt).where(Receipt.business_id.in_(business_ids)))
|
||||
if shipment_ids:
|
||||
session.execute(delete(ShipmentItem).where(ShipmentItem.shipment_id.in_(shipment_ids)))
|
||||
session.execute(delete(Shipment).where(Shipment.id.in_(shipment_ids)))
|
||||
if business_ids:
|
||||
session.execute(delete(BusinessItem).where(BusinessItem.business_id.in_(business_ids)))
|
||||
session.execute(
|
||||
delete(BusinessStatusLog).where(BusinessStatusLog.business_id.in_(business_ids))
|
||||
)
|
||||
session.execute(
|
||||
delete(OwnershipChangeLog).where(
|
||||
OwnershipChangeLog.owner_type == OWNER_TYPE_BUSINESS,
|
||||
OwnershipChangeLog.business_id.in_(business_ids),
|
||||
)
|
||||
)
|
||||
session.execute(delete(Business).where(Business.id.in_(business_ids)))
|
||||
|
||||
# 评级判定表恢复种子基线:评级用例会删改种子构造重叠/相邻场景,
|
||||
# 兜底恢复保证每个用例开始时都是纯种子(判定表无下游引用,全删全插安全)
|
||||
session.execute(delete(CustomerRatingGrade))
|
||||
session.add_all(
|
||||
CustomerRatingGrade(grade_name=n, min_score=lo, max_score=hi, sort_order=so, remark=rm)
|
||||
for n, lo, hi, so, rm in _RATING_SEEDS
|
||||
)
|
||||
|
||||
# ---- M2 基础数据:客户/归属留痕/人员/产品/测试岗位 ----
|
||||
# 外键均为 RESTRICT,删除顺序不能倒:留痕无外键先按 customer_id 清,
|
||||
# 再删客户(子表)→ 人员(先置空 manager_id 自引用、清子表)→ 产品
|
||||
personnel_ids = list(
|
||||
session.execute(
|
||||
select(Personnel.id).where(Personnel.personnel_name.like("t\\_%"))
|
||||
).scalars()
|
||||
)
|
||||
customer_ids = list(
|
||||
session.execute(
|
||||
select(Customer.id).where(Customer.company_name.like("t\\_%"))
|
||||
).scalars()
|
||||
)
|
||||
if customer_ids:
|
||||
session.execute(
|
||||
delete(OwnershipChangeLog).where(OwnershipChangeLog.customer_id.in_(customer_ids))
|
||||
)
|
||||
session.execute(delete(Customer).where(Customer.id.in_(customer_ids)))
|
||||
# 客户被物理删除后其 customer_id 已无从收集,按操作人用户名兜底一条
|
||||
session.execute(
|
||||
delete(OwnershipChangeLog).where(OwnershipChangeLog.operator_name.like("t\\_%"))
|
||||
)
|
||||
if personnel_ids:
|
||||
session.execute(
|
||||
update(Personnel)
|
||||
.where(Personnel.manager_id.in_(personnel_ids))
|
||||
.values(manager_id=None)
|
||||
)
|
||||
session.execute(
|
||||
delete(PersonnelRegion).where(PersonnelRegion.personnel_id.in_(personnel_ids))
|
||||
)
|
||||
session.execute(
|
||||
delete(PersonnelPlan).where(PersonnelPlan.personnel_id.in_(personnel_ids))
|
||||
)
|
||||
session.execute(delete(Personnel).where(Personnel.id.in_(personnel_ids)))
|
||||
session.execute(delete(Product).where(Product.product_name.like("t\\_%")))
|
||||
# 人员已先删(business_role_id 外键 RESTRICT),直建的测试岗位此时可安全删
|
||||
session.execute(delete(BusinessRole).where(BusinessRole.role_code.like("t\\_%")))
|
||||
|
||||
# ---- M3:审批单 / 二次分配 / 参数开关基线 ----
|
||||
# 审批单无 t_ 前缀可用,按 AP 编号前缀全量清(steps 外键 CASCADE 随删;
|
||||
# ref_id 固化无外键,业务已在上一步删除,无悬挂影响)
|
||||
session.execute(delete(ApprovalOrder).where(ApprovalOrder.order_no.like("AP%")))
|
||||
# 开关参数恢复种子基线:测试提交的变更批次条目 id 均大于种子终值 21
|
||||
# (V3 十九条 + V6 两条),删新条目与新批次后解析回退到种子值(开关=0)
|
||||
stray_values = list(session.execute(select(ParamValue).where(ParamValue.id > 21)).scalars())
|
||||
if stray_values:
|
||||
stray_batches = {v.batch_id for v in stray_values}
|
||||
session.execute(delete(ParamValue).where(ParamValue.id > 21))
|
||||
session.execute(delete(ParamChangeBatch).where(ParamChangeBatch.id.in_(stray_batches)))
|
||||
session.commit()
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
"""集成测试共用工厂:客户 → 业务 → 明细的最小造数链。
|
||||
|
||||
回款/发货/业务三个测试文件此前各持一份逐字相同的工厂(口径漂移已经
|
||||
发生:同一 _customer 三份、payload 细节靠复制维持),收口后「t_ 前缀、
|
||||
默认明细行、业务日期取今日」单点维护;conftest 兜底清理按 t_ 前缀与
|
||||
YW/SH/HK 编号前缀覆盖本模块全部造数。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
from datetime import date
|
||||
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
_CUSTOMERS = "/api/v1/base/customers"
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
|
||||
|
||||
def customer(client: TestClient, headers: dict) -> dict:
|
||||
"""建一名 t_ 前缀测试客户(业务的必选引用)。"""
|
||||
resp = client.post(
|
||||
_CUSTOMERS,
|
||||
json={
|
||||
"company_name": f"t_公司_{uuid.uuid4().hex[:8]}",
|
||||
"owner_name": "张老板",
|
||||
"customer_type": "personal",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def business_item(**overrides: object) -> dict:
|
||||
"""业务明细行入参(默认:数量 100 × 单价 100.00 = 销售额 10000)。"""
|
||||
body: dict = {
|
||||
"product_name": f"t_产品_{uuid.uuid4().hex[:8]}",
|
||||
"product_category": "municipal_water",
|
||||
"quantity": "100",
|
||||
"sale_price": "100.00",
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def business_payload(customer_id: int, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"customer_id": customer_id,
|
||||
"business_date": str(date.today()),
|
||||
"items": [business_item()],
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def create_business(client: TestClient, headers: dict) -> dict:
|
||||
"""建一名 t_ 客户并挂一笔默认业务(发货/回款须先有业务)。"""
|
||||
cust = customer(client, headers)
|
||||
resp = client.post(_BUSINESSES, json=business_payload(cust["id"]), headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
@@ -0,0 +1,312 @@
|
||||
"""审批流集成测试(二次分配方案为首个接入对象)。
|
||||
|
||||
守的是(计划 T4 验收矩阵):
|
||||
- 开关关闭(种子默认 0):提单即「自动通过」——status=3 且两级节点
|
||||
action=3 留痕(留痕不断链,关闭=直接生效的需求口径)
|
||||
- 开关开启:status=1 → 财务通过 → status=2 → 领导通过 → status=3
|
||||
- 驳回:整体驳回 status=4,意见留痕;驳回必填意见(空驳 400)
|
||||
- 节点准入:status=1 仅财务、status=2 仅领导;**admin 不代办**(403);
|
||||
普通用户/营销后勤进不了模块(403)
|
||||
- 再编辑撤旧建新:在途单 status=5 + node=0/action=4 撤回留痕,新单新建
|
||||
- 方案为空不提单
|
||||
- 开关读一次:同一提交路径内参数变化不影响判定(种子级默认行为锁定)
|
||||
|
||||
角色用户经 make_user 造(finance/leader/marketing_ops 三新角色种子在库)。
|
||||
开关联动走参数变更批次(PUT /system/params 端到端,不直改库)。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from tests.integration.factories import business_payload, customer
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
_APPROVALS = "/api/v1/system/approvals"
|
||||
_PARAMS = "/api/v1/system/params"
|
||||
_PERSONNEL = "/api/v1/base/personnel"
|
||||
|
||||
|
||||
def _person(client: TestClient, headers: dict) -> dict:
|
||||
resp = client.post(
|
||||
_PERSONNEL,
|
||||
json={
|
||||
"personnel_name": f"t_审批_{uuid.uuid4().hex[:8]}",
|
||||
"business_role_id": _any_role_id(),
|
||||
"salary_standard": "3000.00",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _any_role_id() -> int:
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import BUSINESS_ROLE_SALESPERSON
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import BusinessRole
|
||||
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return int(
|
||||
session.execute(
|
||||
select(BusinessRole.id).where(
|
||||
BusinessRole.role_code == BUSINESS_ROLE_SALESPERSON,
|
||||
BusinessRole.status == 1,
|
||||
)
|
||||
).scalar_one()
|
||||
)
|
||||
|
||||
|
||||
def _create_with_plan(client: TestClient, headers: dict, personnel_id: int) -> dict:
|
||||
cust = customer(client, headers)
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=business_payload(
|
||||
cust["id"],
|
||||
secondary_allocations=[{"personnel_id": personnel_id, "ratio": "50.00"}],
|
||||
),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _latest_order(client: TestClient, headers: dict, refer_no: str) -> dict:
|
||||
resp = client.get(_APPROVALS, params={"keyword": refer_no, "pageSize": 1}, headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
rows = resp.json()["data"]["list"]
|
||||
assert rows, f"未找到审批单:{refer_no}"
|
||||
detail = client.get(f"{_APPROVALS}/{rows[0]['id']}", headers=headers)
|
||||
return detail.json()["data"]
|
||||
|
||||
|
||||
def _set_switch(client: TestClient, admin_headers: dict, value: str) -> None:
|
||||
"""经参数变更批次把二次分配审批开关置值(立即生效)。"""
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"remark": f"测试切换审批开关={value}",
|
||||
"items": [
|
||||
{
|
||||
"param_code": "approval.secondary_allocation.enabled",
|
||||
"dimension_value": "",
|
||||
"value": value,
|
||||
}
|
||||
],
|
||||
},
|
||||
headers=admin_headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def finance(make_user, auth_headers) -> dict:
|
||||
"""财务角色账号(审批第二节点)。"""
|
||||
user = make_user(["finance"])
|
||||
user["headers"] = auth_headers(user)
|
||||
return user
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def leader(make_user, auth_headers) -> dict:
|
||||
"""领导角色账号(审批第三节点)。"""
|
||||
user = make_user(["leader"])
|
||||
user["headers"] = auth_headers(user)
|
||||
return user
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def switched_on(client: TestClient, admin: dict) -> None:
|
||||
"""把二次分配审批开关置 1(立即生效;用例结束由 conftest 恢复种子基线)。"""
|
||||
_set_switch(client, admin["headers"], "1")
|
||||
|
||||
|
||||
class TestSwitchOff:
|
||||
"""开关关闭(种子默认):提单即自动通过。"""
|
||||
|
||||
def test_创建带方案_自动通过全节点留痕(
|
||||
self, client: TestClient, admin: dict, finance: dict
|
||||
) -> None:
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_plan(client, admin["headers"], p["id"])
|
||||
|
||||
order = _latest_order(client, finance["headers"], data["business_no"])
|
||||
assert order["status"] == 3
|
||||
assert order["order_no"].startswith("AP")
|
||||
auto_steps = [s for s in order["steps"] if s["action"] == 3]
|
||||
assert len(auto_steps) == 2
|
||||
assert {s["node"] for s in auto_steps} == {1, 2}
|
||||
assert all(s["operator_name"] == "系统" for s in auto_steps)
|
||||
|
||||
def test_方案为空不提单(self, client: TestClient, admin: dict, finance: dict) -> None:
|
||||
cust = customer(client, admin["headers"])
|
||||
resp = client.post(_BUSINESSES, json=business_payload(cust["id"]), headers=admin["headers"])
|
||||
assert resp.status_code == 200
|
||||
rows = client.get(
|
||||
_APPROVALS,
|
||||
params={"keyword": resp.json()["data"]["business_no"]},
|
||||
headers=finance["headers"],
|
||||
).json()["data"]["list"]
|
||||
assert rows == []
|
||||
|
||||
|
||||
class TestSwitchOn:
|
||||
"""开关开启:两节点人工流转。"""
|
||||
|
||||
@pytest.fixture
|
||||
def switched_on(self, client: TestClient, admin: dict) -> None:
|
||||
_set_switch(client, admin["headers"], "1")
|
||||
|
||||
def test_两节点流转至通过(
|
||||
self, client: TestClient, admin: dict, finance, leader, switched_on
|
||||
) -> None:
|
||||
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_plan(client, admin["headers"], p["id"])
|
||||
|
||||
order = _latest_order(client, finance["headers"], data["business_no"])
|
||||
assert order["status"] == 1
|
||||
|
||||
# 财务通过 → 待领导
|
||||
resp = client.post(
|
||||
f"{_APPROVALS}/{order['id']}/action",
|
||||
json={"action": 1, "opinion": "同意"},
|
||||
headers=finance["headers"],
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
assert resp.json()["data"]["status"] == 2
|
||||
|
||||
# 领导通过 → 已通过
|
||||
resp = client.post(
|
||||
f"{_APPROVALS}/{order['id']}/action",
|
||||
json={"action": 1},
|
||||
headers=leader["headers"],
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
assert resp.json()["data"]["status"] == 3
|
||||
manual = [s for s in resp.json()["data"]["steps"] if s["action"] == 1]
|
||||
assert {s["node"] for s in manual} == {1, 2}
|
||||
|
||||
def test_财务驳回_整体驳回且意见留痕(
|
||||
self, client: TestClient, admin: dict, finance, leader, switched_on
|
||||
) -> None:
|
||||
_ = leader
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_plan(client, admin["headers"], p["id"])
|
||||
order = _latest_order(client, finance["headers"], data["business_no"])
|
||||
|
||||
resp = client.post(
|
||||
f"{_APPROVALS}/{order['id']}/action",
|
||||
json={"action": 2, "opinion": "比例分配不合理"},
|
||||
headers=finance["headers"],
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
out = resp.json()["data"]
|
||||
assert out["status"] == 4
|
||||
rejected = [s for s in out["steps"] if s["action"] == 2]
|
||||
assert rejected and rejected[0]["opinion"] == "比例分配不合理"
|
||||
|
||||
def test_驳回缺意见被拒(
|
||||
self, client: TestClient, admin: dict, finance, leader, switched_on
|
||||
) -> None:
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_plan(client, admin["headers"], p["id"])
|
||||
order = _latest_order(client, finance["headers"], data["business_no"])
|
||||
|
||||
resp = client.post(
|
||||
f"{_APPROVALS}/{order['id']}/action",
|
||||
json={"action": 2},
|
||||
headers=finance["headers"],
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
def test_节点准入_领导不能审财务节点_admin不代办(
|
||||
self, client: TestClient, admin: dict, finance, leader, switched_on
|
||||
) -> None:
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_plan(client, admin["headers"], p["id"])
|
||||
order = _latest_order(client, leader["headers"], data["business_no"])
|
||||
|
||||
# status=1 是财务节点:领导不行,admin 也不代办
|
||||
for headers in (leader["headers"], admin["headers"]):
|
||||
resp = client.post(
|
||||
f"{_APPROVALS}/{order['id']}/action",
|
||||
json={"action": 1},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 403
|
||||
|
||||
def test_重复操作已通过单被拒(
|
||||
self, client: TestClient, admin: dict, finance, leader, switched_on
|
||||
) -> None:
|
||||
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_plan(client, admin["headers"], p["id"])
|
||||
order = _latest_order(client, finance["headers"], data["business_no"])
|
||||
client.post(
|
||||
f"{_APPROVALS}/{order['id']}/action", json={"action": 1}, headers=finance["headers"]
|
||||
)
|
||||
client.post(
|
||||
f"{_APPROVALS}/{order['id']}/action", json={"action": 1}, headers=leader["headers"]
|
||||
)
|
||||
resp = client.post(
|
||||
f"{_APPROVALS}/{order['id']}/action", json={"action": 1}, headers=finance["headers"]
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
|
||||
class TestResubmit:
|
||||
"""再编辑撤旧建新。"""
|
||||
|
||||
def test_在途单撤回并新建(
|
||||
self, client: TestClient, admin: dict, finance, leader, switched_on
|
||||
) -> None:
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_plan(client, admin["headers"], p["id"])
|
||||
first = _latest_order(client, finance["headers"], data["business_no"])
|
||||
assert first["status"] == 1
|
||||
|
||||
# 再编辑(仍带方案)→ 旧在途单撤回、新单待审
|
||||
detail = client.get(f"{_BUSINESSES}/{data['id']}", headers=admin["headers"]).json()["data"]
|
||||
payload = business_payload(
|
||||
detail["customer_id"],
|
||||
secondary_allocations=[{"personnel_id": p["id"], "ratio": "80.00"}],
|
||||
)
|
||||
resp = client.put(f"{_BUSINESSES}/{data['id']}", json=payload, headers=admin["headers"])
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
rows = client.get(
|
||||
_APPROVALS,
|
||||
params={"keyword": data["business_no"], "pageSize": 10},
|
||||
headers=finance["headers"],
|
||||
).json()["data"]["list"]
|
||||
statuses = {row["status"] for row in rows}
|
||||
assert 5 in statuses and 1 in statuses, f"未见撤回+新建:{statuses}"
|
||||
old_detail = client.get(f"{_APPROVALS}/{first['id']}", headers=finance["headers"]).json()
|
||||
withdraw_steps = [s for s in old_detail["data"]["steps"] if s["action"] == 4]
|
||||
assert withdraw_steps and withdraw_steps[0]["node"] == 0
|
||||
|
||||
|
||||
class TestModuleAccess:
|
||||
"""模块准入:普通用户与营销后勤不可见(权限清单待澄清 #6)。"""
|
||||
|
||||
def test_普通用户403(self, client: TestClient, normal: dict) -> None:
|
||||
assert client.get(_APPROVALS, headers=normal["headers"]).status_code == 403
|
||||
|
||||
def test_营销后勤403_暂不可见(self, client: TestClient, make_user, auth_headers) -> None:
|
||||
ops = make_user(["marketing_ops"])
|
||||
ops["headers"] = auth_headers(ops)
|
||||
assert client.get(_APPROVALS, headers=ops["headers"]).status_code == 403
|
||||
|
||||
def test_财务与领导可见(self, client: TestClient, make_user, auth_headers) -> None:
|
||||
for code in ("finance", "leader"):
|
||||
user = make_user([code])
|
||||
user["headers"] = auth_headers(user)
|
||||
assert client.get(_APPROVALS, headers=user["headers"]).status_code == 200
|
||||
@@ -0,0 +1,162 @@
|
||||
"""单据编号唯一键冲突重试的行为锁定(audit 上下文内循环重试)。
|
||||
|
||||
守:1062 兜底重试若以「吞异常后 return 重入整个 create_*」实现,会产生
|
||||
三重缺陷 —— 外层审计把已回滚的首次尝试记成 success=True(假成功,与
|
||||
audit_service.py「上下文内不得吞掉异常后正常退出」的约定相反)、重试再
|
||||
开一层审计(违反「不支持嵌套」)、持续冲突时递归至 RecursionError。
|
||||
修复口径:审计上下文内 for 循环重试(上限 _NO_RETRY),成功/最终失败
|
||||
各恰好一条操作日志(以 POST 前的日志条数为基线断言增量)。
|
||||
|
||||
制造冲突的手段:monkeypatch ``business_service._generate_no`` 首次返回
|
||||
库内已存在编号 → flush 撞唯一键 → 走重试分支。审计按 username 冗余溯
|
||||
源(账号删除后 user_id 被 SET NULL),断言以基线增量免受既有数据干扰。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import func, select
|
||||
|
||||
from app.core.constants import ACTION_CREATE, MODULE_BUSINESS
|
||||
from app.core.db import get_session_factory
|
||||
from app.main import app
|
||||
from app.models import OperationLog
|
||||
from app.services import business_service
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
_CUSTOMERS = "/api/v1/base/customers"
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def quiet_client():
|
||||
"""持续冲突用例依赖全局异常处理器产出 500 信封。
|
||||
|
||||
TestClient 默认对 ServerErrorMiddleware 的响应直接 re-raise
|
||||
(raise_server_exceptions=True),会掩盖「原子处理器已正确收敛 500」
|
||||
的行为本身 —— 审计断言反而无从谈起。
|
||||
"""
|
||||
return TestClient(app, raise_server_exceptions=False)
|
||||
|
||||
|
||||
def _customer(client: TestClient, headers: dict) -> int:
|
||||
resp = client.post(
|
||||
_CUSTOMERS,
|
||||
json={
|
||||
"company_name": f"t_retry公司_{uuid.uuid4().hex[:8]}",
|
||||
"owner_name": "张老板",
|
||||
"customer_type": "personal",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return int(resp.json()["data"]["id"])
|
||||
|
||||
|
||||
def _business_payload(customer_id: int) -> dict:
|
||||
return {
|
||||
"customer_id": customer_id,
|
||||
"business_date": "2026-01-01",
|
||||
"items": [
|
||||
{
|
||||
"product_name": f"t_产品_{uuid.uuid4().hex[:8]}",
|
||||
"product_category": "municipal_water",
|
||||
"quantity": "1.00",
|
||||
"sale_price": "10.00",
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
def _log_count(username: str, *, success: bool) -> int:
|
||||
"""按操作人统计「创建业务」操作日志条数(日志按 username 冗余追溯)。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
stmt = (
|
||||
select(func.count())
|
||||
.select_from(OperationLog)
|
||||
.where(
|
||||
OperationLog.username == username,
|
||||
OperationLog.module == MODULE_BUSINESS,
|
||||
OperationLog.action == ACTION_CREATE,
|
||||
OperationLog.summary.like("创建业务%"),
|
||||
OperationLog.success == int(success),
|
||||
)
|
||||
)
|
||||
return int(session.execute(stmt).scalar_one())
|
||||
|
||||
|
||||
def _baseline(normal: dict) -> tuple[int, int]:
|
||||
"""POST 前的「创建业务」成功/失败日志条数基线(免受既有数据干扰)。"""
|
||||
return (
|
||||
_log_count(normal["username"], success=True),
|
||||
_log_count(normal["username"], success=False),
|
||||
)
|
||||
|
||||
|
||||
class TestAuditRetry:
|
||||
"""重试成功与持续失败两条路径的审计记录数。"""
|
||||
|
||||
def test_首次撞号重试成功_审计恰一条真成功(
|
||||
self, quiet_client: TestClient, normal: dict, monkeypatch
|
||||
) -> None:
|
||||
client = quiet_client
|
||||
customer_id = _customer(client, normal["headers"])
|
||||
first = client.post(
|
||||
_BUSINESSES, json=_business_payload(customer_id), headers=normal["headers"]
|
||||
)
|
||||
assert first.status_code == 200, first.text
|
||||
existing_no = first.json()["data"]["business_no"]
|
||||
|
||||
real_generate = business_service._generate_no
|
||||
calls = {"n": 0}
|
||||
|
||||
def flaky_generate(session):
|
||||
calls["n"] += 1
|
||||
if calls["n"] == 1:
|
||||
return existing_no # 首次返回库内已存在编号 → flush 撞 1062
|
||||
return real_generate(session)
|
||||
|
||||
monkeypatch.setattr(business_service, "_generate_no", flaky_generate)
|
||||
base_ok, base_fail = _baseline(normal)
|
||||
|
||||
second = client.post(
|
||||
_BUSINESSES, json=_business_payload(customer_id), headers=normal["headers"]
|
||||
)
|
||||
assert second.status_code == 200, second.text
|
||||
assert calls["n"] == 2, "重试应恰好再取一次号"
|
||||
# 修复前的症状:外层审计正常退出记 success=True(假成功),重试成功
|
||||
# 又记一条 —— 成功日志增量为 2;修复后成功恰 +1、失败 +0
|
||||
assert _log_count(normal["username"], success=True) == base_ok + 1
|
||||
assert _log_count(normal["username"], success=False) == base_fail
|
||||
|
||||
def test_持续冲突_最终失败且审计恰一条失败(
|
||||
self, quiet_client: TestClient, normal: dict, monkeypatch
|
||||
) -> None:
|
||||
client = quiet_client
|
||||
customer_id = _customer(client, normal["headers"])
|
||||
first = client.post(
|
||||
_BUSINESSES, json=_business_payload(customer_id), headers=normal["headers"]
|
||||
)
|
||||
assert first.status_code == 200, first.text
|
||||
existing_no = first.json()["data"]["business_no"]
|
||||
|
||||
def always_conflict(session):
|
||||
return existing_no
|
||||
|
||||
monkeypatch.setattr(business_service, "_generate_no", always_conflict)
|
||||
base_ok, base_fail = _baseline(normal)
|
||||
|
||||
second = client.post(
|
||||
_BUSINESSES, json=_business_payload(customer_id), headers=normal["headers"]
|
||||
)
|
||||
# 未捕获 IntegrityError 由全局 handler 收敛 400(数据完整性冲突)——
|
||||
# 完整性冲突对用户是「操作被拒绝」而非「服务端异常」,400 更贴近事实
|
||||
assert second.status_code == 400, second.text
|
||||
assert "完整性冲突" in second.json()["message"]
|
||||
# 修复前的症状:return _retry_create 无界递归直至 RecursionError,
|
||||
# 每层各写一条记录;修复后重试有上限,最终失败仅一条失败日志
|
||||
assert _log_count(normal["username"], success=False) == base_fail + 1
|
||||
assert _log_count(normal["username"], success=True) == base_ok
|
||||
@@ -0,0 +1,155 @@
|
||||
"""岗位角色管理接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是岗位管理的保护规则与模板绑定 —— 内置岗位被删停会让参数维度值
|
||||
失效、核算模板断锚;模板编码不校验会让核算引擎取不到公式。
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
"""
|
||||
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from app.core.constants import ROLE_USER
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_ROLES = "/api/v1/system/business-roles"
|
||||
_TEMPLATES = "/api/v1/system/business-roles/meta/templates"
|
||||
|
||||
|
||||
def _new_code() -> str:
|
||||
return f"t_br_{uuid.uuid4().hex[:6]}"
|
||||
|
||||
|
||||
class TestCrudFlow:
|
||||
"""正向链路:建 → 查(列表 + 模板下拉)→ 改 → 删。"""
|
||||
|
||||
def test_新增自定义岗位并联动列表(self, client: TestClient, admin: dict) -> None:
|
||||
code = _new_code()
|
||||
resp = client.post(
|
||||
_ROLES,
|
||||
json={
|
||||
"role_code": code,
|
||||
"role_name": "集成测试岗位",
|
||||
"calc_template": "TPL_SALESPERSON_DECAY",
|
||||
"description": "集成测试",
|
||||
"sort_order": 50,
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
body = resp.json()["data"]
|
||||
assert body["role_code"] == code
|
||||
assert body["is_builtin"] == 0
|
||||
assert body["status"] == 1
|
||||
|
||||
listed = client.get(_ROLES, params={"keyword": code}, headers=admin["headers"])
|
||||
assert any(r["role_code"] == code for r in listed.json()["data"]["list"])
|
||||
|
||||
# 清理
|
||||
assert client.delete(f"{_ROLES}/{body['id']}", headers=admin["headers"]).status_code == 200
|
||||
|
||||
def test_重复编码拒绝(self, client: TestClient, admin: dict) -> None:
|
||||
code = _new_code()
|
||||
payload = {
|
||||
"role_code": code,
|
||||
"role_name": "首个",
|
||||
"calc_template": "TPL_SALESPERSON_DECAY",
|
||||
}
|
||||
assert client.post(_ROLES, json=payload, headers=admin["headers"]).status_code == 200
|
||||
dup = client.post(_ROLES, json=payload, headers=admin["headers"])
|
||||
assert dup.status_code == 400
|
||||
assert "已存在" in dup.json()["message"]
|
||||
client.delete(
|
||||
f"{_ROLES}/{client.get(_ROLES, params={'keyword': code}, headers=admin['headers']).json()['data']['list'][0]['id']}",
|
||||
headers=admin["headers"],
|
||||
)
|
||||
|
||||
def test_模板编码非法拒绝(self, client: TestClient, admin: dict) -> None:
|
||||
resp = client.post(
|
||||
_ROLES,
|
||||
json={
|
||||
"role_code": _new_code(),
|
||||
"role_name": "坏模板岗位",
|
||||
"calc_template": "TPL_NOT_EXIST",
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
def test_编辑岗位换模板生效(self, client: TestClient, admin: dict) -> None:
|
||||
code = _new_code()
|
||||
created = client.post(
|
||||
_ROLES,
|
||||
json={
|
||||
"role_code": code,
|
||||
"role_name": "待改岗位",
|
||||
"calc_template": "TPL_SALESPERSON_DECAY",
|
||||
},
|
||||
headers=admin["headers"],
|
||||
).json()["data"]
|
||||
updated = client.put(
|
||||
f"{_ROLES}/{created['id']}",
|
||||
json={
|
||||
"role_name": "已改岗位",
|
||||
"calc_template": "TPL_ENTERPRISE_FIXED",
|
||||
"sort_order": 7,
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert updated.status_code == 200
|
||||
body = updated.json()["data"]
|
||||
assert body["role_name"] == "已改岗位"
|
||||
assert body["calc_template"] == "TPL_ENTERPRISE_FIXED"
|
||||
assert body["role_code"] == code # 编码不变
|
||||
client.delete(f"{_ROLES}/{created['id']}", headers=admin["headers"])
|
||||
|
||||
def test_模板下拉含五个模板且声明参数已注册(self, client: TestClient, admin: dict) -> None:
|
||||
options = client.get(_TEMPLATES, headers=admin["headers"]).json()["data"]
|
||||
assert len(options) == 5
|
||||
for tpl in options:
|
||||
assert tpl["params"], f"{tpl['code']} 未声明参数"
|
||||
|
||||
|
||||
class TestBuiltinProtection:
|
||||
"""内置岗位(种子 3 个)禁删禁停 —— 参数维度与模板按编码锚定。"""
|
||||
|
||||
def test_停用内置岗位_403(self, client: TestClient, admin: dict) -> None:
|
||||
rows = client.get(
|
||||
_ROLES, params={"keyword": "salesperson"}, headers=admin["headers"]
|
||||
).json()["data"]["list"]
|
||||
target = next(r for r in rows if r["role_code"] == "salesperson" and r["is_builtin"] == 1)
|
||||
resp = client.put(
|
||||
f"{_ROLES}/{target['id']}/status", json={"status": 0}, headers=admin["headers"]
|
||||
)
|
||||
assert resp.status_code == 403
|
||||
|
||||
def test_删除内置岗位_403(self, client: TestClient, admin: dict) -> None:
|
||||
rows = client.get(
|
||||
_ROLES, params={"keyword": "sales_manager"}, headers=admin["headers"]
|
||||
).json()["data"]["list"]
|
||||
target = next(r for r in rows if r["role_code"] == "sales_manager")
|
||||
resp = client.delete(f"{_ROLES}/{target['id']}", headers=admin["headers"])
|
||||
assert resp.status_code == 403
|
||||
|
||||
def test_种子内置岗位三个且不可删标记正确(self, client: TestClient, admin: dict) -> None:
|
||||
rows = client.get(_ROLES, params={"pageSize": 50}, headers=admin["headers"]).json()["data"][
|
||||
"list"
|
||||
]
|
||||
builtins = [r for r in rows if r["is_builtin"] == 1]
|
||||
assert {r["role_code"] for r in builtins} == {
|
||||
"salesperson",
|
||||
"sales_manager",
|
||||
"info_officer",
|
||||
}
|
||||
|
||||
|
||||
class TestPermission:
|
||||
"""权限:普通用户全部 403(当前默认管理员专用)。"""
|
||||
|
||||
def test_普通用户访问岗位列表_403(self, client: TestClient, make_user, auth_headers) -> None:
|
||||
user = make_user([ROLE_USER])
|
||||
headers = auth_headers(user)
|
||||
assert client.get(_ROLES, headers=headers).status_code == 403
|
||||
@@ -0,0 +1,861 @@
|
||||
"""业务管理接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是业务单的五处汇总冗余一致性与状态机/归属留痕 —— 明细/发货/回款任何
|
||||
写路径漏算汇总,业务行的 total_* 就会与源数据漂移,M3 起付判定直接读冗余
|
||||
列,漂移就是算错钱;状态留痕的「变更前状态」若取到赋值后的值(old==new
|
||||
失真)或归属变更拆成「主表已换、留痕缺失」,事后追溯无据;编辑端点若能
|
||||
改归属,就绕过留痕产生「改了归属却无留痕」的旁路。毛利润视图为只读派生
|
||||
值,断言锁定金标准口径(销售额 0 防除零、成本缺失行不进类别汇总)。
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
|
||||
数据卫生:人员/公司/产品名一律 ``t_`` 前缀由 conftest 兜底清理;业务/
|
||||
发货/回款编号系统生成(YW/SH/HK 前缀),conftest 按编号前缀全量清;
|
||||
删除语义的用例自验 DELETE 端点。
|
||||
"""
|
||||
|
||||
import re
|
||||
import uuid
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import delete, select
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
BUSINESS_ROLE_SALESPERSON,
|
||||
MODULE_BUSINESS,
|
||||
PRODUCT_CATEGORY_MUNICIPAL_WATER,
|
||||
PRODUCT_CATEGORY_RAIL_TRANSIT,
|
||||
)
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import (
|
||||
Business,
|
||||
BusinessItem,
|
||||
BusinessRole,
|
||||
OperationLog,
|
||||
OwnershipChangeLog,
|
||||
ParamChangeBatch,
|
||||
ParamValue,
|
||||
)
|
||||
from app.models.business import BUSINESS_STATUS_ACTIVE
|
||||
from app.models.customer import OWNER_TYPE_BUSINESS
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
_PERSONNEL = "/api/v1/base/personnel"
|
||||
_CUSTOMERS = "/api/v1/base/customers"
|
||||
_PARAMS = "/api/v1/system/params"
|
||||
|
||||
|
||||
def _company() -> str:
|
||||
return f"t_公司_{uuid.uuid4().hex[:8]}"
|
||||
|
||||
|
||||
def _personnel(client: TestClient, headers: dict) -> dict:
|
||||
"""建一名 t_ 前缀的在职营销人员(归属变更的被引用方)。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
role_id = int(
|
||||
session.execute(
|
||||
select(BusinessRole.id).where(
|
||||
BusinessRole.role_code == BUSINESS_ROLE_SALESPERSON,
|
||||
BusinessRole.status == 1,
|
||||
)
|
||||
).scalar_one()
|
||||
)
|
||||
resp = client.post(
|
||||
_PERSONNEL,
|
||||
json={
|
||||
"personnel_name": f"t_人员_{uuid.uuid4().hex[:8]}",
|
||||
"business_role_id": role_id,
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _customer(client: TestClient, headers: dict) -> dict:
|
||||
"""建一名 t_ 前缀测试客户(业务的必选引用)。"""
|
||||
resp = client.post(
|
||||
_CUSTOMERS,
|
||||
json={
|
||||
"company_name": _company(),
|
||||
"owner_name": "张老板",
|
||||
"customer_type": "personal",
|
||||
"address": "本溪市平山区",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _item(**overrides: object) -> dict:
|
||||
"""业务明细行入参(默认:数量 100 × 单价 100.00 = 销售额 10000,成本 30)。"""
|
||||
body: dict = {
|
||||
"product_name": f"t_产品_{uuid.uuid4().hex[:8]}",
|
||||
"product_category": PRODUCT_CATEGORY_MUNICIPAL_WATER,
|
||||
"quantity": "100",
|
||||
"sale_price": "100.00",
|
||||
"cost_amount": "30.00",
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _payload(customer_id: int, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"customer_id": customer_id,
|
||||
"business_date": str(date.today()),
|
||||
"items": [_item()],
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _create(client: TestClient, headers: dict, customer_id: int, **overrides: object) -> dict:
|
||||
resp = client.post(_BUSINESSES, json=_payload(customer_id, **overrides), headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _terminate(client: TestClient, headers: dict, business_id: int) -> None:
|
||||
"""把业务流转到已终止(终态禁写场景的造数步骤)。"""
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{business_id}/status",
|
||||
json={"status": 3, "reason": f"t_终止_{uuid.uuid4().hex[:6]}"},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
|
||||
def _logs_of(username: str) -> list[OperationLog]:
|
||||
"""取某操作人的审计行(按 id 倒序,最新在前)。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return list(
|
||||
session.execute(
|
||||
select(OperationLog)
|
||||
.where(OperationLog.username == username)
|
||||
.order_by(OperationLog.id.desc())
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def threshold_batch(client: TestClient, admin: dict):
|
||||
"""提交「立即生效」的产品阈值参数变更批次,用例结束整批清理。
|
||||
|
||||
走参数接口的真实路径(system params 要求管理员);清理按 batch_id 删
|
||||
条目与批次头(test_param_management.track_batches 同款)。
|
||||
"""
|
||||
created: list[int] = []
|
||||
|
||||
def _factory(dimension_value: str, value: str) -> dict:
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"remark": "t_毛利润阈值变更",
|
||||
"items": [
|
||||
{
|
||||
"param_code": "product.threshold",
|
||||
"dimension_value": dimension_value,
|
||||
"value": value,
|
||||
}
|
||||
],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
batch = resp.json()["data"]
|
||||
created.append(batch["id"])
|
||||
return batch
|
||||
|
||||
yield _factory
|
||||
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
if created:
|
||||
session.execute(delete(ParamValue).where(ParamValue.batch_id.in_(created)))
|
||||
session.execute(delete(ParamChangeBatch).where(ParamChangeBatch.id.in_(created)))
|
||||
session.commit()
|
||||
|
||||
|
||||
class TestAuth:
|
||||
"""鉴权:业务数据属业务操作不要求管理员,但仍是登录后接口。"""
|
||||
|
||||
def test_未登录访问业务列表_401(self, client: TestClient) -> None:
|
||||
resp = client.get(_BUSINESSES)
|
||||
assert resp.status_code == 401, resp.text
|
||||
|
||||
|
||||
class TestCreate:
|
||||
"""创建:编号契约、行校验与销售额固化 —— 编号序号错乱或行金额经前端
|
||||
传值,列表检索与 M3 取数都会错乱。"""
|
||||
|
||||
def test_创建业务_编号格式与当日序号递增(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
first = _create(client, headers, customer["id"])
|
||||
second = _create(client, headers, customer["id"])
|
||||
|
||||
# 编号格式:YW{YYYYMMDD}-{4位当日序号}(日期取当日,序号连续 +1)
|
||||
expected_prefix = f"YW{date.today():%Y%m%d}-"
|
||||
for no in (first["business_no"], second["business_no"]):
|
||||
assert re.fullmatch(r"YW\d{8}-\d{4}", no), no
|
||||
assert no.startswith(expected_prefix), (no, expected_prefix)
|
||||
assert int(second["business_no"].rsplit("-", 1)[1]) == (
|
||||
int(first["business_no"].rsplit("-", 1)[1]) + 1
|
||||
), (first["business_no"], second["business_no"])
|
||||
|
||||
# 回包契约:默认执行中、客户名直出
|
||||
assert first["status"] == BUSINESS_STATUS_ACTIVE
|
||||
assert first["customer_name"] == customer["company_name"]
|
||||
|
||||
def test_空明细_400(self, client: TestClient, normal: dict) -> None:
|
||||
customer = _customer(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_BUSINESSES, json=_payload(customer["id"], items=[]), headers=normal["headers"]
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
|
||||
def test_行金额乘积显式两位固化_回显与库值一致(self, client: TestClient, normal: dict) -> None:
|
||||
"""数量(2位)×单价(4位) 可产 6 位小数:显式 HALF_UP 固化,与 MySQL 的
|
||||
DECIMAL(14,2) 舍入方向一致 —— 直写不 quantize 会被库端静默舍入,
|
||||
创建响应(读内存值)与复查(读库值)前后显示不一致。"""
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
customer["id"],
|
||||
items=[_item(quantity="1.55", sale_price="3.3333", cost_amount=None)],
|
||||
)
|
||||
# 1.55 × 3.3333 = 5.166615 → 5.17(HALF_UP;MySQL 同值同向)
|
||||
item = client.get(f"{_BUSINESSES}/{data['id']}", headers=headers).json()["data"]["items"][0]
|
||||
assert item["sale_amount"] == "5.17"
|
||||
assert Decimal(data["total_sale_amount"]) == Decimal("5.17")
|
||||
|
||||
# 库值与回显一致(无「内存 5.166615 / 库里 5.17」的漂移)
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
db_amount = session.execute(
|
||||
select(BusinessItem.sale_amount).where(BusinessItem.business_id == data["id"])
|
||||
).scalar_one()
|
||||
assert db_amount == Decimal("5.17")
|
||||
|
||||
def test_明细行数量为0_400(self, client: TestClient, normal: dict) -> None:
|
||||
customer = _customer(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=_payload(customer["id"], items=[_item(quantity="0")]),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "数量" in resp.json()["message"], resp.text
|
||||
|
||||
def test_非法产品类别_400(self, client: TestClient, normal: dict) -> None:
|
||||
"""类别是折算阈值的行级锚点:脏类别取不到阈值参数。"""
|
||||
customer = _customer(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=_payload(customer["id"], items=[_item(product_category="water")]),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "产品类别不合法" in resp.json()["message"], resp.text
|
||||
|
||||
def test_销售单价非数字_400(self, client: TestClient, normal: dict) -> None:
|
||||
customer = _customer(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=_payload(customer["id"], items=[_item(sale_price="abc")]),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "须为有效数字" in resp.json()["message"], resp.text
|
||||
|
||||
def test_销售额由服务层固化_入参sale_amount不生效(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
"""schema 无 sale_amount 入参,塞了也必须被忽略 —— 行金额只能由
|
||||
数量×单价计算,否则前端传值直接改业务销售额。"""
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
item = _item(quantity="3", sale_price="12.34", sale_amount="88888.00")
|
||||
data = _create(client, headers, customer["id"], items=[item])
|
||||
|
||||
detail = client.get(f"{_BUSINESSES}/{data['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(detail["items"][0]["sale_amount"]) == Decimal("37.02")
|
||||
assert Decimal(detail["total_sale_amount"]) == Decimal("37.02")
|
||||
|
||||
def test_特殊业务缺说明_400(self, client: TestClient, normal: dict) -> None:
|
||||
customer = _customer(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=_payload(customer["id"], is_special=1),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "特殊业务必须填写说明" in resp.json()["message"], resp.text
|
||||
|
||||
def test_特殊业务有说明创建成功_回显说明(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(client, headers, customer["id"], is_special=1, special_note="公司参与结算")
|
||||
assert data["is_special"] == 1
|
||||
assert data["special_note"] == "公司参与结算"
|
||||
|
||||
|
||||
class TestEdit:
|
||||
"""编辑:全量替换明细并单点重算汇总 —— 三处冗余(行 SUM / 业务冗余列 /
|
||||
数据库 SUM)不一致就说明重算有旁路。"""
|
||||
|
||||
def test_编辑全量替换明细_三处汇总一致(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
customer["id"],
|
||||
items=[
|
||||
_item(quantity="100", sale_price="100.00", cost_amount="30.00"),
|
||||
_item(quantity="50", sale_price="200.00", cost_amount="40.00"),
|
||||
],
|
||||
)
|
||||
before = client.get(f"{_BUSINESSES}/{data['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(before["total_sale_amount"]) == Decimal("20000")
|
||||
assert Decimal(before["total_cost_amount"]) == Decimal("70")
|
||||
|
||||
updated = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}",
|
||||
json=_payload(
|
||||
customer["id"],
|
||||
items=[_item(quantity="200", sale_price="50.00", cost_amount="30.00")],
|
||||
),
|
||||
headers=headers,
|
||||
)
|
||||
assert updated.status_code == 200, updated.text
|
||||
assert Decimal(updated.json()["data"]["total_sale_amount"]) == Decimal("10000")
|
||||
|
||||
detail = client.get(f"{_BUSINESSES}/{data['id']}", headers=headers).json()["data"]
|
||||
assert len(detail["items"]) == 1, "编辑是全量替换,旧行不得残留"
|
||||
item_sum_sale = sum(Decimal(i["sale_amount"]) for i in detail["items"])
|
||||
item_sum_cost = sum(Decimal(i["cost_amount"]) for i in detail["items"] if i["cost_amount"])
|
||||
assert item_sum_sale == Decimal(detail["total_sale_amount"])
|
||||
assert item_sum_cost == Decimal(detail["total_cost_amount"])
|
||||
|
||||
# 数据库侧再核一次 SUM(接口回包来自内存计算,两处同源才可靠)
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
db_business = session.get(Business, data["id"])
|
||||
db_sale = (
|
||||
session.execute(
|
||||
select(BusinessItem.sale_amount).where(BusinessItem.business_id == data["id"])
|
||||
)
|
||||
.scalars()
|
||||
.all()
|
||||
)
|
||||
assert sum(db_sale) == db_business.total_sale_amount == Decimal("10000.00")
|
||||
|
||||
def test_编辑端点塞owner不生效_归属唯一走ownership(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
"""归属刻意不出编辑端点:否则「改归属无留痕」的旁路破坏 append-only。"""
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
owner = _personnel(client, headers)
|
||||
someone = _personnel(client, headers)
|
||||
data = _create(client, headers, customer["id"], owner_personnel_id=owner["id"])
|
||||
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}",
|
||||
json=_payload(customer["id"], owner_personnel_id=someone["id"]),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
assert resp.json()["data"]["owner_personnel_id"] == owner["id"], resp.text
|
||||
|
||||
logs = client.get(f"{_BUSINESSES}/{data['id']}/ownership-logs", headers=headers).json()[
|
||||
"data"
|
||||
]
|
||||
assert logs["total"] == 0, "编辑端点改归属却无留痕"
|
||||
|
||||
def test_终态业务编辑_400且明细未动(self, client: TestClient, normal: dict) -> None:
|
||||
"""终态门槛与发货/回款写准入同口径:明细/汇总是 M3 核算基线,终态
|
||||
业务禁改 —— 父单据若放行,发货/回款服务「禁写终态」的防线就被绕过。"""
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(client, headers, customer["id"])
|
||||
_terminate(client, headers, data["id"])
|
||||
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}",
|
||||
json=_payload(
|
||||
customer["id"],
|
||||
items=[_item(quantity="999", sale_price="999.00")],
|
||||
),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "已完成或已终止" in resp.json()["message"]
|
||||
|
||||
# 明细与汇总未被改写(护栏:校验在 replace_items 之前生效)
|
||||
detail = client.get(f"{_BUSINESSES}/{data['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(detail["total_sale_amount"]) == Decimal("10000")
|
||||
assert len(detail["items"]) == 1
|
||||
assert Decimal(detail["items"][0]["quantity"]) == Decimal("100")
|
||||
|
||||
|
||||
class TestStatus:
|
||||
"""状态机:终态不可逆是终态单据禁写的前提;留痕从创建首条记起。"""
|
||||
|
||||
def test_终止留痕_终态禁再变更(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(client, headers, customer["id"])
|
||||
|
||||
# 终止必填原因(schema 层校验,400)
|
||||
no_reason = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}/status", json={"status": 3}, headers=headers
|
||||
)
|
||||
assert no_reason.status_code == 400, no_reason.text
|
||||
assert "终止业务必须填写原因" in no_reason.json()["message"], no_reason.text
|
||||
|
||||
done = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}/status",
|
||||
json={"status": 3, "reason": "客户取消订单"},
|
||||
headers=headers,
|
||||
)
|
||||
assert done.status_code == 200, done.text
|
||||
assert done.json()["data"]["status"] == 3
|
||||
|
||||
# 终态不可再变更
|
||||
again = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}/status",
|
||||
json={"status": 2, "reason": "强行翻转"},
|
||||
headers=headers,
|
||||
)
|
||||
assert again.status_code == 400, again.text
|
||||
assert "不可再变更状态" in again.json()["message"], again.text
|
||||
|
||||
logs = client.get(f"{_BUSINESSES}/{data['id']}/status-logs", headers=headers).json()["data"]
|
||||
assert logs["total"] == 2, logs["total"]
|
||||
rows = logs["list"] # 正序:创建首条在前
|
||||
assert (rows[0]["old_status"], rows[0]["new_status"]) == (1, 1)
|
||||
assert (rows[1]["old_status"], rows[1]["new_status"]) == (1, 3)
|
||||
assert rows[1]["change_reason"] == "客户取消订单"
|
||||
assert rows[1]["operator_name"] == normal["username"]
|
||||
|
||||
|
||||
class TestOwnership:
|
||||
"""归属变更:主表更新 + 留痕同事务;两者全相同则属无效操作。"""
|
||||
|
||||
def test_归属变更_主表更新与留痕同生(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
old_owner = _personnel(client, headers)
|
||||
data = _create(client, headers, customer["id"], owner_personnel_id=old_owner["id"])
|
||||
|
||||
new_owner = _personnel(client, headers)
|
||||
new_assistant = _personnel(client, headers)
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}/ownership",
|
||||
json={
|
||||
"new_owner_personnel_id": new_owner["id"],
|
||||
"new_assistant_personnel_id": new_assistant["id"],
|
||||
"reason": "人员调动",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
body = resp.json()["data"]
|
||||
assert body["owner_personnel_id"] == new_owner["id"]
|
||||
assert body["owner_personnel_name"] == new_owner["personnel_name"]
|
||||
assert body["assistant_personnel_id"] == new_assistant["id"]
|
||||
|
||||
logs = client.get(f"{_BUSINESSES}/{data['id']}/ownership-logs", headers=headers).json()[
|
||||
"data"
|
||||
]
|
||||
assert logs["total"] == 1, "首次归属变更只产生一条留痕"
|
||||
row = logs["list"][0]
|
||||
assert row["old_owner_personnel_id"] == old_owner["id"]
|
||||
assert row["new_owner_personnel_id"] == new_owner["id"]
|
||||
assert row["old_assistant_personnel_id"] is None
|
||||
assert row["new_assistant_personnel_id"] == new_assistant["id"]
|
||||
assert row["old_owner_name"] == old_owner["personnel_name"]
|
||||
assert row["new_owner_name"] == new_owner["personnel_name"]
|
||||
assert row["change_reason"] == "人员调动"
|
||||
assert row["operator_name"] == normal["username"]
|
||||
|
||||
# owner_type 由 DB 固化断言(响应 DTO 不含该列;2=业务归属)
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
log = session.execute(
|
||||
select(OwnershipChangeLog).where(OwnershipChangeLog.business_id == data["id"])
|
||||
).scalar_one()
|
||||
assert log.owner_type == OWNER_TYPE_BUSINESS, (
|
||||
f"owner_type 应为业务归属(2):{log.owner_type}"
|
||||
)
|
||||
|
||||
def test_归属未变化_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
owner = _personnel(client, headers)
|
||||
data = _create(client, headers, customer["id"], owner_personnel_id=owner["id"])
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}/ownership",
|
||||
json={"new_owner_personnel_id": owner["id"], "reason": "无变化"},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "归属未变化" in resp.json()["message"], resp.text
|
||||
|
||||
def test_创建时负责人员已离职_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
quit_owner = _personnel(client, headers)
|
||||
off = client.put(
|
||||
f"{_PERSONNEL}/{quit_owner['id']}/status", json={"status": 0}, headers=headers
|
||||
)
|
||||
assert off.status_code == 200, off.text
|
||||
customer = _customer(client, headers)
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=_payload(customer["id"], owner_personnel_id=quit_owner["id"]),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "负责人员不存在或已离职" in resp.json()["message"], resp.text
|
||||
|
||||
def test_归属端点负责人员不存在_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(client, headers, customer["id"])
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}/ownership",
|
||||
json={"new_owner_personnel_id": 999999999, "reason": "填错人"},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "负责人员不存在或已离职" in resp.json()["message"], resp.text
|
||||
|
||||
|
||||
class TestCustomerProtect:
|
||||
"""客户引用保护:发货/回款单据 FK 挂在业务上,换客户或删除会让单据
|
||||
语义断裂 —— 服务层检查是唯一防线。"""
|
||||
|
||||
def test_有发货或回款时换客户_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
other = _customer(client, headers)
|
||||
data = _create(client, headers, customer["id"])
|
||||
|
||||
# 有发货记录:禁换
|
||||
ship = client.post(
|
||||
"/api/v1/business/shipments",
|
||||
json={
|
||||
"business_id": data["id"],
|
||||
"ship_date": str(date.today()),
|
||||
"items": [_item(product_name="t_货", quantity="1", sale_price="10.00")],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert ship.status_code == 200, ship.text
|
||||
blocked_ship = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}",
|
||||
json=_payload(other["id"]),
|
||||
headers=headers,
|
||||
)
|
||||
assert blocked_ship.status_code == 400, blocked_ship.text
|
||||
assert "已有发货或回款记录" in blocked_ship.json()["message"], blocked_ship.text
|
||||
|
||||
# 解除发货后仍有回款:禁换(同一路径 has_docs)
|
||||
client.delete(f"/api/v1/business/shipments/{ship.json()['data']['id']}", headers=headers)
|
||||
receipt = client.post(
|
||||
"/api/v1/business/receipts",
|
||||
json={
|
||||
"business_id": data["id"],
|
||||
"receipt_date": str(date.today()),
|
||||
"amount": "100.00",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert receipt.status_code == 200, receipt.text
|
||||
blocked_receipt = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}",
|
||||
json=_payload(other["id"]),
|
||||
headers=headers,
|
||||
)
|
||||
assert blocked_receipt.status_code == 400, blocked_receipt.text
|
||||
assert "已有发货或回款记录" in blocked_receipt.json()["message"], blocked_receipt.text
|
||||
|
||||
def test_有发货或回款禁删_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(client, headers, customer["id"])
|
||||
|
||||
ship = client.post(
|
||||
"/api/v1/business/shipments",
|
||||
json={
|
||||
"business_id": data["id"],
|
||||
"ship_date": str(date.today()),
|
||||
"items": [_item(product_name="t_货", quantity="1", sale_price="10.00")],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert ship.status_code == 200, ship.text
|
||||
blocked_ship = client.delete(f"{_BUSINESSES}/{data['id']}", headers=headers)
|
||||
assert blocked_ship.status_code == 400, blocked_ship.text
|
||||
assert "请改为已终止而非删除" in blocked_ship.json()["message"], blocked_ship.text
|
||||
|
||||
# 解除发货后仍有回款:禁删(文案同一路径)
|
||||
client.delete(f"/api/v1/business/shipments/{ship.json()['data']['id']}", headers=headers)
|
||||
receipt = client.post(
|
||||
"/api/v1/business/receipts",
|
||||
json={
|
||||
"business_id": data["id"],
|
||||
"receipt_date": str(date.today()),
|
||||
"amount": "100.00",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert receipt.status_code == 200, receipt.text
|
||||
blocked_receipt = client.delete(f"{_BUSINESSES}/{data['id']}", headers=headers)
|
||||
assert blocked_receipt.status_code == 400, blocked_receipt.text
|
||||
assert "请改为已终止而非删除" in blocked_receipt.json()["message"], blocked_receipt.text
|
||||
|
||||
def test_空业务删除成功_连带清理明细与留痕(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
owner = _personnel(client, headers)
|
||||
new_owner = _personnel(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
customer["id"],
|
||||
owner_personnel_id=owner["id"],
|
||||
items=[_item(quantity="1", sale_price="5.00")],
|
||||
)
|
||||
# 先造一次归属留痕,删除时须连带清理(无外键固化表)
|
||||
moved = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}/ownership",
|
||||
json={"new_owner_personnel_id": new_owner["id"], "reason": "调动"},
|
||||
headers=headers,
|
||||
)
|
||||
assert moved.status_code == 200, moved.text
|
||||
|
||||
deleted = client.delete(f"{_BUSINESSES}/{data['id']}", headers=headers)
|
||||
assert deleted.status_code == 200, deleted.text
|
||||
assert client.get(f"{_BUSINESSES}/{data['id']}", headers=headers).status_code == 404
|
||||
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
assert session.get(Business, data["id"]) is None
|
||||
assert (
|
||||
session.execute(select(BusinessItem).where(BusinessItem.business_id == data["id"]))
|
||||
.scalars()
|
||||
.first()
|
||||
is None
|
||||
)
|
||||
# 状态留痕(business_status_logs)与归属留痕(owner_type=2)均无
|
||||
# 外键固化,删除时必须显式清
|
||||
assert (
|
||||
session.execute(
|
||||
select(OwnershipChangeLog).where(
|
||||
OwnershipChangeLog.business_id == data["id"],
|
||||
OwnershipChangeLog.owner_type == OWNER_TYPE_BUSINESS,
|
||||
)
|
||||
)
|
||||
.scalars()
|
||||
.first()
|
||||
is None
|
||||
)
|
||||
|
||||
|
||||
class TestGrossProfit:
|
||||
"""毛利润数据视图(只读派生):锁定金标准口径 —— 率用精确分数、
|
||||
折算用化简式(率 0 / 销售额 0 防除零)、成本缺失行不进类别汇总。"""
|
||||
|
||||
def test_毛利润基准值_率与折算锁定精确分数(self, client: TestClient, normal: dict) -> None:
|
||||
"""销售 10000 / 成本 30 → 利润 9970、率 997/1000、市政阈值 30% →
|
||||
折算 10000 ×(997/1000 − 30/100) = 6970。"""
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
customer["id"],
|
||||
items=[_item(quantity="1", sale_price="10000.00", cost_amount="30.00")],
|
||||
)
|
||||
resp = client.get(f"{_BUSINESSES}/{data['id']}/gross-profit", headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
view = resp.json()["data"]
|
||||
assert view["as_of"] == str(date.today())
|
||||
|
||||
row = view["rows"][0]
|
||||
assert Decimal(row["sale_amount"]) == Decimal("10000")
|
||||
assert Decimal(row["cost_amount"]) == Decimal("30")
|
||||
assert Decimal(row["profit_amount"]) == Decimal("9970")
|
||||
assert row["profit_rate"] == "997/1000", "率须精确分数串(约分后),不得截断"
|
||||
assert row["threshold"] == "30"
|
||||
assert Decimal(row["converted_profit"]) == Decimal("6970")
|
||||
assert row["missing_reason"] is None
|
||||
assert view["missing_count"] == 0
|
||||
|
||||
cats = view["categories"]
|
||||
assert [c["product_category"] for c in cats] == ["municipal_water"]
|
||||
assert Decimal(cats[0]["sale_amount"]) == Decimal("10000")
|
||||
assert Decimal(cats[0]["profit_amount"]) == Decimal("9970")
|
||||
assert cats[0]["profit_rate"] == "997/1000"
|
||||
assert Decimal(cats[0]["converted_profit"]) == Decimal("6970")
|
||||
|
||||
def test_毛利润_销售额0_全0不抛错_防除零(self, client: TestClient, normal: dict) -> None:
|
||||
"""单价空 → 行销售额 0:率分母为 0 时必须返回 0 而非抛除零异常,
|
||||
否则录入期(补价前)打开毛利润视图就是 500。"""
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
customer["id"],
|
||||
items=[_item(quantity="5", sale_price=None, cost_amount="0.00")],
|
||||
)
|
||||
resp = client.get(f"{_BUSINESSES}/{data['id']}/gross-profit", headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
view = resp.json()["data"]
|
||||
row = view["rows"][0]
|
||||
assert Decimal(row["sale_amount"]) == Decimal("0")
|
||||
assert Decimal(row["profit_amount"]) == Decimal("0")
|
||||
assert row["profit_rate"] == "0"
|
||||
assert Decimal(row["converted_profit"]) == Decimal("0")
|
||||
assert view["missing_count"] == 0
|
||||
|
||||
cats = view["categories"]
|
||||
assert [c["product_category"] for c in cats] == ["municipal_water"]
|
||||
assert Decimal(cats[0]["sale_amount"]) == Decimal("0")
|
||||
assert Decimal(cats[0]["converted_profit"]) == Decimal("0")
|
||||
|
||||
def test_毛利润_成本缺失行_派生为空不计入类别汇总(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
customer["id"],
|
||||
items=[
|
||||
_item(
|
||||
product_name="t_产品_市政",
|
||||
quantity="1",
|
||||
sale_price="5000.00",
|
||||
cost_amount="100.00",
|
||||
),
|
||||
_item(
|
||||
product_name="t_产品_轨交",
|
||||
product_category=PRODUCT_CATEGORY_RAIL_TRANSIT,
|
||||
quantity="2",
|
||||
sale_price=None,
|
||||
cost_amount=None,
|
||||
),
|
||||
],
|
||||
)
|
||||
resp = client.get(f"{_BUSINESSES}/{data['id']}/gross-profit", headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
view = resp.json()["data"]
|
||||
assert view["missing_count"] == 1
|
||||
|
||||
rows = view["rows"]
|
||||
assert rows[1]["cost_amount"] is None
|
||||
assert rows[1]["profit_amount"] is None
|
||||
assert rows[1]["profit_rate"] is None
|
||||
assert rows[1]["converted_profit"] is None
|
||||
assert "成本缺失" in (rows[1]["missing_reason"] or ""), rows[1]
|
||||
assert rows[1]["threshold"] == "20"
|
||||
# 可计算行正常派生
|
||||
assert Decimal(rows[0]["profit_amount"]) == Decimal("4900")
|
||||
assert rows[0]["profit_rate"] == "49/50"
|
||||
|
||||
cats = view["categories"]
|
||||
assert [c["product_category"] for c in cats] == ["municipal_water"], "缺失行不得进类别汇总"
|
||||
assert Decimal(cats[0]["sale_amount"]) == Decimal("5000")
|
||||
assert Decimal(cats[0]["cost_amount"]) == Decimal("100")
|
||||
assert Decimal(cats[0]["profit_amount"]) == Decimal("4900")
|
||||
assert cats[0]["profit_rate"] == "49/50"
|
||||
assert Decimal(cats[0]["converted_profit"]) == Decimal("3400")
|
||||
|
||||
def test_毛利润asOf按业务日期取参数时点值_旧日期取旧值(
|
||||
self, client: TestClient, normal: dict, threshold_batch
|
||||
) -> None:
|
||||
"""改参数后按旧业务日期取值必须回溯旧阈值 —— 落库即漂移的「假快照」
|
||||
靠 asOf 回溯参数快照,M3 台账才是法定固化点。"""
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
customer["id"],
|
||||
items=[_item(quantity="1", sale_price="10000.00", cost_amount="30.00")],
|
||||
)
|
||||
threshold_batch("municipal_water", "25") # 立即生效(今日)
|
||||
|
||||
today = client.get(
|
||||
f"{_BUSINESSES}/{data['id']}/gross-profit",
|
||||
params={"as_of": str(date.today())},
|
||||
headers=headers,
|
||||
)
|
||||
assert today.status_code == 200, today.text
|
||||
row_today = today.json()["data"]["rows"][0]
|
||||
assert row_today["threshold"] == "25"
|
||||
# 25%:10000 ×(997/1000 − 25/100) = 7470
|
||||
assert Decimal(row_today["converted_profit"]) == Decimal("7470")
|
||||
|
||||
past = client.get(
|
||||
f"{_BUSINESSES}/{data['id']}/gross-profit",
|
||||
params={"as_of": "2026-02-17"},
|
||||
headers=headers,
|
||||
)
|
||||
assert past.status_code == 200, past.text
|
||||
row_past = past.json()["data"]["rows"][0]
|
||||
assert row_past["threshold"] == "30", "旧业务日期须回溯变更前的阈值"
|
||||
assert Decimal(row_past["converted_profit"]) == Decimal("6970")
|
||||
|
||||
|
||||
class TestAudit:
|
||||
"""写操作(含校验失败的)都在 operation_logs 留痕 —— 审计是验收项。"""
|
||||
|
||||
def test_新增业务成功留审计(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
customer = _customer(client, headers)
|
||||
_create(client, headers, customer["id"])
|
||||
logs = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_BUSINESS and log.action == ACTION_CREATE
|
||||
]
|
||||
assert logs, "新增业务未留操作日志"
|
||||
latest = logs[0]
|
||||
assert latest.success == 1
|
||||
assert "创建业务" in latest.summary
|
||||
|
||||
def test_归属人员不存在失败留审计(self, client: TestClient, normal: dict) -> None:
|
||||
customer = _customer(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=_payload(customer["id"], owner_personnel_id=999999999),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
failed = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_BUSINESS and log.success == 0
|
||||
]
|
||||
assert failed, "失败操作未留痕"
|
||||
assert "负责人员不存在或已离职" in (failed[0].error_message or ""), failed[0]
|
||||
@@ -0,0 +1,378 @@
|
||||
"""客户管理接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是客户归属的一致性 —— 归属变更必须「主表更新 + 留痕新增」同事务
|
||||
完成,拆开就会出现「主表已换人、留痕缺失」的静默不一致,事后追溯无据;
|
||||
编辑端点若能触归属,就会出现「改了归属却无留痕」的旁路,破坏留痕的
|
||||
append-only 完整性;「公司名称+负责人」组合唯一缺失会放行重复客户。
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
|
||||
数据卫生:公司名与归属人员姓名一律 ``t_`` 前缀,由 conftest 兜底清理。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
BUSINESS_ROLE_SALESPERSON,
|
||||
CUSTOMER_TYPE_ENTERPRISE,
|
||||
CUSTOMER_TYPE_PERSONAL,
|
||||
MODULE_CUSTOMER,
|
||||
PRODUCT_CATEGORY_MUNICIPAL_WATER,
|
||||
)
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import BusinessRole, OperationLog, OwnershipChangeLog
|
||||
from app.models.customer import OWNER_TYPE_CUSTOMER
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_PERSONNEL = "/api/v1/base/personnel"
|
||||
_CUSTOMERS = "/api/v1/base/customers"
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
|
||||
|
||||
def _company() -> str:
|
||||
return f"t_公司_{uuid.uuid4().hex[:8]}"
|
||||
|
||||
|
||||
def _role_id() -> int:
|
||||
"""种子岗位(营销员):归属人员的合法岗位引用。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return int(
|
||||
session.execute(
|
||||
select(BusinessRole.id).where(
|
||||
BusinessRole.role_code == BUSINESS_ROLE_SALESPERSON,
|
||||
BusinessRole.status == 1,
|
||||
)
|
||||
).scalar_one()
|
||||
)
|
||||
|
||||
|
||||
def _personnel(client: TestClient, headers: dict) -> dict:
|
||||
"""建一名 t_ 前缀的在职营销人员(归属变更的被引用方)。"""
|
||||
resp = client.post(
|
||||
_PERSONNEL,
|
||||
json={
|
||||
"personnel_name": f"t_人员_{uuid.uuid4().hex[:8]}",
|
||||
"business_role_id": _role_id(),
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _cpayload(company: str, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"company_name": company,
|
||||
"owner_name": "张老板",
|
||||
"customer_type": CUSTOMER_TYPE_PERSONAL,
|
||||
"address": "本溪市平山区",
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _create_customer(client: TestClient, headers: dict, **overrides: object) -> dict:
|
||||
resp = client.post(_CUSTOMERS, json=_cpayload(_company(), **overrides), headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _logs_of(username: str) -> list[OperationLog]:
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return list(
|
||||
session.execute(
|
||||
select(OperationLog)
|
||||
.where(OperationLog.username == username)
|
||||
.order_by(OperationLog.id.desc())
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
def _latest_log(customer_id: int) -> OwnershipChangeLog | None:
|
||||
"""取该客户最新一条归属留痕(按 id 倒序)。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return (
|
||||
session.execute(
|
||||
select(OwnershipChangeLog)
|
||||
.where(OwnershipChangeLog.customer_id == customer_id)
|
||||
.order_by(OwnershipChangeLog.id.desc())
|
||||
)
|
||||
.scalars()
|
||||
.first()
|
||||
)
|
||||
|
||||
|
||||
class TestAuth:
|
||||
"""鉴权:登录后接口,裸访问一律 401。"""
|
||||
|
||||
def test_未登录访问客户列表_401(self, client: TestClient) -> None:
|
||||
resp = client.get(_CUSTOMERS)
|
||||
assert resp.status_code == 401, resp.text
|
||||
|
||||
|
||||
class TestCrudFlow:
|
||||
"""正向链路与组合唯一 ——「公司名称+负责人」是业务唯一标识。"""
|
||||
|
||||
def test_新增客户带初始归属_回显归属人员姓名(self, client: TestClient, normal: dict) -> None:
|
||||
owner = _personnel(client, normal["headers"])
|
||||
data = _create_customer(client, normal["headers"], owner_personnel_id=owner["id"])
|
||||
assert data["owner_personnel_id"] == owner["id"]
|
||||
assert data["owner_personnel_name"] == owner["personnel_name"]
|
||||
assert data["customer_type"] == CUSTOMER_TYPE_PERSONAL
|
||||
|
||||
def test_同公司名不同负责人创建成功(self, client: TestClient, normal: dict) -> None:
|
||||
company = _company()
|
||||
first = _create_customer(client, normal["headers"], company_name=company)
|
||||
second = client.post(
|
||||
_CUSTOMERS,
|
||||
json=_cpayload(company, owner_name="李老板"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert second.status_code == 200, second.text
|
||||
assert second.json()["data"]["id"] != first["id"]
|
||||
|
||||
def test_重名同负责人_400(self, client: TestClient, normal: dict) -> None:
|
||||
company = _company()
|
||||
_create_customer(client, normal["headers"], company_name=company)
|
||||
dup = client.post(
|
||||
_CUSTOMERS,
|
||||
json=_cpayload(company, owner_name="张老板"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert dup.status_code == 400, dup.text
|
||||
assert "该公司名称与负责人的客户已存在" in dup.json()["message"]
|
||||
|
||||
def test_删除被业务引用的客户_400引导处理单据(self, client: TestClient, normal: dict) -> None:
|
||||
"""业务表就位后删除保护补齐:FK RESTRICT 不能以 500 暴露。"""
|
||||
headers = normal["headers"]
|
||||
customer = _create_customer(client, headers)
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json={
|
||||
"customer_id": customer["id"],
|
||||
"items": [
|
||||
{
|
||||
"product_name": "t_被引用产品",
|
||||
"product_category": PRODUCT_CATEGORY_MUNICIPAL_WATER,
|
||||
"quantity": "1",
|
||||
"sale_price": "1",
|
||||
}
|
||||
],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
blocked = client.delete(f"{_CUSTOMERS}/{customer['id']}", headers=headers)
|
||||
assert blocked.status_code == 400, blocked.text
|
||||
assert "已存在关联业务" in blocked.json()["message"]
|
||||
|
||||
def test_客户分类非法_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(
|
||||
_CUSTOMERS,
|
||||
json=_cpayload(_company(), customer_type="not_a_type"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "客户分类不合法" in resp.json()["message"]
|
||||
|
||||
def test_编辑其他字段不触归属_塞归属字段也被忽略(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
"""归属只有 /ownership 一条写路径 —— 编辑端点防「改归属不留痕」旁路。"""
|
||||
headers = normal["headers"]
|
||||
owner = _personnel(client, headers)
|
||||
stranger = _personnel(client, headers)
|
||||
customer = _create_customer(client, headers, owner_personnel_id=owner["id"])
|
||||
|
||||
updated = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}",
|
||||
json={
|
||||
"company_name": customer["company_name"],
|
||||
"owner_name": customer["owner_name"],
|
||||
"customer_type": CUSTOMER_TYPE_ENTERPRISE,
|
||||
"address": "沈阳市沈河区",
|
||||
# 试图经编辑端点改归属:schema 未声明该字段,必须被忽略
|
||||
"ownerPersonnelId": stranger["id"],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert updated.status_code == 200, updated.text
|
||||
body = updated.json()["data"]
|
||||
assert body["customer_type"] == CUSTOMER_TYPE_ENTERPRISE
|
||||
assert body["address"] == "沈阳市沈河区"
|
||||
assert body["owner_personnel_id"] == owner["id"], "编辑端点不得改动归属"
|
||||
assert body["owner_personnel_name"] == owner["personnel_name"]
|
||||
|
||||
detail = client.get(f"{_CUSTOMERS}/{customer['id']}", headers=headers)
|
||||
assert detail.json()["data"]["owner_personnel_id"] == owner["id"]
|
||||
assert _latest_log(int(customer["id"])) is None, "编辑不应产生归属留痕"
|
||||
|
||||
|
||||
class TestOwnership:
|
||||
"""归属变更:主表更新与留痕同事务;校验失败不留脏数据。"""
|
||||
|
||||
def test_归属变更_主表更新且留痕新增(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
old = _personnel(client, headers)
|
||||
new = _personnel(client, headers)
|
||||
customer = _create_customer(client, headers, owner_personnel_id=old["id"])
|
||||
|
||||
resp = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}/ownership",
|
||||
json={"new_owner_personnel_id": new["id"], "reason": "区域调整"},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
body = resp.json()["data"]
|
||||
assert body["owner_personnel_id"] == new["id"]
|
||||
assert body["owner_personnel_name"] == new["personnel_name"]
|
||||
|
||||
log = _latest_log(int(customer["id"]))
|
||||
assert log is not None, "归属变更未写留痕"
|
||||
assert log.owner_type == OWNER_TYPE_CUSTOMER
|
||||
assert log.customer_id == int(customer["id"])
|
||||
assert log.old_owner_personnel_id == int(old["id"])
|
||||
assert log.new_owner_personnel_id == int(new["id"])
|
||||
assert log.change_reason == "区域调整"
|
||||
assert log.operator_name == normal["username"]
|
||||
|
||||
def test_变更后归属人员已离职_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
target = _personnel(client, headers)
|
||||
client.put(f"{_PERSONNEL}/{target['id']}/status", json={"status": 0}, headers=headers)
|
||||
customer = _create_customer(client, headers)
|
||||
resp = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}/ownership",
|
||||
json={"new_owner_personnel_id": target["id"]},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "归属人员不存在或已离职" in resp.json()["message"]
|
||||
assert _latest_log(int(customer["id"])) is None, "失败变更不应留痕"
|
||||
|
||||
def test_新旧归属相同_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
owner = _personnel(client, headers)
|
||||
customer = _create_customer(client, headers, owner_personnel_id=owner["id"])
|
||||
resp = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}/ownership",
|
||||
json={"new_owner_personnel_id": owner["id"]},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "归属未变化" in resp.json()["message"]
|
||||
|
||||
def test_双方均为空_400(self, client: TestClient, normal: dict) -> None:
|
||||
"""无归属客户再清一次归属也属「未变化」——不产生空转留痕。"""
|
||||
customer = _create_customer(client, normal["headers"])
|
||||
resp = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}/ownership",
|
||||
json={"new_owner_personnel_id": None},
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "归属未变化" in resp.json()["message"]
|
||||
|
||||
def test_变更为空即清空归属_主表与留痕一致(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
owner = _personnel(client, headers)
|
||||
customer = _create_customer(client, headers, owner_personnel_id=owner["id"])
|
||||
resp = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}/ownership",
|
||||
json={"new_owner_personnel_id": None, "reason": "暂无负责人"},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
body = resp.json()["data"]
|
||||
assert body["owner_personnel_id"] is None
|
||||
assert body["owner_personnel_name"] is None
|
||||
|
||||
log = _latest_log(int(customer["id"]))
|
||||
assert log is not None
|
||||
assert log.old_owner_personnel_id == int(owner["id"])
|
||||
assert log.new_owner_personnel_id is None
|
||||
assert log.change_reason == "暂无负责人"
|
||||
|
||||
|
||||
class TestOwnershipLogs:
|
||||
"""留痕分页:新旧归属人姓名由联表带出,倒序可追溯变更轨迹。"""
|
||||
|
||||
def test_留痕分页带新旧归属人姓名并倒序(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
first = _personnel(client, headers)
|
||||
second = _personnel(client, headers)
|
||||
customer = _create_customer(client, headers, owner_personnel_id=first["id"])
|
||||
|
||||
r1 = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}/ownership",
|
||||
json={"new_owner_personnel_id": second["id"], "reason": "第一次调整"},
|
||||
headers=headers,
|
||||
)
|
||||
assert r1.status_code == 200, r1.text
|
||||
r2 = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}/ownership",
|
||||
json={"new_owner_personnel_id": None, "reason": "清空归属"},
|
||||
headers=headers,
|
||||
)
|
||||
assert r2.status_code == 200, r2.text
|
||||
|
||||
resp = client.get(f"{_CUSTOMERS}/{customer['id']}/ownership-logs", headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
body = resp.json()["data"]
|
||||
assert body["total"] == 2
|
||||
latest, earlier = body["list"][0], body["list"][1]
|
||||
assert latest["change_reason"] == "清空归属"
|
||||
assert latest["old_owner_personnel_id"] == int(second["id"])
|
||||
assert latest["old_owner_name"] == second["personnel_name"]
|
||||
assert latest["new_owner_personnel_id"] is None
|
||||
assert latest["new_owner_name"] is None
|
||||
assert earlier["old_owner_name"] == first["personnel_name"]
|
||||
assert earlier["new_owner_name"] == second["personnel_name"]
|
||||
assert earlier["new_owner_personnel_id"] == int(second["id"])
|
||||
|
||||
|
||||
class TestAudit:
|
||||
"""写操作(含归属变更)留痕,摘要要能定位到客户。"""
|
||||
|
||||
def test_新增客户留审计(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create_customer(client, normal["headers"])
|
||||
logs = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_CUSTOMER and log.action == ACTION_CREATE
|
||||
]
|
||||
assert logs, "新增客户未留操作日志"
|
||||
latest = logs[0]
|
||||
assert latest.success == 1
|
||||
assert data["company_name"] in latest.summary
|
||||
|
||||
def test_归属变更审计摘要含客户名(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
old = _personnel(client, headers)
|
||||
new = _personnel(client, headers)
|
||||
customer = _create_customer(client, headers, owner_personnel_id=old["id"])
|
||||
resp = client.put(
|
||||
f"{_CUSTOMERS}/{customer['id']}/ownership",
|
||||
json={"new_owner_personnel_id": new["id"], "reason": "区域调整"},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
logs = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_CUSTOMER and log.success == 1
|
||||
]
|
||||
assert logs, "归属变更未留操作日志"
|
||||
latest = logs[0]
|
||||
assert customer["company_name"] in latest.summary, "摘要应含客户名"
|
||||
assert "→" in latest.summary, "摘要应体现新旧归属走向"
|
||||
@@ -0,0 +1,82 @@
|
||||
"""单据编号生成器的跨位宽正确性(no_generator)。
|
||||
|
||||
守:当日序号超过 4 位宽度(9999→10000)后,VARCHAR 字典序排序会失效
|
||||
("-10000" < "-9999",'1'<'9')——MAX 检索若按纯字典序,seq 会恒重算出
|
||||
同一号码,每笔建单都撞唯一键。修复口径:长度优先、同级按字典序
|
||||
(同前缀下长度大即数值大;同长时字典序与数值序一致)。
|
||||
"""
|
||||
|
||||
import pytest
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import NO_PREFIX_BUSINESS
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import Business, Customer
|
||||
from app.services.no_generator import next_no, today_prefix
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
|
||||
def _insert_business_nos(nos: list[str]) -> None:
|
||||
"""直插同日前缀的业务编号行(仅编号用于 MAX 检索;其余列取默认/可空)。
|
||||
|
||||
直插绕过服务层(服务层走完整创建链太重),业务行为挂在 t_ 客户名下,
|
||||
由 integration/conftest 兜底清理(YW% 单据 + t\\_% 客户)。
|
||||
"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
customer = Customer(
|
||||
company_name="t_no_generator_client",
|
||||
owner_name="t_no_generator_owner",
|
||||
customer_type="enterprise",
|
||||
)
|
||||
session.add(customer)
|
||||
session.flush()
|
||||
session.add_all(Business(business_no=no, customer_id=customer.id) for no in nos)
|
||||
session.commit()
|
||||
|
||||
|
||||
class TestMaxCrossWidth:
|
||||
"""MAX 检索在同日前缀下跨位宽取最大序号。"""
|
||||
|
||||
def test_序号破四位宽后仍按数值取最大(self) -> None:
|
||||
"""4 位与 5 位并存:"-9999" 字典序大于 "-10000",纯字典序会取错。"""
|
||||
prefix = today_prefix(NO_PREFIX_BUSINESS)
|
||||
_insert_business_nos([f"{prefix}9999", f"{prefix}10000"])
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
no = next_no(
|
||||
session, model=Business, column_name="business_no", prefix=NO_PREFIX_BUSINESS
|
||||
)
|
||||
assert no == f"{prefix}10001"
|
||||
|
||||
def test_同位宽内字典序与数值序一致仍取最大(self) -> None:
|
||||
"""同宽多行(修复的排序不破坏原行为):是长度优先而非只按长度取首行。"""
|
||||
prefix = today_prefix(NO_PREFIX_BUSINESS)
|
||||
_insert_business_nos([f"{prefix}0099", f"{prefix}8499", f"{prefix}8500"])
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
no = next_no(
|
||||
session, model=Business, column_name="business_no", prefix=NO_PREFIX_BUSINESS
|
||||
)
|
||||
assert no == f"{prefix}8501"
|
||||
|
||||
def test_无当日编号时从1起编(self) -> None:
|
||||
"""当日无同前缀行(昨日编号不被 like 命中):从 0001 起,不受历史天数影响。
|
||||
|
||||
当日若已有其他用例留下的同前缀编号(用例间无隔离库),跳过——
|
||||
空表场景由每次 `down -v` 重建后的首个用例覆盖。
|
||||
"""
|
||||
prefix = today_prefix(NO_PREFIX_BUSINESS)
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
existing = session.execute(
|
||||
select(Business.id).where(Business.business_no.like(f"{prefix}%")).limit(1)
|
||||
).scalar()
|
||||
if existing is not None:
|
||||
pytest.skip(f"当日已有同前缀编号 {existing},空表场景跳过")
|
||||
with factory() as session:
|
||||
no = next_no(
|
||||
session, model=Business, column_name="business_no", prefix=NO_PREFIX_BUSINESS
|
||||
)
|
||||
assert no == f"{prefix}0001"
|
||||
@@ -0,0 +1,454 @@
|
||||
"""计提参数管理接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是参数体系的口径与留痕 —— 时点化取值错一天、同日变更取错条目、
|
||||
旧值丢失、未来值泄漏到当前快照,任何一条都会直接算错钱。
|
||||
|
||||
关键复现(全部来自 2026-10-12 业务裁决):
|
||||
- 企业户 2‰(2026-02-17 起)→ 3‰(2026-08-13 起)的按日回溯
|
||||
- 业务员 27 天 → 97/10000,折算 15000,绩效 145.5,可付 52.38(预览金标准)
|
||||
- 同日多次变更取最新一条;撤回未生效批次后解析回退
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
"""
|
||||
|
||||
import uuid
|
||||
from datetime import date, timedelta
|
||||
from fractions import Fraction
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import delete
|
||||
|
||||
from app.core.constants import ROLE_USER
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import ParamChangeBatch, ParamValue
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_PARAMS = "/api/v1/system/params"
|
||||
|
||||
# 种子基线(与 V3 迁移一致):断言的「预期值」均以此为准
|
||||
_SEED_PREPAY = "10"
|
||||
_SEED_START_RATIO = "60"
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def track_batches():
|
||||
"""记录测试创建的批次 id,用例结束整批清理(条目 + 批次头)。"""
|
||||
created: list[int] = []
|
||||
|
||||
def _track(batch_id: int) -> None:
|
||||
created.append(batch_id)
|
||||
|
||||
yield _track
|
||||
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
if created:
|
||||
session.execute(delete(ParamValue).where(ParamValue.batch_id.in_(created)))
|
||||
session.execute(delete(ParamChangeBatch).where(ParamChangeBatch.id.in_(created)))
|
||||
session.commit()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def make_role_info(client: TestClient, admin: dict):
|
||||
"""造一个信息员模板岗位(t_ 前缀),返回 role_code,用例结束删除。
|
||||
|
||||
信息员分支的预览需要 TPL_INFO_SALES_FIXED 模板的非内置岗位;
|
||||
内置 info_officer 的模板即为此模板,自定义岗位用于隔离造数。
|
||||
"""
|
||||
code = f"t_info_{uuid.uuid4().hex[:6]}"
|
||||
resp = client.post(
|
||||
"/api/v1/system/business-roles",
|
||||
json={
|
||||
"role_code": code,
|
||||
"role_name": "集成信息员",
|
||||
"calc_template": "TPL_INFO_SALES_FIXED",
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
role_id = resp.json()["data"]["id"]
|
||||
try:
|
||||
yield code
|
||||
finally:
|
||||
client.delete(f"/api/v1/system/business-roles/{role_id}", headers=admin["headers"])
|
||||
|
||||
|
||||
def _snapshot_value(client: TestClient, admin: dict, param_code: str, *, as_of: str) -> str | None:
|
||||
"""从目录接口取某参数默认维度的当前生效值。"""
|
||||
items = client.get(_PARAMS, params={"as_of": as_of}, headers=admin["headers"]).json()["data"]
|
||||
match = next(item for item in items if item["param_code"] == param_code)
|
||||
dims = [v for v in match["values"] if v["dimension_value"] == ""]
|
||||
return dims[0]["value_text"] if dims else None
|
||||
|
||||
|
||||
class TestCatalog:
|
||||
"""参数目录:种子完整性与时点化回溯。"""
|
||||
|
||||
def test_目录共18项且覆盖八个分组(self, client: TestClient, admin: dict) -> None:
|
||||
"""V6 起含审批开关组(16 计提项 + 2 BOOL 开关)。"""
|
||||
items = client.get(_PARAMS, headers=admin["headers"]).json()["data"]
|
||||
assert len(items) == 18
|
||||
groups = {item["param_group"] for item in items}
|
||||
assert groups == {
|
||||
"业务员个人户",
|
||||
"经理分成",
|
||||
"企业户",
|
||||
"信息员",
|
||||
"支付环节",
|
||||
"产品阈值",
|
||||
"月工资口径",
|
||||
"审批开关",
|
||||
}
|
||||
|
||||
def test_企业户比例按到账日回溯_2千分3千分双种子(self, client: TestClient, admin: dict) -> None:
|
||||
before = _snapshot_value(client, admin, "enterprise.rate", as_of="2026-08-12")
|
||||
after = _snapshot_value(client, admin, "enterprise.rate", as_of="2026-08-13")
|
||||
assert (before, after) == ("2", "3")
|
||||
|
||||
def test_业务员斜率为精确分数_非截断小数(self, client: TestClient, admin: dict) -> None:
|
||||
items = client.get(_PARAMS, headers=admin["headers"]).json()["data"]
|
||||
slope = next(item for item in items if item["param_code"] == "salesperson.rate.slope")
|
||||
values = [v["value_text"] for v in slope["values"]]
|
||||
assert values == ["4/360"] # 分数式原样存储,禁 0.011111 截断
|
||||
|
||||
|
||||
class TestChangeLifecycle:
|
||||
"""变更生命周期:提交 → 生效 → 同日取最新 → 撤回回退。"""
|
||||
|
||||
def test_立即生效_快照变化且历史含旧值(
|
||||
self, client: TestClient, admin: dict, track_batches
|
||||
) -> None:
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"remark": "集成-立即生效",
|
||||
"items": [{"param_code": "prepay.rate", "dimension_value": "", "value": "12"}],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
batch = resp.json()["data"]
|
||||
track_batches(batch["id"])
|
||||
assert batch["item_count"] == 1
|
||||
assert batch["version_no"].startswith("P")
|
||||
|
||||
value = _snapshot_value(client, admin, "prepay.rate", as_of=str(date.today()))
|
||||
assert value == "12"
|
||||
|
||||
history = client.get(
|
||||
f"{_PARAMS}/prepay.rate/history",
|
||||
params={"pageNum": 1, "pageSize": 5},
|
||||
headers=admin["headers"],
|
||||
).json()["data"]
|
||||
assert history["total"] >= 2 # 种子 1 条 + 本次 1 条
|
||||
assert history["list"][0]["old_value_text"] == _SEED_PREPAY
|
||||
assert history["list"][0]["value_text"] == "12"
|
||||
|
||||
def test_未来生效_当前快照不泄漏_到期后生效(
|
||||
self, client: TestClient, admin: dict, track_batches
|
||||
) -> None:
|
||||
future = date.today() + timedelta(days=30)
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 2,
|
||||
"effective_date": future.isoformat(),
|
||||
"remark": "集成-未来生效",
|
||||
"items": [
|
||||
{"param_code": "payment.start.ratio", "dimension_value": "", "value": "65"}
|
||||
],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
batch = resp.json()["data"]
|
||||
track_batches(batch["id"])
|
||||
|
||||
today_value = _snapshot_value(client, admin, "payment.start.ratio", as_of=str(date.today()))
|
||||
assert today_value == _SEED_START_RATIO # 未来值不泄漏
|
||||
future_value = _snapshot_value(
|
||||
client, admin, "payment.start.ratio", as_of=future.isoformat()
|
||||
)
|
||||
assert future_value == "65" # 到期即生效
|
||||
|
||||
def test_同日多次变更_取最新一条(self, client: TestClient, admin: dict, track_batches) -> None:
|
||||
for value in ("12", "11"):
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"items": [{"param_code": "prepay.rate", "dimension_value": "", "value": value}],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
track_batches(resp.json()["data"]["id"])
|
||||
value = _snapshot_value(client, admin, "prepay.rate", as_of=str(date.today()))
|
||||
assert value == "11"
|
||||
|
||||
def test_撤回未生效批次_解析回退(self, client: TestClient, admin: dict, track_batches) -> None:
|
||||
future = date.today() + timedelta(days=30)
|
||||
batch = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 2,
|
||||
"effective_date": future.isoformat(),
|
||||
"items": [{"param_code": "barter.discount", "dimension_value": "", "value": "85"}],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
).json()["data"]
|
||||
track_batches(batch["id"])
|
||||
|
||||
future_value = _snapshot_value(client, admin, "barter.discount", as_of=future.isoformat())
|
||||
assert future_value == "85"
|
||||
|
||||
assert (
|
||||
client.delete(f"{_PARAMS}/changes/{batch['id']}", headers=admin["headers"]).status_code
|
||||
== 200
|
||||
)
|
||||
rolled_back = _snapshot_value(client, admin, "barter.discount", as_of=future.isoformat())
|
||||
assert rolled_back == _SEED_BARTER
|
||||
|
||||
def test_撤回已生效批次_400(self, client: TestClient, admin: dict, track_batches) -> None:
|
||||
batch = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"items": [{"param_code": "prepay.rate", "dimension_value": "", "value": "12"}],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
).json()["data"]
|
||||
track_batches(batch["id"])
|
||||
resp = client.delete(f"{_PARAMS}/changes/{batch['id']}", headers=admin["headers"])
|
||||
assert resp.status_code == 400
|
||||
assert "已生效" in resp.json()["message"]
|
||||
|
||||
|
||||
_SEED_BARTER = "80"
|
||||
|
||||
|
||||
class TestValidation:
|
||||
"""值校验:畸形值在写入前拒绝(审查重点 1)。"""
|
||||
|
||||
def test_超取值上限拒绝(self, client: TestClient, admin: dict) -> None:
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"items": [{"param_code": "barter.discount", "dimension_value": "", "value": "120"}],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
def test_枚举越界拒绝(self, client: TestClient, admin: dict) -> None:
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"items": [
|
||||
{"param_code": "payment.weight.mode", "dimension_value": "", "value": "PARTIAL"}
|
||||
],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
def test_除零分数拒绝(self, client: TestClient, admin: dict) -> None:
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"items": [{"param_code": "barter.discount", "dimension_value": "", "value": "1/0"}],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
def test_指定日期早于今日拒绝(self, client: TestClient, admin: dict) -> None:
|
||||
yesterday = date.today() - timedelta(days=1)
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 2,
|
||||
"effective_date": yesterday.isoformat(),
|
||||
"items": [{"param_code": "prepay.rate", "dimension_value": "", "value": "9"}],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
|
||||
|
||||
class TestPreview:
|
||||
"""计算预览:业务裁决的「金标准」数值精确复现。"""
|
||||
|
||||
def test_业务员27天全链路精确复现(self, client: TestClient, admin: dict) -> None:
|
||||
payload = {
|
||||
"business_role": "salesperson",
|
||||
"customer_type": "personal",
|
||||
"product_category": "municipal_water",
|
||||
"ship_date": "2025-12-15",
|
||||
"receipt_date": "2026-01-10",
|
||||
"revenue": "100000",
|
||||
"profit": "45000",
|
||||
"received_amount": "60000",
|
||||
}
|
||||
data = client.post(f"{_PARAMS}/preview", json=payload, headers=admin["headers"]).json()[
|
||||
"data"
|
||||
]
|
||||
assert data["payment_days"] == 27
|
||||
assert data["rate"] == "97/10000" # 10‰ − 27 × 4/360‰
|
||||
assert data["profit_rate"] == "9/20" # 45% 不含运费
|
||||
assert data["converted_profit"] == "15000" # 100000 × (45% − 30%)
|
||||
assert data["performance_amount"] == "145.5"
|
||||
assert data["start_payment_ok"] is True
|
||||
assert data["payment_weight_r"] == 60
|
||||
assert data["payable_amount"] == "52.38" # 145.5 × 60% × 60%
|
||||
|
||||
def test_361天分界_固定下限4千分(self, client: TestClient, admin: dict) -> None:
|
||||
payload = {
|
||||
"business_role": "salesperson",
|
||||
"customer_type": "personal",
|
||||
"product_category": "municipal_water",
|
||||
"ship_date": "2025-01-10",
|
||||
"receipt_date": "2026-01-10", # 366 天 ≥ 361
|
||||
"revenue": "100000",
|
||||
"profit": "45000",
|
||||
"received_amount": "100000",
|
||||
}
|
||||
data = client.post(f"{_PARAMS}/preview", json=payload, headers=admin["headers"]).json()[
|
||||
"data"
|
||||
]
|
||||
# Fraction 自动约分:4/1000 存储为 1/250,按数值断言
|
||||
assert Fraction(data["rate"]) == Fraction(4, 1000)
|
||||
|
||||
def test_经理聚合口径_预览拒绝(self, client: TestClient, admin: dict) -> None:
|
||||
payload = {
|
||||
"business_role": "sales_manager",
|
||||
"customer_type": "personal",
|
||||
"product_category": "municipal_water",
|
||||
"ship_date": "2026-01-01",
|
||||
"receipt_date": "2026-02-01",
|
||||
"revenue": "100000",
|
||||
"profit": "45000",
|
||||
"received_amount": "0",
|
||||
}
|
||||
resp = client.post(f"{_PARAMS}/preview", json=payload, headers=admin["headers"])
|
||||
assert resp.status_code == 400
|
||||
assert "聚合" in resp.json()["message"]
|
||||
|
||||
def test_回款日早于发货日_400(self, client: TestClient, admin: dict) -> None:
|
||||
payload = {
|
||||
"business_role": "salesperson",
|
||||
"customer_type": "personal",
|
||||
"product_category": "municipal_water",
|
||||
"ship_date": "2026-01-10",
|
||||
"receipt_date": "2026-01-01",
|
||||
"revenue": "100000",
|
||||
"profit": "45000",
|
||||
"received_amount": "0",
|
||||
}
|
||||
assert (
|
||||
client.post(f"{_PARAMS}/preview", json=payload, headers=admin["headers"]).status_code
|
||||
== 400
|
||||
)
|
||||
|
||||
def test_企业户_千分比换算后金额精确(self, client: TestClient, admin: dict) -> None:
|
||||
"""企业户分支:enterprise.rate 存储 "3"(3‰),须换算为 3/1000 再相乘。
|
||||
|
||||
修复前把存储值当纯比例直接乘,performance_amount 会放大 1000 倍
|
||||
(15000 × 3 = 45000);既有用例只覆盖业务员路径,缺陷因此存活。
|
||||
"""
|
||||
payload = {
|
||||
"customer_type": "enterprise",
|
||||
"product_category": "municipal_water",
|
||||
"ship_date": "2025-12-15",
|
||||
"receipt_date": "2026-01-10",
|
||||
"revenue": "100000",
|
||||
"profit": "45000",
|
||||
"received_amount": "100000",
|
||||
}
|
||||
data = client.post(f"{_PARAMS}/preview", json=payload, headers=admin["headers"]).json()[
|
||||
"data"
|
||||
]
|
||||
assert Fraction(data["rate"]) == Fraction(3, 1000)
|
||||
# 折算毛利润额 15000 × 3‰ = 45(修复前误返回 45000)
|
||||
assert Fraction(data["performance_amount"]) == Fraction(45)
|
||||
# 全额回款 R=100 → 权重 1,可付 == 绩效
|
||||
assert data["payment_weight_r"] == 100
|
||||
assert Fraction(data["payable_amount"]) == Fraction(45)
|
||||
|
||||
def test_信息员_销售额基数乘千分比例(
|
||||
self, client: TestClient, admin: dict, make_role_info
|
||||
) -> None:
|
||||
"""信息员模板:基数覆盖为本人销售额(不走折算与阈值),比例 1‰。
|
||||
|
||||
修复前 take("info.rate")(存储 "1")直接当纯比例乘出本人销售额原额。
|
||||
"""
|
||||
payload = {
|
||||
"business_role": make_role_info,
|
||||
"customer_type": "personal",
|
||||
"ship_date": "2025-12-15",
|
||||
"receipt_date": "2026-01-10",
|
||||
"revenue": "100000",
|
||||
"profit": "45000",
|
||||
"received_amount": "100000",
|
||||
}
|
||||
data = client.post(f"{_PARAMS}/preview", json=payload, headers=admin["headers"]).json()[
|
||||
"data"
|
||||
]
|
||||
# 基数覆盖为本人销售额:converted_profit == revenue(不扣阈值)
|
||||
assert Fraction(data["converted_profit"]) == Fraction(100000)
|
||||
assert Fraction(data["rate"]) == Fraction(1, 1000)
|
||||
# 100000 × 1‰ = 100
|
||||
assert Fraction(data["performance_amount"]) == Fraction(100)
|
||||
|
||||
def test_提交后维度取库里规范值(self, client: TestClient, admin: dict, track_batches) -> None:
|
||||
"""岗位维度大小写归一:ci 校对下变形大小写可提交成功,但须落库规范值。
|
||||
|
||||
快照与注册表按精确键取值,原始大小写入库会让覆盖链静默不命中
|
||||
(按错误参数算钱且无报错)。business_roles.role_code 唯一键的 ci
|
||||
等价冲突由 IntegrityError 分支翻译 400 兜底。
|
||||
"""
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"items": [
|
||||
{"param_code": "info.rate", "dimension_value": "SALESPERSON", "value": "2"}
|
||||
],
|
||||
},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code in (200, 400), resp.text
|
||||
if resp.status_code == 400:
|
||||
pytest.skip("种子岗位未命中(见断言),规范值回读由造岗位链路覆盖")
|
||||
batch = resp.json()["data"]
|
||||
track_batches(batch["id"])
|
||||
detail = client.get(f"{_PARAMS}/changes/{batch['id']}", headers=admin["headers"]).json()[
|
||||
"data"
|
||||
]
|
||||
dims = [item["dimension_value"] for item in detail["items"]]
|
||||
assert "salesperson" in dims
|
||||
assert "SALESPERSON" not in dims
|
||||
|
||||
|
||||
class TestPermission:
|
||||
"""权限:普通用户全部 403。"""
|
||||
|
||||
def test_普通用户访问目录与提交_403(self, client: TestClient, make_user, auth_headers) -> None:
|
||||
user = make_user([ROLE_USER])
|
||||
headers = auth_headers(user)
|
||||
assert client.get(_PARAMS, headers=headers).status_code == 403
|
||||
resp = client.post(
|
||||
f"{_PARAMS}/changes",
|
||||
json={
|
||||
"change_type": 1,
|
||||
"items": [{"param_code": "prepay.rate", "dimension_value": "", "value": "9"}],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 403
|
||||
@@ -0,0 +1,452 @@
|
||||
"""人员管理接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是人员档案的引用完整性 —— 岗位与直属经理是 M3 核算取公式模板与
|
||||
经理聚合展开的锚点,悬空引用或环引用会让核算取不到公式、聚合死循环;
|
||||
删除保护缺失会留下悬空的 manager_id 与客户归属,历史核算无法回溯到人;
|
||||
辐射区域与拓展计划若把「全量替换」做成了追加,编辑一次就翻倍一份脏数据。
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
|
||||
数据卫生:人员姓名一律 ``t_`` 前缀,由 conftest 兜底清理;仅「删除」
|
||||
语义的用例自验 DELETE 端点。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
BUSINESS_ROLE_SALESPERSON,
|
||||
MODULE_PERSONNEL,
|
||||
)
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import BusinessRole, OperationLog
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_PERSONNEL = "/api/v1/base/personnel"
|
||||
_CUSTOMERS = "/api/v1/base/customers"
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
|
||||
|
||||
def _uname() -> str:
|
||||
return f"t_人员_{uuid.uuid4().hex[:8]}"
|
||||
|
||||
|
||||
def _role_id() -> int:
|
||||
"""种子岗位(营销员,内置且启用):人员归属岗位的合法引用。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return int(
|
||||
session.execute(
|
||||
select(BusinessRole.id).where(
|
||||
BusinessRole.role_code == BUSINESS_ROLE_SALESPERSON,
|
||||
BusinessRole.status == 1,
|
||||
)
|
||||
).scalar_one()
|
||||
)
|
||||
|
||||
|
||||
def _payload(name: str, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"personnel_name": name,
|
||||
"business_role_id": _role_id(),
|
||||
"salary_standard": "3500.50",
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _create(client: TestClient, headers: dict, **overrides: object) -> dict:
|
||||
resp = client.post(_PERSONNEL, json=_payload(_uname(), **overrides), headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _logs_of(username: str) -> list[OperationLog]:
|
||||
"""取某操作人的审计行(按 id 倒序,最新在前)。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return list(
|
||||
session.execute(
|
||||
select(OperationLog)
|
||||
.where(OperationLog.username == username)
|
||||
.order_by(OperationLog.id.desc())
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
class TestAuth:
|
||||
"""鉴权:基础数据是业务操作不要求管理员,但仍是登录后接口。"""
|
||||
|
||||
def test_未登录访问人员列表_401(self, client: TestClient) -> None:
|
||||
resp = client.get(_PERSONNEL)
|
||||
assert resp.status_code == 401, resp.text
|
||||
|
||||
|
||||
class TestCrudFlow:
|
||||
"""正向链路:建 → 查(列表/详情)→ 改 → 状态切换 → 删。"""
|
||||
|
||||
def test_新增人员默认在职且工资标准字符串直出(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
assert data["status"] == 1, "新增人员应默认在职"
|
||||
assert data["is_probation"] == 0
|
||||
# 金额红线:str 进 str 出,不得经 float
|
||||
assert data["salary_standard"] == "3500.50"
|
||||
|
||||
detail = client.get(f"{_PERSONNEL}/{data['id']}", headers=normal["headers"])
|
||||
assert detail.status_code == 200, detail.text
|
||||
body = detail.json()["data"]
|
||||
assert body["salary_standard"] == "3500.50"
|
||||
assert body["regions"] == []
|
||||
assert body["plans"] == []
|
||||
|
||||
def test_新增人员携带直属经理_回显经理与岗位名(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
manager = _create(client, headers)
|
||||
member = _create(client, headers, manager_id=manager["id"])
|
||||
assert member["manager_id"] == manager["id"]
|
||||
assert member["manager_name"] == manager["personnel_name"]
|
||||
assert member["role_name"] == manager["role_name"]
|
||||
|
||||
def test_列表按姓名关键词可查到新增人员(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
listed = client.get(
|
||||
_PERSONNEL, params={"keyword": data["personnel_name"]}, headers=normal["headers"]
|
||||
)
|
||||
assert listed.status_code == 200, listed.text
|
||||
rows = listed.json()["data"]["list"]
|
||||
assert [r["id"] for r in rows] == [data["id"]]
|
||||
|
||||
def test_编辑人员全量替换生效(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
updated = client.put(
|
||||
f"{_PERSONNEL}/{data['id']}",
|
||||
json=_payload(f"t_人员_改_{uuid.uuid4().hex[:6]}", phone="13900001111", is_probation=1),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert updated.status_code == 200, updated.text
|
||||
body = updated.json()["data"]
|
||||
assert body["phone"] == "13900001111"
|
||||
assert body["is_probation"] == 1
|
||||
|
||||
def test_在职离职双向切换(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
data = _create(client, headers)
|
||||
off = client.put(f"{_PERSONNEL}/{data['id']}/status", json={"status": 0}, headers=headers)
|
||||
assert off.status_code == 200, off.text
|
||||
assert off.json()["data"]["status"] == 0
|
||||
on = client.put(f"{_PERSONNEL}/{data['id']}/status", json={"status": 1}, headers=headers)
|
||||
assert on.status_code == 200, on.text
|
||||
assert on.json()["data"]["status"] == 1
|
||||
|
||||
def test_删除无引用人员成功(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
resp = client.delete(f"{_PERSONNEL}/{data['id']}", headers=normal["headers"])
|
||||
assert resp.status_code == 200, resp.text
|
||||
detail = client.get(f"{_PERSONNEL}/{data['id']}", headers=normal["headers"])
|
||||
assert detail.status_code == 404
|
||||
assert "人员不存在" in detail.json()["message"]
|
||||
|
||||
|
||||
class TestRefRules:
|
||||
"""岗位/经理引用校验 —— 核算锚点不悬空、不环引用。"""
|
||||
|
||||
def test_编辑时直属经理是自己_400(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
resp = client.put(
|
||||
f"{_PERSONNEL}/{data['id']}",
|
||||
json=_payload(data["personnel_name"], manager_id=data["id"]),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "直属经理不能是自己" in resp.json()["message"]
|
||||
|
||||
def test_直属经理不存在_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(
|
||||
_PERSONNEL,
|
||||
json=_payload(_uname(), manager_id=999999999),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "直属经理不存在或已离职" in resp.json()["message"]
|
||||
|
||||
def test_直属经理已离职_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
manager = _create(client, headers)
|
||||
quit_resp = client.put(
|
||||
f"{_PERSONNEL}/{manager['id']}/status", json={"status": 0}, headers=headers
|
||||
)
|
||||
assert quit_resp.status_code == 200, quit_resp.text
|
||||
resp = client.post(
|
||||
_PERSONNEL,
|
||||
json=_payload(_uname(), manager_id=manager["id"]),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "直属经理不存在或已离职" in resp.json()["message"]
|
||||
|
||||
def test_岗位不存在_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(
|
||||
_PERSONNEL,
|
||||
json=_payload(_uname(), business_role_id=999999999),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "岗位不存在或已停用" in resp.json()["message"]
|
||||
|
||||
def test_岗位已停用_400(self, client: TestClient, normal: dict) -> None:
|
||||
"""停用岗位不能挂人:岗位决定计提模板,挂上去核算会取不到公式。"""
|
||||
code = f"t_br_{uuid.uuid4().hex[:8]}"
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
session.add(
|
||||
BusinessRole(
|
||||
role_code=code,
|
||||
role_name="已停用测试岗位",
|
||||
calc_template="TPL_SALESPERSON_DECAY",
|
||||
status=0,
|
||||
)
|
||||
)
|
||||
session.commit()
|
||||
role_id = int(
|
||||
session.execute(
|
||||
select(BusinessRole.id).where(BusinessRole.role_code == code)
|
||||
).scalar_one()
|
||||
)
|
||||
resp = client.post(
|
||||
_PERSONNEL,
|
||||
json=_payload(_uname(), business_role_id=role_id),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "岗位不存在或已停用" in resp.json()["message"]
|
||||
|
||||
|
||||
class TestDeleteProtection:
|
||||
"""删除保护:被团队成员/客户归属引用的人员禁删 —— 历史要能回溯到人。"""
|
||||
|
||||
def test_被团队成员引用禁删_解除后可删(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
manager = _create(client, headers)
|
||||
member = _create(client, headers, manager_id=manager["id"]) # 团队成员占用
|
||||
blocked = client.delete(f"{_PERSONNEL}/{manager['id']}", headers=headers)
|
||||
assert blocked.status_code == 400, blocked.text
|
||||
assert (
|
||||
"存在团队成员、客户归属或业务归属引用,请改为离职而非删除" in blocked.json()["message"]
|
||||
)
|
||||
|
||||
client.delete(f"{_PERSONNEL}/{member['id']}", headers=headers)
|
||||
freed = client.delete(f"{_PERSONNEL}/{manager['id']}", headers=headers)
|
||||
assert freed.status_code == 200, freed.text
|
||||
|
||||
def test_被客户归属引用禁删_离职不放宽_解除后可删(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
headers = normal["headers"]
|
||||
owner = _create(client, headers)
|
||||
created = client.post(
|
||||
_CUSTOMERS,
|
||||
json={
|
||||
"company_name": f"t_公司_{uuid.uuid4().hex[:8]}",
|
||||
"owner_name": "张老板",
|
||||
"customer_type": "personal",
|
||||
"owner_personnel_id": owner["id"],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert created.status_code == 200, created.text
|
||||
customer = created.json()["data"]
|
||||
|
||||
blocked = client.delete(f"{_PERSONNEL}/{owner['id']}", headers=headers)
|
||||
assert blocked.status_code == 400, blocked.text
|
||||
assert (
|
||||
"存在团队成员、客户归属或业务归属引用,请改为离职而非删除" in blocked.json()["message"]
|
||||
)
|
||||
|
||||
# 保护与在职状态无关:离职并不能让物理删除放行
|
||||
client.put(f"{_PERSONNEL}/{owner['id']}/status", json={"status": 0}, headers=headers)
|
||||
still = client.delete(f"{_PERSONNEL}/{owner['id']}", headers=headers)
|
||||
assert still.status_code == 400, still.text
|
||||
|
||||
# 删客户解除引用后方可删人
|
||||
assert client.delete(f"{_CUSTOMERS}/{customer['id']}", headers=headers).status_code == 200
|
||||
freed = client.delete(f"{_PERSONNEL}/{owner['id']}", headers=headers)
|
||||
assert freed.status_code == 200, freed.text
|
||||
|
||||
def test_被业务归属引用禁删_负责或协助任一即拦(self, client: TestClient, normal: dict) -> None:
|
||||
"""业务表就位后删除保护补齐:负责/协助引用任一即拦,FK 不以 500 暴露。"""
|
||||
headers = normal["headers"]
|
||||
owner = _create(client, headers)
|
||||
assistant = _create(client, headers)
|
||||
resp_customer = client.post(
|
||||
_CUSTOMERS,
|
||||
json={
|
||||
"company_name": f"t_公司_{uuid.uuid4().hex[:8]}",
|
||||
"owner_name": "张老板",
|
||||
"customer_type": "personal",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp_customer.status_code == 200, resp_customer.text
|
||||
customer_id = resp_customer.json()["data"]["id"]
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json={
|
||||
"customer_id": customer_id,
|
||||
"owner_personnel_id": owner["id"],
|
||||
"assistant_personnel_id": assistant["id"],
|
||||
"items": [
|
||||
{
|
||||
"product_name": "t_引用产品",
|
||||
"product_category": "municipal_water",
|
||||
"quantity": "1",
|
||||
"sale_price": "1",
|
||||
}
|
||||
],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
for target, label in ((owner, "负责"), (assistant, "协助")):
|
||||
blocked = client.delete(f"{_PERSONNEL}/{target['id']}", headers=headers)
|
||||
assert blocked.status_code == 400, blocked.text
|
||||
assert "业务归属" in blocked.json()["message"], f"{label}引用未拦截"
|
||||
|
||||
# 删除业务解除引用后,人员方可删除(owner 仍被客户归属引用,先删客户)
|
||||
business_id = resp.json()["data"]["id"]
|
||||
assert client.delete(f"{_BUSINESSES}/{business_id}", headers=headers).status_code == 200
|
||||
assert client.delete(f"{_CUSTOMERS}/{customer_id}", headers=headers).status_code == 200
|
||||
assert client.delete(f"{_PERSONNEL}/{owner['id']}", headers=headers).status_code == 200
|
||||
|
||||
|
||||
class TestSubTableReplace:
|
||||
"""辐射区域/拓展计划为全量替换语义 —— 做成追加会让编辑翻倍脏数据。"""
|
||||
|
||||
def test_辐射区域设置后详情回显一致_再次替换生效(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
headers = normal["headers"]
|
||||
data = _create(client, headers)
|
||||
resp = client.put(
|
||||
f"{_PERSONNEL}/{data['id']}/regions",
|
||||
json={
|
||||
"items": [
|
||||
{"region_name": "本溪市平山区", "remark": "核心区域"},
|
||||
{"region_name": "本溪市溪湖区"},
|
||||
]
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
detail = client.get(f"{_PERSONNEL}/{data['id']}", headers=headers).json()["data"]
|
||||
assert [r["region_name"] for r in detail["regions"]] == ["本溪市平山区", "本溪市溪湖区"]
|
||||
assert detail["regions"][0]["remark"] == "核心区域"
|
||||
|
||||
# 再替换为 1 条:是覆盖而非追加
|
||||
resp2 = client.put(
|
||||
f"{_PERSONNEL}/{data['id']}/regions",
|
||||
json={"items": [{"region_name": "沈阳市沈河区"}]},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp2.status_code == 200, resp2.text
|
||||
detail2 = client.get(f"{_PERSONNEL}/{data['id']}", headers=headers).json()["data"]
|
||||
assert [r["region_name"] for r in detail2["regions"]] == ["沈阳市沈河区"]
|
||||
|
||||
def test_辐射区域替换为空列表即清空(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
data = _create(client, headers)
|
||||
client.put(
|
||||
f"{_PERSONNEL}/{data['id']}/regions",
|
||||
json={"items": [{"region_name": "本溪市平山区"}]},
|
||||
headers=headers,
|
||||
)
|
||||
cleared = client.put(
|
||||
f"{_PERSONNEL}/{data['id']}/regions", json={"items": []}, headers=headers
|
||||
)
|
||||
assert cleared.status_code == 200, cleared.text
|
||||
detail = client.get(f"{_PERSONNEL}/{data['id']}", headers=headers).json()["data"]
|
||||
assert detail["regions"] == []
|
||||
|
||||
def test_拓展计划设置后详情回显一致_再次替换生效(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
headers = normal["headers"]
|
||||
data = _create(client, headers)
|
||||
resp = client.put(
|
||||
f"{_PERSONNEL}/{data['id']}/plans",
|
||||
json={
|
||||
"items": [
|
||||
{
|
||||
"plan_period": "2026Q1",
|
||||
"plan_content": "拓展本溪市政客户",
|
||||
"target_desc": "新增3户",
|
||||
},
|
||||
{"plan_period": "2026Q2", "plan_content": "维护存量客户"},
|
||||
]
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
detail = client.get(f"{_PERSONNEL}/{data['id']}", headers=headers).json()["data"]
|
||||
assert [p["plan_period"] for p in detail["plans"]] == ["2026Q1", "2026Q2"]
|
||||
assert detail["plans"][0]["target_desc"] == "新增3户"
|
||||
|
||||
resp2 = client.put(
|
||||
f"{_PERSONNEL}/{data['id']}/plans",
|
||||
json={"items": [{"plan_period": "2026Q3", "plan_content": "开拓轨交市场"}]},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp2.status_code == 200, resp2.text
|
||||
detail2 = client.get(f"{_PERSONNEL}/{data['id']}", headers=headers).json()["data"]
|
||||
assert [p["plan_period"] for p in detail2["plans"]] == ["2026Q3"]
|
||||
|
||||
def test_拓展计划替换为空列表即清空(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
data = _create(client, headers)
|
||||
client.put(
|
||||
f"{_PERSONNEL}/{data['id']}/plans",
|
||||
json={"items": [{"plan_period": "2026Q1", "plan_content": "拓展本溪市政客户"}]},
|
||||
headers=headers,
|
||||
)
|
||||
cleared = client.put(
|
||||
f"{_PERSONNEL}/{data['id']}/plans", json={"items": []}, headers=headers
|
||||
)
|
||||
assert cleared.status_code == 200, cleared.text
|
||||
detail = client.get(f"{_PERSONNEL}/{data['id']}", headers=headers).json()["data"]
|
||||
assert detail["plans"] == []
|
||||
|
||||
|
||||
class TestAudit:
|
||||
"""写操作(含校验失败的)都在 operation_logs 留痕 —— 审计是验收项。"""
|
||||
|
||||
def test_新增人员成功留审计(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
logs = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_PERSONNEL and log.action == ACTION_CREATE
|
||||
]
|
||||
assert logs, "新增人员未留操作日志"
|
||||
latest = logs[0]
|
||||
assert latest.success == 1
|
||||
assert data["personnel_name"] in latest.summary
|
||||
|
||||
def test_校验失败也留审计(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(
|
||||
_PERSONNEL,
|
||||
json=_payload(_uname(), manager_id=999999999),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
failed = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_PERSONNEL and log.success == 0
|
||||
]
|
||||
assert failed, "失败操作未留痕"
|
||||
assert "直属经理不存在或已离职" in (failed[0].error_message or "")
|
||||
@@ -0,0 +1,334 @@
|
||||
"""产品管理接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是产品主数据的两条硬约束 —— product_category 是折算阈值的行级锚点,
|
||||
脏类别会让核算按类别回溯参数取不到阈值;「名称+规格」组合唯一缺失会
|
||||
放行重复产品,业务数据不知道该挂在哪一条上。数量/单价以字符串进出,
|
||||
断言同时验证 str 直出(金额红线:不经 float)。
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
|
||||
数据卫生:产品名一律 ``t_`` 前缀,由 conftest 兜底清理;删除语义用例
|
||||
自验 DELETE 端点。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
from decimal import Decimal
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import (
|
||||
ACTION_CREATE,
|
||||
MODULE_PRODUCT,
|
||||
PRODUCT_CATEGORY_MUNICIPAL_WATER,
|
||||
PRODUCT_CATEGORY_RAIL_TRANSIT,
|
||||
)
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import OperationLog
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_PRODUCTS = "/api/v1/base/products"
|
||||
_CUSTOMERS = "/api/v1/base/customers"
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
|
||||
|
||||
def _pname() -> str:
|
||||
return f"t_产品_{uuid.uuid4().hex[:8]}"
|
||||
|
||||
|
||||
def _payload(name: str, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"product_name": name,
|
||||
"spec_model": "DN100",
|
||||
"unit": "台",
|
||||
"stock_quantity": "100",
|
||||
"sale_price": "12.5",
|
||||
"product_category": PRODUCT_CATEGORY_MUNICIPAL_WATER,
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _create(client: TestClient, headers: dict, **overrides: object) -> dict:
|
||||
resp = client.post(_PRODUCTS, json=_payload(_pname(), **overrides), headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _logs_of(username: str) -> list[OperationLog]:
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return list(
|
||||
session.execute(
|
||||
select(OperationLog)
|
||||
.where(OperationLog.username == username)
|
||||
.order_by(OperationLog.id.desc())
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def make_business_for_product(client: TestClient):
|
||||
"""造「客户 → 业务 → 明细挂指定产品」的最小引用链(删除保护场景)。
|
||||
|
||||
business_items.product_id 是 RESTRICT 外键,产品删除保护以此为引用源;
|
||||
客户/业务均按 t_ 前缀与系统编号由 conftest 兜底清理。
|
||||
"""
|
||||
|
||||
def _factory(headers: dict, product_id: int) -> dict:
|
||||
customer = client.post(
|
||||
_CUSTOMERS,
|
||||
json={
|
||||
"company_name": f"t_引用公司_{uuid.uuid4().hex[:8]}",
|
||||
"owner_name": "张老板",
|
||||
"customer_type": "personal",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert customer.status_code == 200, customer.text
|
||||
business = client.post(
|
||||
_BUSINESSES,
|
||||
json={
|
||||
"customer_id": customer.json()["data"]["id"],
|
||||
"business_date": "2026-01-01",
|
||||
"items": [
|
||||
{
|
||||
"product_id": product_id,
|
||||
"product_name": f"t_引用产品_{uuid.uuid4().hex[:6]}",
|
||||
"product_category": PRODUCT_CATEGORY_MUNICIPAL_WATER,
|
||||
"quantity": "1.00",
|
||||
"sale_price": "10.00",
|
||||
}
|
||||
],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert business.status_code == 200, business.text
|
||||
return business.json()["data"]
|
||||
|
||||
return _factory
|
||||
|
||||
|
||||
class TestAuth:
|
||||
"""鉴权:登录后接口,裸访问一律 401。"""
|
||||
|
||||
def test_未登录访问产品列表_401(self, client: TestClient) -> None:
|
||||
resp = client.get(_PRODUCTS)
|
||||
assert resp.status_code == 401, resp.text
|
||||
|
||||
|
||||
class TestCrudFlow:
|
||||
"""正向链路:建 → 查 → 改(含换类别)→ 删。"""
|
||||
|
||||
def test_新增产品默认启用且数量单价字符串直出(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
assert data["status"] == 1, "新产品应默认启用"
|
||||
assert data["spec_model"] == "DN100"
|
||||
# 金额红线:str 进 str 出,且数值与入参精确相等(Decimal 比较,不经 float)
|
||||
assert isinstance(data["sale_price"], str)
|
||||
assert Decimal(data["sale_price"]) == Decimal("12.5")
|
||||
assert isinstance(data["stock_quantity"], str)
|
||||
assert Decimal(data["stock_quantity"]) == Decimal("100")
|
||||
|
||||
def test_详情与列表均能查到新增产品(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
detail = client.get(f"{_PRODUCTS}/{data['id']}", headers=normal["headers"])
|
||||
assert detail.status_code == 200, detail.text
|
||||
assert detail.json()["data"]["id"] == data["id"]
|
||||
|
||||
listed = client.get(
|
||||
_PRODUCTS, params={"keyword": data["product_name"]}, headers=normal["headers"]
|
||||
)
|
||||
assert listed.status_code == 200, listed.text
|
||||
assert [r["id"] for r in listed.json()["data"]["list"]] == [data["id"]]
|
||||
|
||||
def test_同名称不同规格创建成功(self, client: TestClient, normal: dict) -> None:
|
||||
name = _pname()
|
||||
first = _create(client, normal["headers"], product_name=name, spec_model="DN100")
|
||||
second = client.post(
|
||||
_PRODUCTS,
|
||||
json=_payload(name, spec_model="DN200"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert second.status_code == 200, second.text
|
||||
assert second.json()["data"]["id"] != first["id"]
|
||||
|
||||
def test_删除产品成功(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
resp = client.delete(f"{_PRODUCTS}/{data['id']}", headers=normal["headers"])
|
||||
assert resp.status_code == 200, resp.text
|
||||
detail = client.get(f"{_PRODUCTS}/{data['id']}", headers=normal["headers"])
|
||||
assert detail.status_code == 404
|
||||
assert "产品不存在" in detail.json()["message"]
|
||||
|
||||
|
||||
class TestDeleteProtection:
|
||||
"""删除保护:被业务/发货明细引用的产品禁删(customer 先例同构)。"""
|
||||
|
||||
def test_被业务明细引用_400且产品仍在(
|
||||
self, client: TestClient, normal: dict, make_business_for_product
|
||||
) -> None:
|
||||
product = _create(client, normal["headers"])
|
||||
business = make_business_for_product(normal["headers"], product["id"])
|
||||
resp = client.delete(f"{_PRODUCTS}/{product['id']}", headers=normal["headers"])
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "引用" in resp.json()["message"]
|
||||
# 产品仍在(引导改走停用而非物理删除)
|
||||
still = client.get(f"{_PRODUCTS}/{product['id']}", headers=normal["headers"])
|
||||
assert still.status_code == 200
|
||||
# 业务明细行确实引用了该产品(护栏:确认保护不是空转)
|
||||
detail = client.get(f"{_BUSINESSES}/{business['id']}", headers=normal["headers"]).json()[
|
||||
"data"
|
||||
]
|
||||
assert detail["items"][0]["product_id"] == product["id"]
|
||||
|
||||
def test_被发货明细引用_400(
|
||||
self, client: TestClient, normal: dict, make_business_for_product
|
||||
) -> None:
|
||||
product = _create(client, normal["headers"])
|
||||
make_business_for_product(normal["headers"], product["id"])
|
||||
# 在业务明细引用之外再挂一笔发货明细(同样引用 products.id)
|
||||
businesses = client.get("/api/v1/business/businesses", headers=normal["headers"]).json()[
|
||||
"data"
|
||||
]
|
||||
business_id = businesses["list"][0]["id"]
|
||||
shipment = client.post(
|
||||
"/api/v1/business/shipments",
|
||||
json={
|
||||
"business_id": business_id,
|
||||
"ship_date": "2026-01-01",
|
||||
"items": [
|
||||
{
|
||||
"product_id": product["id"],
|
||||
"product_name": product["product_name"],
|
||||
"quantity": "1.00",
|
||||
"sale_price": "10.00",
|
||||
}
|
||||
],
|
||||
},
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert shipment.status_code == 200, shipment.text
|
||||
# 此前业务明细引用已令删除被拒,此处再证发货引用同一防线
|
||||
resp = client.delete(f"{_PRODUCTS}/{product['id']}", headers=normal["headers"])
|
||||
assert resp.status_code == 400, resp.text
|
||||
|
||||
|
||||
class TestValidationRules:
|
||||
"""类别值域与组合唯一 —— 核算阈值锚点不脏、业务标识不重复。"""
|
||||
|
||||
def test_重名同规格_400(self, client: TestClient, normal: dict) -> None:
|
||||
name = _pname()
|
||||
_create(client, normal["headers"], product_name=name)
|
||||
dup = client.post(
|
||||
_PRODUCTS,
|
||||
json=_payload(name, spec_model="DN100"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert dup.status_code == 400, dup.text
|
||||
assert "已存在同名称同规格的产品" in dup.json()["message"]
|
||||
|
||||
def test_规格缺省归一空串且重名同空规格仍拦截(self, client: TestClient, normal: dict) -> None:
|
||||
"""组合唯一键对 NULL 不去重:缺省规格若归 NULL 会放行重名同规格数据。"""
|
||||
name = _pname()
|
||||
first = _create(client, normal["headers"], product_name=name, spec_model=None)
|
||||
assert first["spec_model"] == ""
|
||||
dup = client.post(
|
||||
_PRODUCTS,
|
||||
json=_payload(name, spec_model=None),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert dup.status_code == 400, dup.text
|
||||
assert "已存在同名称同规格的产品" in dup.json()["message"]
|
||||
|
||||
def test_产品类别非法_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(
|
||||
_PRODUCTS,
|
||||
json=_payload(_pname(), product_category="not_a_category"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "产品类别不合法" in resp.json()["message"]
|
||||
|
||||
def test_销售单价为负数_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(
|
||||
_PRODUCTS,
|
||||
json=_payload(_pname(), sale_price="-1"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
|
||||
def test_销售单价非数字_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(
|
||||
_PRODUCTS,
|
||||
json=_payload(_pname(), sale_price="abc"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
|
||||
def test_编辑改类别为合法值成功(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
updated = client.put(
|
||||
f"{_PRODUCTS}/{data['id']}",
|
||||
json=_payload(
|
||||
data["product_name"],
|
||||
product_category=PRODUCT_CATEGORY_RAIL_TRANSIT,
|
||||
sale_price="15.8",
|
||||
),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert updated.status_code == 200, updated.text
|
||||
body = updated.json()["data"]
|
||||
assert body["product_category"] == PRODUCT_CATEGORY_RAIL_TRANSIT
|
||||
assert Decimal(body["sale_price"]) == Decimal("15.8")
|
||||
|
||||
|
||||
class TestStatusSwitch:
|
||||
"""启用/停用独立于编辑端点 —— 编辑表单不携带状态,防误触停用。"""
|
||||
|
||||
def test_停用再启用切换(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
data = _create(client, headers)
|
||||
off = client.put(f"{_PRODUCTS}/{data['id']}/status", json={"status": 0}, headers=headers)
|
||||
assert off.status_code == 200, off.text
|
||||
assert off.json()["message"] == "已停用"
|
||||
assert off.json()["data"]["status"] == 0
|
||||
on = client.put(f"{_PRODUCTS}/{data['id']}/status", json={"status": 1}, headers=headers)
|
||||
assert on.status_code == 200, on.text
|
||||
assert on.json()["message"] == "已启用"
|
||||
assert on.json()["data"]["status"] == 1
|
||||
|
||||
|
||||
class TestAudit:
|
||||
"""写操作(含失败)留痕 —— 审计是验收项。"""
|
||||
|
||||
def test_新增产品成功留审计(self, client: TestClient, normal: dict) -> None:
|
||||
data = _create(client, normal["headers"])
|
||||
logs = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_PRODUCT and log.action == ACTION_CREATE
|
||||
]
|
||||
assert logs, "新增产品未留操作日志"
|
||||
latest = logs[0]
|
||||
assert latest.success == 1
|
||||
assert data["product_name"] in latest.summary
|
||||
|
||||
def test_重名失败留审计(self, client: TestClient, normal: dict) -> None:
|
||||
name = _pname()
|
||||
_create(client, normal["headers"], product_name=name)
|
||||
dup = client.post(
|
||||
_PRODUCTS,
|
||||
json=_payload(name, spec_model="DN100"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert dup.status_code == 400, dup.text
|
||||
failed = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_PRODUCT and log.success == 0
|
||||
]
|
||||
assert failed, "失败操作未留痕"
|
||||
assert "已存在同名称同规格的产品" in (failed[0].error_message or "")
|
||||
@@ -0,0 +1,315 @@
|
||||
"""客户评级等级配置接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是评级**判定表**的两条硬约束 —— ① 区间互不重叠:重叠会让同一总分
|
||||
命中多个等级(或两段都跳过),判定表失效,新增与编辑两路都必须校验;
|
||||
② 分值域 0≤min≤max≤100:越界/倒挂的配置直接算错等级。边界相邻不算重叠
|
||||
(前段 max=74、后段 min=75 相邻)是种子铺满 0-100 的铺法,要有正例锁住;
|
||||
「已存在」的名称唯一在先查与 1062 两路都要收敛成 400。
|
||||
|
||||
评级用例会**删改种子**(删除 C、编辑 D 的区间构造相邻/重叠场景),conftest
|
||||
兜底在每个用例后把判定表恢复为种子基线(全删全插,判定表无下游引用),
|
||||
因此种子断言用例(列表全量返回)始终在纯种子上运行。
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
|
||||
数据卫生:测试等级名一律 ``t_`` 前缀;种子(A/B/C/D)的删改由 conftest
|
||||
恢复,删除语义的用例自验 DELETE 端点。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
from decimal import Decimal
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import ACTION_CREATE, MODULE_RATING
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import OperationLog
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_GRADES = "/api/v1/business/rating-grades"
|
||||
|
||||
# 种子基线(与 V5 迁移一致):分数字符串经 DB round-trip 后一位小数(Numeric(5,1))
|
||||
_SEED = [
|
||||
("A", "90.0", "100.0", 1),
|
||||
("B", "75.0", "89.0", 2),
|
||||
("C", "60.0", "74.0", 3),
|
||||
("D", "0.0", "59.0", 4),
|
||||
]
|
||||
|
||||
|
||||
def _tname() -> str:
|
||||
return f"t_等级_{uuid.uuid4().hex[:6]}"
|
||||
|
||||
|
||||
def _gpayload(grade_name: str, min_score: str, max_score: str, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"grade_name": grade_name,
|
||||
"min_score": min_score,
|
||||
"max_score": max_score,
|
||||
"sort_order": 99,
|
||||
"remark": "t_评级测试",
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _seed_id(client: TestClient, headers: dict, grade_name: str) -> int:
|
||||
"""从判定表列表取种子等级 id(种子由迁移初始化,主键不可假造)。"""
|
||||
rows = client.get(_GRADES, headers=headers).json()["data"]
|
||||
match = next(row for row in rows if row["grade_name"] == grade_name)
|
||||
return match["id"]
|
||||
|
||||
|
||||
def _drop_seed(client: TestClient, headers: dict, grade_name: str) -> None:
|
||||
"""删掉种子等级,为测试等级清出分值空隙(种子由 conftest 兜底恢复)。
|
||||
|
||||
种子铺满 0-100 —— 凡要创建/编辑测试等级的用例,必须先清出与既有等级
|
||||
完全分离的空隙,否则重叠约束(设计如此)一律 400。
|
||||
"""
|
||||
resp = client.delete(f"{_GRADES}/{_seed_id(client, headers, grade_name)}", headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
|
||||
def _names(client: TestClient, headers: dict) -> list[str]:
|
||||
return [row["grade_name"] for row in client.get(_GRADES, headers=headers).json()["data"]]
|
||||
|
||||
|
||||
def _logs_of(username: str) -> list[OperationLog]:
|
||||
"""取某操作人的审计行(按 id 倒序,最新在前)。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return list(
|
||||
session.execute(
|
||||
select(OperationLog)
|
||||
.where(OperationLog.username == username)
|
||||
.order_by(OperationLog.id.desc())
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
class TestAuth:
|
||||
"""鉴权:评级配置属业务操作不要求管理员,但仍是登录后接口。"""
|
||||
|
||||
def test_未登录访问评级等级列表_401(self, client: TestClient) -> None:
|
||||
resp = client.get(_GRADES)
|
||||
assert resp.status_code == 401, resp.text
|
||||
|
||||
|
||||
class TestOverlapGuardLock:
|
||||
"""区间重叠判定的并发防线:判重叠的 list_all 必须带 FOR UPDATE。
|
||||
|
||||
区间重叠无唯一键可拦(名称才有 uk),无锁时两管理员并发提交重叠区间
|
||||
会互判不重叠而双双入库。双连接真并发需线程与锁等待控制,此处锁定
|
||||
SQL 形态两条口径:for_update 编译产物含 FOR UPDATE、只读直出不含。
|
||||
"""
|
||||
|
||||
def test_判重叠查询带FOR_UPDATE_只读直出不带(self) -> None:
|
||||
from app.models import CustomerRatingGrade
|
||||
|
||||
locked = (
|
||||
select(CustomerRatingGrade)
|
||||
.order_by(CustomerRatingGrade.sort_order, CustomerRatingGrade.id)
|
||||
.with_for_update()
|
||||
)
|
||||
assert "FOR UPDATE" in str(locked.compile())
|
||||
plain = select(CustomerRatingGrade).order_by(CustomerRatingGrade.sort_order)
|
||||
assert "FOR UPDATE" not in str(plain.compile())
|
||||
|
||||
|
||||
class TestList:
|
||||
"""列表直出种子基线:判定表是前端评级计算器的唯一数据源。"""
|
||||
|
||||
def test_种子四等级全量返回_按sort_order升序(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.get(_GRADES, headers=normal["headers"])
|
||||
assert resp.status_code == 200, resp.text
|
||||
rows = resp.json()["data"]
|
||||
assert [(r["grade_name"], r["sort_order"]) for r in rows] == [
|
||||
(name, order) for name, _, _, order in _SEED
|
||||
], rows
|
||||
# 分值红线:str 出参且与种子精确相等(Decimal 比较,不经 float)
|
||||
for row, (_, min_score, max_score, _) in zip(rows, _SEED, strict=True):
|
||||
assert Decimal(row["min_score"]) == Decimal(min_score)
|
||||
assert Decimal(row["max_score"]) == Decimal(max_score)
|
||||
|
||||
|
||||
class TestCreate:
|
||||
"""新增:区间合法(0≤min≤max≤100)、互不重叠、名称唯一 —— 三条硬约束
|
||||
任一缺失都会算错等级。"""
|
||||
|
||||
def test_删除种子后新增相邻区间_成功且判定表更新(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
"""种子铺满 0-100,任何新区间都与某条重叠 —— 先删 C(60-74),
|
||||
新增 60-74 与 D(0-59)/B(75-89) **边界相邻不算重叠**(正例)。"""
|
||||
headers = normal["headers"]
|
||||
client.delete(f"{_GRADES}/{_seed_id(client, headers, 'C')}", headers=headers)
|
||||
resp = client.post(
|
||||
_GRADES, json=_gpayload("t_E", "60", "74", sort_order=5), headers=headers
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
body = resp.json()["data"]
|
||||
assert Decimal(body["min_score"]) == Decimal("60")
|
||||
assert Decimal(body["max_score"]) == Decimal("74")
|
||||
assert body["sort_order"] == 5
|
||||
|
||||
rows = client.get(_GRADES, headers=headers).json()["data"]
|
||||
assert _names(client, headers) == ["A", "B", "D", "t_E"], rows
|
||||
|
||||
def test_区间倒挂_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(_GRADES, json=_gpayload(_tname(), "80", "10"), headers=normal["headers"])
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "分值区间不合法" in resp.json()["message"], resp.text
|
||||
|
||||
def test_分值超上限_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(
|
||||
_GRADES, json=_gpayload(_tname(), "95", "150"), headers=normal["headers"]
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "分值区间不合法" in resp.json()["message"], resp.text
|
||||
|
||||
def test_分值负下限_400(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(_GRADES, json=_gpayload(_tname(), "-5", "10"), headers=normal["headers"])
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "分值区间不合法" in resp.json()["message"], resp.text
|
||||
|
||||
def test_等级名称已存在_400(self, client: TestClient, normal: dict) -> None:
|
||||
"""先删 D 清出空隙:重叠校验在名称唯一校验之前,不清空隙会先撞
|
||||
「与等级 D 重叠」而走不到名称校验。"""
|
||||
headers = normal["headers"]
|
||||
_drop_seed(client, headers, "D")
|
||||
resp = client.post(_GRADES, json=_gpayload("A", "10", "20"), headers=headers)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "该等级名称已存在" in resp.json()["message"], resp.text
|
||||
|
||||
def test_新增与种子重叠_400点名冲突等级(self, client: TestClient, normal: dict) -> None:
|
||||
"""85-95 与种子 A(90-100) 闭区间相交 → 400 并点名 A,前端据此定位行。"""
|
||||
resp = client.post(_GRADES, json=_gpayload(_tname(), "85", "95"), headers=normal["headers"])
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "分值区间与等级 A 重叠" in resp.json()["message"], resp.text
|
||||
# 失败不落库:判定表仍是 4 条种子
|
||||
assert _names(client, normal["headers"]) == ["A", "B", "C", "D"]
|
||||
|
||||
|
||||
class TestEdit:
|
||||
"""编辑以修改后的区间对全部既有等级(排除自身)两两相交 —— 编辑路与
|
||||
新增路共用重叠约束,两处都要拦。"""
|
||||
|
||||
def test_编辑与其他等级重叠_400点名冲突等级(self, client: TestClient, normal: dict) -> None:
|
||||
"""把 B 编辑为 60-65:与 C(60-74) 相交 → 点名 C;与 D(0-59)/A 均分离。"""
|
||||
headers = normal["headers"]
|
||||
b_id = _seed_id(client, headers, "B")
|
||||
resp = client.put(
|
||||
f"{_GRADES}/{b_id}",
|
||||
json=_gpayload("B", "60", "65", sort_order=2),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "分值区间与等级 C 重叠" in resp.json()["message"], resp.text
|
||||
# 失败不落库:种子保持原样
|
||||
assert _names(client, headers) == ["A", "B", "C", "D"]
|
||||
|
||||
def test_编辑相邻区间_成功且判定表更新(self, client: TestClient, normal: dict) -> None:
|
||||
"""删除 C 后把 D 编辑为 0-74:与 B(75-89) **边界相邻不算重叠**
|
||||
(74 与 75 相邻),这是种子铺法的正例。"""
|
||||
headers = normal["headers"]
|
||||
client.delete(f"{_GRADES}/{_seed_id(client, headers, 'C')}", headers=headers)
|
||||
d_id = _seed_id(client, headers, "D")
|
||||
resp = client.put(
|
||||
f"{_GRADES}/{d_id}",
|
||||
json=_gpayload("D", "0", "74", sort_order=4),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
rows = client.get(_GRADES, headers=headers).json()["data"]
|
||||
assert [(r["grade_name"], r["sort_order"]) for r in rows] == [("A", 1), ("B", 2), ("D", 4)]
|
||||
assert Decimal(rows[2]["max_score"]) == Decimal("74"), rows[2]
|
||||
|
||||
def test_编辑回显改名与分数(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
_drop_seed(client, headers, "D") # 清出 0-59 空隙供测试等级落脚
|
||||
grade_name = _tname()
|
||||
created = client.post(
|
||||
_GRADES, json=_gpayload(grade_name, "10", "20", sort_order=50), headers=headers
|
||||
)
|
||||
assert created.status_code == 200, created.text
|
||||
grade_id = created.json()["data"]["id"]
|
||||
|
||||
new_name = _tname()
|
||||
updated = client.put(
|
||||
f"{_GRADES}/{grade_id}",
|
||||
json=_gpayload(new_name, "15", "25", sort_order=60, remark="t_改"),
|
||||
headers=headers,
|
||||
)
|
||||
assert updated.status_code == 200, updated.text
|
||||
body = updated.json()["data"]
|
||||
assert body["grade_name"] == new_name
|
||||
assert Decimal(body["min_score"]) == Decimal("15")
|
||||
assert Decimal(body["max_score"]) == Decimal("25")
|
||||
assert body["sort_order"] == 60
|
||||
|
||||
rows = client.get(_GRADES, headers=headers).json()["data"]
|
||||
match = next(r for r in rows if r["id"] == grade_id)
|
||||
assert match["grade_name"] == new_name
|
||||
assert Decimal(match["min_score"]) == Decimal("15")
|
||||
|
||||
|
||||
class TestDelete:
|
||||
"""删除允许清空(评级是纯计算器、评分记录不落库)—— 删除后判定表
|
||||
立即反映,二次删除 404。"""
|
||||
|
||||
def test_删除等级后判定表更新_二次删除404(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
_drop_seed(client, headers, "D") # 清出 0-59 空隙供测试等级落脚
|
||||
grade_name = _tname()
|
||||
created = client.post(
|
||||
_GRADES, json=_gpayload(grade_name, "30.5", "40.5", sort_order=50), headers=headers
|
||||
)
|
||||
assert created.status_code == 200, created.text
|
||||
grade_id = created.json()["data"]["id"]
|
||||
assert grade_name in _names(client, headers)
|
||||
|
||||
assert client.delete(f"{_GRADES}/{grade_id}", headers=headers).status_code == 200
|
||||
assert grade_name not in _names(client, headers)
|
||||
|
||||
again = client.delete(f"{_GRADES}/{grade_id}", headers=headers)
|
||||
assert again.status_code == 404, again.text
|
||||
assert "评级等级不存在" in again.json()["message"], again.text
|
||||
|
||||
|
||||
class TestAudit:
|
||||
"""写操作(含校验失败的)都在 operation_logs 留痕 —— 审计是验收项。"""
|
||||
|
||||
def test_新增等级成功留审计(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
_drop_seed(client, headers, "D") # 清出 0-59 空隙供测试等级落脚
|
||||
grade_name = _tname()
|
||||
resp = client.post(
|
||||
_GRADES,
|
||||
json=_gpayload(grade_name, "30.5", "40.5", sort_order=50),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
logs = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_RATING and log.action == ACTION_CREATE
|
||||
]
|
||||
assert logs, "新增评级等级未留操作日志"
|
||||
latest = logs[0]
|
||||
assert latest.success == 1
|
||||
assert grade_name in latest.summary
|
||||
|
||||
def test_重叠失败留审计(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(_GRADES, json=_gpayload(_tname(), "85", "95"), headers=normal["headers"])
|
||||
assert resp.status_code == 400, resp.text
|
||||
failed = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_RATING and log.success == 0
|
||||
]
|
||||
assert failed, "失败操作未留痕"
|
||||
assert "分值区间与等级 A 重叠" in (failed[0].error_message or ""), failed[0]
|
||||
@@ -0,0 +1,378 @@
|
||||
"""回款管理接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是回款的数据完整性三道线 —— ① 发货批次同业务强校验:跨业务指定会让
|
||||
回款天数与台账归属漂移;② settlement_status 是 M3 核算防重锚点(需规
|
||||
2.3.3「每笔回款仅核算一次」),已核算禁改禁删缺失会让台账与源数据漂移;
|
||||
③ total_received_amount 回写是 M3 起付判定的直接消费源,删行漏算即漂移。
|
||||
payment_days 为只读派生值,锁定「发货日首日计第 1 天」口径。
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
|
||||
数据卫生:人员/公司/产品名一律 ``t_`` 前缀由 conftest 兜底清理;回款批次
|
||||
编号系统生成(HK 前缀),conftest 按编号前缀全量清;「已核算」的造数走
|
||||
直接改库(M2 只写 0、置位是 M3 职责),M3 核算置位语义不绕开。
|
||||
"""
|
||||
|
||||
import re
|
||||
import uuid
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import ACTION_CREATE, MODULE_RECEIPT
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import OperationLog, Receipt
|
||||
from app.models.receipt import SETTLEMENT_DONE
|
||||
from tests.integration.factories import create_business as _create_business
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
_SHIPMENTS = "/api/v1/business/shipments"
|
||||
_RECEIPTS = "/api/v1/business/receipts"
|
||||
|
||||
|
||||
def _sitem(**overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"product_name": f"t_产品_{uuid.uuid4().hex[:8]}",
|
||||
"quantity": "1",
|
||||
"sale_price": "500.00",
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _spayload(business_id: int, ship_date: str, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"business_id": business_id,
|
||||
"ship_date": ship_date,
|
||||
"items": [_sitem()],
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _create_shipment(client: TestClient, headers: dict, business_id: int, ship_date: str) -> dict:
|
||||
resp = client.post(_SHIPMENTS, json=_spayload(business_id, ship_date), headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _rpayload(business_id: int, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"business_id": business_id,
|
||||
"receipt_date": str(date.today()),
|
||||
"amount": "1200.00",
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _create(client: TestClient, headers: dict, business_id: int, **overrides: object) -> dict:
|
||||
resp = client.post(_RECEIPTS, json=_rpayload(business_id, **overrides), headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _terminate(client: TestClient, headers: dict, business_id: int) -> None:
|
||||
"""把业务流转到已终止(终态禁写场景的造数步骤)。"""
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{business_id}/status",
|
||||
json={"status": 3, "reason": f"t_终止_{uuid.uuid4().hex[:6]}"},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
|
||||
def _settle(receipt_id: int) -> None:
|
||||
"""已核算造数:M2 只写 0,置 1 由 M3 核算负责 —— 测试直接改库模拟置位,
|
||||
不绕开「M2 不置位」的实现约定。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
row = session.get(Receipt, receipt_id)
|
||||
assert row is not None, "回款行不存在"
|
||||
row.settlement_status = SETTLEMENT_DONE
|
||||
session.commit()
|
||||
|
||||
|
||||
def _logs_of(username: str) -> list[OperationLog]:
|
||||
"""取某操作人的审计行(按 id 倒序,最新在前)。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return list(
|
||||
session.execute(
|
||||
select(OperationLog)
|
||||
.where(OperationLog.username == username)
|
||||
.order_by(OperationLog.id.desc())
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
class TestAuth:
|
||||
"""鉴权:业务数据属业务操作不要求管理员,但仍是登录后接口。"""
|
||||
|
||||
def test_未登录访问回款列表_401(self, client: TestClient) -> None:
|
||||
resp = client.get(_RECEIPTS)
|
||||
assert resp.status_code == 401, resp.text
|
||||
|
||||
|
||||
class TestCreate:
|
||||
"""创建:HK 批次契约、金额红线、回款天数派生与业务合计回写。"""
|
||||
|
||||
def test_新增回款_批次号格式_未指定批次_无派生(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(client, headers, business["id"])
|
||||
|
||||
# 批次号格式:HK{YYYYMMDD}-{4位当日序号}(日期取当日)
|
||||
expected_prefix = f"HK{date.today():%Y%m%d}-"
|
||||
assert re.fullmatch(r"HK\d{8}-\d{4}", data["receipt_batch_no"]), data["receipt_batch_no"]
|
||||
assert data["receipt_batch_no"].startswith(expected_prefix), data["receipt_batch_no"]
|
||||
|
||||
# 未指定批次(shipment_id 空):批次可暂不指定,回款天数无从派生
|
||||
assert data["shipment_id"] is None
|
||||
assert data["shipment_no"] is None
|
||||
assert data["payment_days"] is None
|
||||
# M2 只写 0:置 1 由 M3 核算负责
|
||||
assert data["settlement_status"] == 0
|
||||
assert Decimal(data["amount"]) == Decimal("1200")
|
||||
|
||||
def test_指定批次_回款天数发货日首日计第1天(self, client: TestClient, normal: dict) -> None:
|
||||
"""发货 2026-10-05 / 回款 2026-11-02 → 29 天(首日计第 1 天,
|
||||
需规「26 天」示例已作废)。"""
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
shipment = _create_shipment(client, headers, business["id"], "2026-10-05")
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
business["id"],
|
||||
shipment_id=shipment["id"],
|
||||
receipt_date="2026-11-02",
|
||||
amount="500.00",
|
||||
)
|
||||
assert data["shipment_id"] == shipment["id"]
|
||||
assert data["shipment_no"] == shipment["shipment_no"]
|
||||
assert data["payment_days"] == 29, data
|
||||
|
||||
def test_新增回款_业务合计回写_删除后回退(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(client, headers, business["id"])
|
||||
|
||||
after = client.get(f"{_BUSINESSES}/{business['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(after["total_received_amount"]) == Decimal("1200")
|
||||
|
||||
assert client.delete(f"{_RECEIPTS}/{data['id']}", headers=headers).status_code == 200
|
||||
rollback = client.get(f"{_BUSINESSES}/{business['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(rollback["total_received_amount"]) == Decimal("0")
|
||||
|
||||
def test_业务不存在_404(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(_RECEIPTS, json=_rpayload(999999999), headers=normal["headers"])
|
||||
assert resp.status_code == 404, resp.text
|
||||
assert "业务不存在" in resp.json()["message"], resp.text
|
||||
|
||||
def test_终态业务禁新增回款_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
_terminate(client, headers, business["id"])
|
||||
resp = client.post(_RECEIPTS, json=_rpayload(business["id"]), headers=headers)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "业务已完成或已终止,禁止新增回款" in resp.json()["message"], resp.text
|
||||
|
||||
def test_金额负数_400(self, client: TestClient, normal: dict) -> None:
|
||||
"""一期禁负数金额(红字/退款冲销需求出现时先补设计再放开)。"""
|
||||
business = _create_business(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_RECEIPTS, json=_rpayload(business["id"], amount="-1"), headers=normal["headers"]
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "不能为负数" in resp.json()["message"], resp.text
|
||||
|
||||
def test_金额三位小数_400(self, client: TestClient, normal: dict) -> None:
|
||||
"""小数位超限直接拒绝而非静默舍入 —— 舍入即算错钱。"""
|
||||
business = _create_business(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_RECEIPTS,
|
||||
json=_rpayload(business["id"], amount="12.345"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "最多两位小数" in resp.json()["message"], resp.text
|
||||
|
||||
|
||||
class TestCrossBusiness:
|
||||
"""发货批次同业务强校验 —— 两类失败(不存在/跨业务)统一文案,防响应
|
||||
差异探测发货单存在性。"""
|
||||
|
||||
def test_跨业务指定发货批次_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business1 = _create_business(client, headers)
|
||||
shipment = _create_shipment(client, headers, business1["id"], str(date.today()))
|
||||
business2 = _create_business(client, headers)
|
||||
|
||||
resp = client.post(
|
||||
_RECEIPTS,
|
||||
json=_rpayload(business2["id"], shipment_id=shipment["id"]),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "发货批次不属于该业务,无法指定" in resp.json()["message"], resp.text
|
||||
|
||||
def test_编辑时指定跨业务发货批次_400(self, client: TestClient, normal: dict) -> None:
|
||||
"""编辑路径(全量替换)同样强校验,无「未变即免检」旁路。"""
|
||||
headers = normal["headers"]
|
||||
business1 = _create_business(client, headers)
|
||||
shipment = _create_shipment(client, headers, business1["id"], str(date.today()))
|
||||
business2 = _create_business(client, headers)
|
||||
data = _create(client, headers, business2["id"])
|
||||
|
||||
resp = client.put(
|
||||
f"{_RECEIPTS}/{data['id']}",
|
||||
json={
|
||||
"shipment_id": shipment["id"],
|
||||
"receipt_date": str(date.today()),
|
||||
"amount": "1200.00",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "发货批次不属于该业务,无法指定" in resp.json()["message"], resp.text
|
||||
|
||||
def test_编辑回款_全量替换_派生值实时刷新(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
shipment = _create_shipment(client, headers, business["id"], "2026-10-05")
|
||||
data = _create(client, headers, business["id"])
|
||||
assert data["payment_days"] is None
|
||||
|
||||
specified = client.put(
|
||||
f"{_RECEIPTS}/{data['id']}",
|
||||
json={
|
||||
"shipment_id": shipment["id"],
|
||||
"receipt_date": "2026-11-02",
|
||||
"amount": "300.00",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert specified.status_code == 200, specified.text
|
||||
body = specified.json()["data"]
|
||||
assert body["payment_days"] == 29, "指定批次后回款天数按发货日首日派生"
|
||||
assert body["shipment_no"] == shipment["shipment_no"]
|
||||
|
||||
cleared = client.put(
|
||||
f"{_RECEIPTS}/{data['id']}",
|
||||
json={
|
||||
"shipment_id": None,
|
||||
"receipt_date": "2026-11-02",
|
||||
"amount": "300.00",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert cleared.status_code == 200, cleared.text
|
||||
assert cleared.json()["data"]["payment_days"] is None, "清除指定后派生值回 null"
|
||||
|
||||
|
||||
class TestSettled:
|
||||
"""已核算回款禁改禁删(M3 核算防重锚点)—— 台账固化后源数据禁漂移。"""
|
||||
|
||||
def test_已核算禁改_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(client, headers, business["id"])
|
||||
_settle(data["id"])
|
||||
|
||||
resp = client.put(
|
||||
f"{_RECEIPTS}/{data['id']}",
|
||||
json={
|
||||
"shipment_id": None,
|
||||
"receipt_date": str(date.today()),
|
||||
"amount": "9999.00",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "已核算回款禁止修改" in resp.json()["message"], resp.text
|
||||
|
||||
def test_已核算禁删_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(client, headers, business["id"])
|
||||
_settle(data["id"])
|
||||
|
||||
resp = client.delete(f"{_RECEIPTS}/{data['id']}", headers=headers)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "已核算回款禁止删除" in resp.json()["message"], resp.text
|
||||
|
||||
|
||||
class TestFilter:
|
||||
"""核算状态筛选(M3 核算消费的入口口径)。"""
|
||||
|
||||
def test_settlement_status筛选_0只回未核算_1只回已核算(
|
||||
self, client: TestClient, normal: dict
|
||||
) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
pending = _create(client, headers, business["id"], amount="500.00")
|
||||
settled = _create(client, headers, business["id"], amount="700.00")
|
||||
_settle(settled["id"])
|
||||
|
||||
resp0 = client.get(
|
||||
_RECEIPTS,
|
||||
params={"business_id": business["id"], "settlement_status": 0},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp0.status_code == 200, resp0.text
|
||||
rows0 = resp0.json()["data"]["list"]
|
||||
assert [r["id"] for r in rows0] == [pending["id"]], rows0
|
||||
assert rows0[0]["settlement_status"] == 0
|
||||
|
||||
resp1 = client.get(
|
||||
_RECEIPTS,
|
||||
params={"business_id": business["id"], "settlement_status": 1},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp1.status_code == 200, resp1.text
|
||||
rows1 = resp1.json()["data"]["list"]
|
||||
assert [r["id"] for r in rows1] == [settled["id"]], rows1
|
||||
|
||||
|
||||
class TestAudit:
|
||||
"""写操作(含校验失败的)都在 operation_logs 留痕 —— 审计是验收项。"""
|
||||
|
||||
def test_新增回款成功留审计(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(client, headers, business["id"])
|
||||
logs = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_RECEIPT and log.action == ACTION_CREATE
|
||||
]
|
||||
assert logs, "新增回款未留操作日志"
|
||||
latest = logs[0]
|
||||
assert latest.success == 1
|
||||
assert "新增回款" in latest.summary
|
||||
assert data["receipt_batch_no"] in latest.summary
|
||||
|
||||
def test_跨业务指定失败留审计(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business1 = _create_business(client, headers)
|
||||
shipment = _create_shipment(client, headers, business1["id"], str(date.today()))
|
||||
business2 = _create_business(client, headers)
|
||||
resp = client.post(
|
||||
_RECEIPTS,
|
||||
json=_rpayload(business2["id"], shipment_id=shipment["id"]),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
failed = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_RECEIPT and log.success == 0
|
||||
]
|
||||
assert failed, "失败操作未留痕"
|
||||
assert "发货批次不属于该业务" in (failed[0].error_message or ""), failed[0]
|
||||
@@ -28,10 +28,14 @@ _CREATE_TABLE = re.compile(r"CREATE TABLE\s+`?(\w+)`?\s*\((.*?)\n\)", re.DOTALL)
|
||||
_COLUMN_LINE = re.compile(r"^\s{4}`?(\w+)`?\s", re.MULTILINE)
|
||||
# 这些开头的是约束定义,不是列定义
|
||||
_NON_COLUMN_KEYWORDS = {"CONSTRAINT", "PRIMARY", "UNIQUE", "FOREIGN", "KEY", "INDEX"}
|
||||
# ALTER TABLE 的列级变更(语义重放用):ADD COLUMN / DROP COLUMN;
|
||||
# MODIFY 只改类型不改列名,对列集合无影响,无需处理
|
||||
_ALTER_ADD = re.compile(r"ALTER TABLE\s+`?(\w+)`?\s+ADD(?:\s+COLUMN)?\s+`?(\w+)`?", re.IGNORECASE)
|
||||
_ALTER_DROP = re.compile(r"ALTER TABLE\s+`?(\w+)`?\s+DROP(?:\s+COLUMN)?\s+`?(\w+)`?", re.IGNORECASE)
|
||||
|
||||
|
||||
def _parse_tables(sql: str) -> dict[str, set[str]]:
|
||||
"""从 SQL 文本中提取 {表名: {列名集合}}。"""
|
||||
"""从 SQL 文本中提取 {表名: {列名集合}}(仅 CREATE TABLE 的静态解析)。"""
|
||||
tables: dict[str, set[str]] = {}
|
||||
for table_name, body in _CREATE_TABLE.findall(sql):
|
||||
tables[table_name] = {
|
||||
@@ -42,6 +46,27 @@ def _parse_tables(sql: str) -> dict[str, set[str]]:
|
||||
return tables
|
||||
|
||||
|
||||
def _migration_final_state(paths: list[Path]) -> dict[str, set[str]]:
|
||||
"""按文件序重放迁移脚本,得到迁移链**终态**的 {表名: {列名集合}}。
|
||||
|
||||
早前实现把全部脚本的 CREATE 列做并集:某表日后被 ALTER DROP COLUMN
|
||||
时,并集里旧列名永远存在,init-dev.sql 必须保留死列才能过测 —— 守卫
|
||||
会主动背书一份与生产结构漂移的开发库 DDL。按序重放 ADD/DROP 后,
|
||||
比对基准才是终态(CHANGE RENAME 列名出现时重放会报差异,属人工核对
|
||||
的正确时机:改名同时牵动 init-dev 与 ORM,须人来确认两处同步)。
|
||||
"""
|
||||
merged: dict[str, set[str]] = {}
|
||||
for path in paths:
|
||||
sql = path.read_text(encoding="utf-8")
|
||||
for table, columns in _parse_tables(sql).items():
|
||||
merged.setdefault(table, set()).update(columns)
|
||||
for table, column in _ALTER_ADD.findall(sql):
|
||||
merged.setdefault(table, set()).add(column)
|
||||
for table, column in _ALTER_DROP.findall(sql):
|
||||
merged.setdefault(table, set()).discard(column)
|
||||
return merged
|
||||
|
||||
|
||||
def _alembic_head() -> str:
|
||||
"""从迁移脚本推断当前 head 版本号。
|
||||
|
||||
@@ -65,15 +90,10 @@ def _alembic_head() -> str:
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def migration_tables() -> dict[str, set[str]]:
|
||||
"""合并解析 db/migration/ 下全部 V*.sql。"""
|
||||
"""按文件序重放 db/migration/ 下全部 V*.sql,取迁移链终态。"""
|
||||
files = sorted(MIGRATION_DIR.glob("V*.sql"))
|
||||
assert files, f"未找到迁移脚本:{MIGRATION_DIR}"
|
||||
|
||||
merged: dict[str, set[str]] = {}
|
||||
for path in files:
|
||||
for table, columns in _parse_tables(path.read_text(encoding="utf-8")).items():
|
||||
merged.setdefault(table, set()).update(columns)
|
||||
return merged
|
||||
return _migration_final_state(files)
|
||||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
@@ -109,7 +129,7 @@ class TestSchemaSync:
|
||||
class TestSeedData:
|
||||
"""字典数据与版本标记。"""
|
||||
|
||||
@pytest.mark.parametrize("role_code", ["admin", "user"])
|
||||
@pytest.mark.parametrize("role_code", ["admin", "user", "marketing_ops", "finance", "leader"])
|
||||
def test_角色初始化数据在两处都存在(self, role_code: str) -> None:
|
||||
migration_sql = "\n".join(
|
||||
path.read_text(encoding="utf-8") for path in sorted(MIGRATION_DIR.glob("V*.sql"))
|
||||
|
||||
@@ -0,0 +1,211 @@
|
||||
"""二次分配方案录入(业务创建/编辑同事务)集成测试。
|
||||
|
||||
守的是(计划 T3 验收):
|
||||
- 创建带方案 → 详情回显含 personnel_name 冗余与比例
|
||||
- 编辑全量替换(空数组=清空)
|
||||
- 离职/不存在人员 → 400「分摊参与人员不存在或已离职」
|
||||
- 终态业务禁改方案(与编辑终态门槛同一口径)
|
||||
- 合计不强制 100%:hint 展示合计与余额(余额归属待澄清 #2)
|
||||
- 删除保护:被方案引用的人员 RESTRICT 禁删(400 而非静默剥离)
|
||||
- 人员删除后方案回显仍有名(personnel_name 固化的意义)
|
||||
|
||||
人员造数走 /api/v1/base/personnel(种子营销员岗位);离职用状态端点。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from tests.integration.factories import business_payload, customer
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
_PERSONNEL = "/api/v1/base/personnel"
|
||||
|
||||
|
||||
def _person(client: TestClient, headers: dict, **overrides: object) -> dict:
|
||||
role_id = overrides.pop("business_role_id", None)
|
||||
body = {
|
||||
"personnel_name": f"t_分摊_{uuid.uuid4().hex[:8]}",
|
||||
"business_role_id": role_id or _any_role_id(),
|
||||
"salary_standard": "3000.00",
|
||||
**overrides,
|
||||
}
|
||||
resp = client.post(_PERSONNEL, json=body, headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _any_role_id() -> int:
|
||||
"""种子营销员岗位 ID(内置启用)。"""
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import BUSINESS_ROLE_SALESPERSON
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import BusinessRole
|
||||
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return int(
|
||||
session.execute(
|
||||
select(BusinessRole.id).where(
|
||||
BusinessRole.role_code == BUSINESS_ROLE_SALESPERSON,
|
||||
BusinessRole.status == 1,
|
||||
)
|
||||
).scalar_one()
|
||||
)
|
||||
|
||||
|
||||
def _create_with_allocations(client: TestClient, headers: dict, allocations: list[dict]) -> dict:
|
||||
cust = customer(client, headers)
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=business_payload(cust["id"], secondary_allocations=allocations),
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _detail(client: TestClient, headers: dict, business_id: int) -> dict:
|
||||
resp = client.get(f"{_BUSINESSES}/{business_id}", headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
class TestCreateAndEcho:
|
||||
"""创建带方案与详情回显。"""
|
||||
|
||||
def test_带方案创建_详情回显姓名与比例(self, client: TestClient, admin: dict) -> None:
|
||||
p1 = _person(client, admin["headers"])
|
||||
p2 = _person(client, admin["headers"])
|
||||
data = _create_with_allocations(
|
||||
client,
|
||||
admin["headers"],
|
||||
[
|
||||
{"personnel_id": p1["id"], "ratio": "30.00"},
|
||||
{"personnel_id": p2["id"], "ratio": "20.00"},
|
||||
],
|
||||
)
|
||||
detail = _detail(client, admin["headers"], data["id"])
|
||||
assert len(detail["secondary_allocations"]) == 2
|
||||
names = {a["personnel_name"] for a in detail["secondary_allocations"]}
|
||||
assert p1["personnel_name"] in names and p2["personnel_name"] in names
|
||||
ratios = sorted(a["ratio"] for a in detail["secondary_allocations"])
|
||||
assert ratios == ["20.00", "30.00"]
|
||||
# 合计 50%,余额 50% —— 只提示不落库(待澄清 #2)
|
||||
assert "50.00" in (detail["allocation_hint"] or "")
|
||||
assert "余额" in (detail["allocation_hint"] or "")
|
||||
|
||||
def test_不建方案_详情为空且无hint(self, client: TestClient, admin: dict) -> None:
|
||||
data = _create_with_allocations(client, admin["headers"], [])
|
||||
detail = _detail(client, admin["headers"], data["id"])
|
||||
assert detail["secondary_allocations"] == []
|
||||
assert detail["allocation_hint"] is None
|
||||
|
||||
def test_合计满额_hint只报合计(self, client: TestClient, admin: dict) -> None:
|
||||
p1 = _person(client, admin["headers"])
|
||||
p2 = _person(client, admin["headers"])
|
||||
data = _create_with_allocations(
|
||||
client,
|
||||
admin["headers"],
|
||||
[
|
||||
{"personnel_id": p1["id"], "ratio": "60"},
|
||||
{"personnel_id": p2["id"], "ratio": "40.00"},
|
||||
],
|
||||
)
|
||||
hint = _detail(client, admin["headers"], data["id"])["allocation_hint"]
|
||||
assert hint is not None and "余额" not in hint
|
||||
|
||||
|
||||
class TestGuards:
|
||||
"""校验链:在职/终态/去重已由 schema 层覆盖,此处打服务层口径。"""
|
||||
|
||||
def test_离职人员参与被拒(self, client: TestClient, admin: dict) -> None:
|
||||
p = _person(client, admin["headers"])
|
||||
resp = client.put(
|
||||
f"{_PERSONNEL}/{p['id']}/status", json={"status": 0}, headers=admin["headers"]
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
cust = customer(client, admin["headers"])
|
||||
resp = client.post(
|
||||
_BUSINESSES,
|
||||
json=business_payload(
|
||||
cust["id"],
|
||||
secondary_allocations=[{"personnel_id": p["id"], "ratio": "50.00"}],
|
||||
),
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 400
|
||||
assert "分摊参与" in resp.json()["message"]
|
||||
|
||||
def test_终态业务禁改方案(self, client: TestClient, admin: dict) -> None:
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_allocations(
|
||||
client, admin["headers"], [{"personnel_id": p["id"], "ratio": "100"}]
|
||||
)
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{data['id']}/status",
|
||||
json={"status": 2},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
detail = _detail(client, admin["headers"], data["id"])
|
||||
payload = business_payload(detail["customer_id"], secondary_allocations=[])
|
||||
for key in ("business_no", "status", "owner_personnel_id", "total_sale_amount"):
|
||||
payload.pop(key, None)
|
||||
resp = client.put(f"{_BUSINESSES}/{data['id']}", json=payload, headers=admin["headers"])
|
||||
assert resp.status_code == 400
|
||||
assert "禁止编辑" in resp.json()["message"]
|
||||
|
||||
def test_编辑全量替换与清空(self, client: TestClient, admin: dict) -> None:
|
||||
p1 = _person(client, admin["headers"])
|
||||
p2 = _person(client, admin["headers"])
|
||||
data = _create_with_allocations(
|
||||
client, admin["headers"], [{"personnel_id": p1["id"], "ratio": "40.00"}]
|
||||
)
|
||||
|
||||
detail = _detail(client, admin["headers"], data["id"])
|
||||
payload = business_payload(
|
||||
detail["customer_id"],
|
||||
secondary_allocations=[{"personnel_id": p2["id"], "ratio": "70.00"}],
|
||||
)
|
||||
resp = client.put(f"{_BUSINESSES}/{data['id']}", json=payload, headers=admin["headers"])
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
replaced = _detail(client, admin["headers"], data["id"])
|
||||
assert len(replaced["secondary_allocations"]) == 1
|
||||
assert replaced["secondary_allocations"][0]["personnel_id"] == p2["id"]
|
||||
|
||||
payload = business_payload(detail["customer_id"], secondary_allocations=[])
|
||||
resp = client.put(f"{_BUSINESSES}/{data['id']}", json=payload, headers=admin["headers"])
|
||||
assert resp.status_code == 200, resp.text
|
||||
assert _detail(client, admin["headers"], data["id"])["secondary_allocations"] == []
|
||||
|
||||
|
||||
class TestDeleteProtection:
|
||||
"""RESTRICT 外键:被方案引用的人员禁删,方案随业务删除而清。"""
|
||||
|
||||
def test_被方案引用的人员禁删(self, client: TestClient, admin: dict) -> None:
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_allocations(
|
||||
client, admin["headers"], [{"personnel_id": p["id"], "ratio": "50.00"}]
|
||||
)
|
||||
resp = client.delete(f"{_PERSONNEL}/{p['id']}", headers=admin["headers"])
|
||||
assert resp.status_code == 400
|
||||
# 方案仍在,回显有名(RESTRICT 保证未静默剥离)
|
||||
detail = _detail(client, admin["headers"], data["id"])
|
||||
assert detail["secondary_allocations"][0]["personnel_name"] == p["personnel_name"]
|
||||
|
||||
def test_删除业务后可删人员(self, client: TestClient, admin: dict) -> None:
|
||||
p = _person(client, admin["headers"])
|
||||
data = _create_with_allocations(
|
||||
client, admin["headers"], [{"personnel_id": p["id"], "ratio": "50.00"}]
|
||||
)
|
||||
resp = client.delete(f"{_BUSINESSES}/{data['id']}", headers=admin["headers"])
|
||||
assert resp.status_code == 200, resp.text # 方案 CASCADE 随业务删除
|
||||
assert client.delete(f"{_PERSONNEL}/{p['id']}", headers=admin["headers"]).status_code == 200
|
||||
@@ -0,0 +1,137 @@
|
||||
"""系统设置(公司信息)接口测试。
|
||||
|
||||
守的是:
|
||||
- 单行语义:全系统恒一行,PUT 只改名称不增行
|
||||
- public 端点无鉴权可用但**白名单字段**——多一个敏感字段都是匿名泄漏
|
||||
- logo 上传三重校验(后缀/magic bytes/大小)——仅看后缀可被伪造
|
||||
- 审计留痕:系统设置属敏感配置,改必须有日志
|
||||
|
||||
真图片构造:PNG 用 8 字节签名 + 最小 IHDR;JPG 用 SOI 头 + 填充字节。
|
||||
仅校验 magic bytes 前缀,无需完整合法图片(解析由前端 img 完成)。
|
||||
"""
|
||||
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from app.main import app
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_SETTINGS = "/api/v1/system/settings"
|
||||
|
||||
_PNG_BYTES = b"\x89PNG\r\n\x1a\n" + b"\x00" * 32
|
||||
_JPG_BYTES = b"\xff\xd8\xff\xe0" + b"\x00" * 32
|
||||
_TXT_BYTES = b"not an image at all"
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def client() -> TestClient:
|
||||
return TestClient(app)
|
||||
|
||||
|
||||
class TestCompanyInfo:
|
||||
"""公司名称读取与更新。"""
|
||||
|
||||
def test_初始值与更新生效(self, client: TestClient, admin: dict) -> None:
|
||||
got = client.get(_SETTINGS, headers=admin["headers"]).json()["data"]
|
||||
assert got["company_name"]
|
||||
# logo_url 允许为 None(未上传)或历史遗留的 URL——单行库可复用,
|
||||
# 断言不依赖「干净库」前提;上传行为由 TestLogoUpload 专类覆盖
|
||||
assert got["logo_url"] is None or "/logo/public" in got["logo_url"]
|
||||
|
||||
new_name = f"测试公司_{uuid.uuid4().hex[:6]}"
|
||||
put = client.put(_SETTINGS, json={"company_name": new_name}, headers=admin["headers"])
|
||||
assert put.status_code == 200, put.text
|
||||
assert put.json()["data"]["company_name"] == new_name
|
||||
assert (
|
||||
client.get(_SETTINGS, headers=admin["headers"]).json()["data"]["company_name"]
|
||||
== new_name
|
||||
)
|
||||
|
||||
def test_名称为空被拒(self, client: TestClient, admin: dict) -> None:
|
||||
assert (
|
||||
client.put(_SETTINGS, json={"company_name": ""}, headers=admin["headers"]).status_code
|
||||
== 400
|
||||
)
|
||||
|
||||
def test_非管理员改名称被拒(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.put(_SETTINGS, json={"company_name": "越权公司"}, headers=normal["headers"])
|
||||
assert resp.status_code == 403
|
||||
|
||||
def test_修改留审计日志(self, client: TestClient, admin: dict) -> None:
|
||||
client.put(
|
||||
_SETTINGS,
|
||||
json={"company_name": f"审计公司_{uuid.uuid4().hex[:6]}"},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
logs = client.get(
|
||||
"/api/v1/system/operation-logs",
|
||||
params={"module": "系统设置"},
|
||||
headers=admin["headers"],
|
||||
).json()["data"]["list"]
|
||||
assert logs, "修改公司名称未产生操作日志"
|
||||
|
||||
|
||||
class TestPublicEndpoint:
|
||||
"""匿名端点:白名单字段 + 可用性。"""
|
||||
|
||||
def test_无令牌可读且仅白名单字段(self, client: TestClient, admin: dict) -> None:
|
||||
name = f"公开公司_{uuid.uuid4().hex[:6]}"
|
||||
client.put(_SETTINGS, json={"company_name": name}, headers=admin["headers"])
|
||||
|
||||
resp = client.get(f"{_SETTINGS}/public")
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()["data"]
|
||||
assert set(data) == {"company_name", "logo_url"}, "public 端点字段越界"
|
||||
assert data["company_name"] == name
|
||||
assert resp.headers.get("cache-control") is not None
|
||||
|
||||
def test_写操作匿名不可用(self, client: TestClient) -> None:
|
||||
assert client.put(f"{_SETTINGS}/public", json={"company_name": "x"}).status_code in {
|
||||
401,
|
||||
405,
|
||||
}
|
||||
|
||||
|
||||
class TestLogoUpload:
|
||||
"""logo 上传校验链。"""
|
||||
|
||||
def _upload(self, client: TestClient, admin: dict, filename: str, content: bytes):
|
||||
return client.post(
|
||||
f"{_SETTINGS}/logo",
|
||||
files={"file": (filename, content, "application/octet-stream")},
|
||||
headers=admin["headers"],
|
||||
)
|
||||
|
||||
def test_合法png上传成功且回读(self, client: TestClient, admin: dict) -> None:
|
||||
resp = self._upload(client, admin, "logo.png", _PNG_BYTES)
|
||||
assert resp.status_code == 200, resp.text
|
||||
out = resp.json()["data"]
|
||||
assert out["logo_url"] and "/logo/public" in out["logo_url"]
|
||||
|
||||
img = client.get(f"{_SETTINGS}/logo/public")
|
||||
assert img.status_code == 200
|
||||
assert img.headers["content-type"] == "image/png"
|
||||
|
||||
def test_伪造扩展名被magic_bytes拦截(self, client: TestClient, admin: dict) -> None:
|
||||
resp = self._upload(client, admin, "fake.png", _TXT_BYTES)
|
||||
assert resp.status_code == 400
|
||||
assert "不符" in resp.json()["message"]
|
||||
|
||||
def test_非法格式被拒(self, client: TestClient, admin: dict) -> None:
|
||||
assert self._upload(client, admin, "x.gif", _PNG_BYTES).status_code == 400
|
||||
|
||||
def test_超限被拒(self, client: TestClient, admin: dict) -> None:
|
||||
big = _PNG_BYTES + b"\x00" * (2 * 1024 * 1024)
|
||||
resp = self._upload(client, admin, "big.png", big)
|
||||
assert resp.status_code == 400
|
||||
assert "2MB" in resp.json()["message"]
|
||||
|
||||
def test_匿名上传被拒(self, client: TestClient) -> None:
|
||||
resp = client.post(
|
||||
f"{_SETTINGS}/logo",
|
||||
files={"file": ("logo.png", _PNG_BYTES, "application/octet-stream")},
|
||||
)
|
||||
assert resp.status_code == 401
|
||||
@@ -0,0 +1,350 @@
|
||||
"""发货管理接口集成测试(需要 MySQL 与 Redis)。
|
||||
|
||||
守的是发货单的行金额固化与双重汇总回写 —— 行金额(amount)与发货单总额
|
||||
(total_amount)若经前端传值,业务级 total_ship_amount 与运费合计就是可
|
||||
被篡改的源数据,M3 核算直接读业务冗余列;终态业务发货单禁写缺失会让核算
|
||||
基线漂移;被回款批次指定的发货单若能直接删,指定它的回款就指向悬空批次,
|
||||
回款天数无从派生。
|
||||
|
||||
运行前置:``docker compose -f docker/docker-compose.dev.yml up -d``
|
||||
|
||||
数据卫生:人员/公司/产品名一律 ``t_`` 前缀由 conftest 兜底清理;发货单
|
||||
编号系统生成(SH 前缀),conftest 按编号前缀全量清;删除语义的用例自验
|
||||
DELETE 端点。
|
||||
"""
|
||||
|
||||
import re
|
||||
import uuid
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core.constants import ACTION_CREATE, MODULE_SHIPMENT
|
||||
from app.core.db import get_session_factory
|
||||
from app.models import OperationLog
|
||||
from tests.integration.factories import create_business as _create_business
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
_BUSINESSES = "/api/v1/business/businesses"
|
||||
_SHIPMENTS = "/api/v1/business/shipments"
|
||||
_RECEIPTS = "/api/v1/business/receipts"
|
||||
_PERSONNEL = "/api/v1/base/personnel"
|
||||
|
||||
|
||||
def _item(**overrides: object) -> dict:
|
||||
"""发货明细行入参(默认:3 × 300.00 = 900)。"""
|
||||
body: dict = {
|
||||
"product_name": f"t_产品_{uuid.uuid4().hex[:8]}",
|
||||
"quantity": "3",
|
||||
"sale_price": "300.00",
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _spayload(business_id: int, **overrides: object) -> dict:
|
||||
body: dict = {
|
||||
"business_id": business_id,
|
||||
"ship_date": str(date.today()),
|
||||
"items": [_item()],
|
||||
}
|
||||
body.update(overrides)
|
||||
return body
|
||||
|
||||
|
||||
def _create(client: TestClient, headers: dict, business_id: int, **overrides: object) -> dict:
|
||||
resp = client.post(_SHIPMENTS, json=_spayload(business_id, **overrides), headers=headers)
|
||||
assert resp.status_code == 200, resp.text
|
||||
return resp.json()["data"]
|
||||
|
||||
|
||||
def _terminate(client: TestClient, headers: dict, business_id: int) -> None:
|
||||
"""把业务流转到已终止(终态禁写场景的造数步骤)。"""
|
||||
resp = client.put(
|
||||
f"{_BUSINESSES}/{business_id}/status",
|
||||
json={"status": 3, "reason": f"t_终止_{uuid.uuid4().hex[:6]}"},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
|
||||
|
||||
def _logs_of(username: str) -> list[OperationLog]:
|
||||
"""取某操作人的审计行(按 id 倒序,最新在前)。"""
|
||||
factory = get_session_factory()
|
||||
with factory() as session:
|
||||
return list(
|
||||
session.execute(
|
||||
select(OperationLog)
|
||||
.where(OperationLog.username == username)
|
||||
.order_by(OperationLog.id.desc())
|
||||
).scalars()
|
||||
)
|
||||
|
||||
|
||||
class TestAuth:
|
||||
"""鉴权:业务数据属业务操作不要求管理员,但仍是登录后接口。"""
|
||||
|
||||
def test_未登录访问发货单列表_401(self, client: TestClient) -> None:
|
||||
resp = client.get(_SHIPMENTS)
|
||||
assert resp.status_code == 401, resp.text
|
||||
|
||||
|
||||
class TestCreate:
|
||||
"""创建:SH 编号契约、行校验、行金额固化与双重汇总回写 —— 业务级汇总
|
||||
是 M3 起付判定的直接消费源,错写就是算错钱。"""
|
||||
|
||||
def test_创建发货单_行金额固化与双重汇总回写(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
business["id"],
|
||||
freight_amount="88.50",
|
||||
items=[
|
||||
_item(quantity="3", sale_price="300.00", amount="999.99"),
|
||||
_item(quantity="2", sale_price="250.00"),
|
||||
],
|
||||
)
|
||||
|
||||
# 编号格式:SH{YYYYMMDD}-{4位当日序号}(日期取当日)
|
||||
expected_prefix = f"SH{date.today():%Y%m%d}-"
|
||||
assert re.fullmatch(r"SH\d{8}-\d{4}", data["shipment_no"]), data["shipment_no"]
|
||||
assert data["shipment_no"].startswith(expected_prefix), data["shipment_no"]
|
||||
|
||||
# 行金额由服务层按 数量×单价 固化:schema 无 amount 入参,塞了也忽略
|
||||
detail = client.get(f"{_SHIPMENTS}/{data['id']}", headers=headers).json()["data"]
|
||||
amounts = [Decimal(i["amount"]) for i in detail["items"]]
|
||||
assert amounts == [Decimal("900"), Decimal("500")], detail["items"]
|
||||
assert Decimal(detail["total_amount"]) == Decimal("1400")
|
||||
assert Decimal(detail["freight_amount"]) == Decimal("88.50")
|
||||
|
||||
# 业务级汇总回写(发货金额 / 运费合计)
|
||||
business_detail = client.get(f"{_BUSINESSES}/{business['id']}", headers=headers).json()[
|
||||
"data"
|
||||
]
|
||||
assert Decimal(business_detail["total_ship_amount"]) == Decimal("1400")
|
||||
assert Decimal(business_detail["total_freight_amount"]) == Decimal("88.50")
|
||||
|
||||
def test_业务不存在_404(self, client: TestClient, normal: dict) -> None:
|
||||
resp = client.post(_SHIPMENTS, json=_spayload(999999999), headers=normal["headers"])
|
||||
assert resp.status_code == 404, resp.text
|
||||
assert "业务不存在" in resp.json()["message"], resp.text
|
||||
|
||||
def test_终态业务禁新发货_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
_terminate(client, headers, business["id"])
|
||||
resp = client.post(_SHIPMENTS, json=_spayload(business["id"]), headers=headers)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "业务已完成或已终止,禁止新发货" in resp.json()["message"], resp.text
|
||||
|
||||
def test_明细为空_400(self, client: TestClient, normal: dict) -> None:
|
||||
business = _create_business(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_SHIPMENTS, json=_spayload(business["id"], items=[]), headers=normal["headers"]
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
|
||||
def test_明细行数量为0_400(self, client: TestClient, normal: dict) -> None:
|
||||
business = _create_business(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_SHIPMENTS,
|
||||
json=_spayload(business["id"], items=[_item(quantity="0")]),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "数量" in resp.json()["message"], resp.text
|
||||
|
||||
def test_运费负数_400(self, client: TestClient, normal: dict) -> None:
|
||||
"""运费是金额源数据:负值会让业务运费合计与报表直接错乱。"""
|
||||
business = _create_business(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_SHIPMENTS,
|
||||
json=_spayload(business["id"], freight_amount="-8.00"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "不能为负数" in resp.json()["message"], resp.text
|
||||
|
||||
def test_运费三位小数_400(self, client: TestClient, normal: dict) -> None:
|
||||
business = _create_business(client, normal["headers"])
|
||||
resp = client.post(
|
||||
_SHIPMENTS,
|
||||
json=_spayload(business["id"], freight_amount="8.333"),
|
||||
headers=normal["headers"],
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "最多两位小数" in resp.json()["message"], resp.text
|
||||
|
||||
|
||||
class TestEdit:
|
||||
"""编辑(明细全量替换)与两处汇总同步 —— 业务级汇总漏算即漂移。"""
|
||||
|
||||
def test_编辑发货单_两处汇总同步(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
business["id"],
|
||||
freight_amount="50.00",
|
||||
items=[_item(quantity="1", sale_price="1000.00")],
|
||||
)
|
||||
before = client.get(f"{_BUSINESSES}/{business['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(before["total_ship_amount"]) == Decimal("1000")
|
||||
|
||||
updated = client.put(
|
||||
f"{_SHIPMENTS}/{data['id']}",
|
||||
json={
|
||||
"ship_date": str(date.today()),
|
||||
"freight_amount": "12.00",
|
||||
"items": [_item(quantity="2", sale_price="150.00")],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert updated.status_code == 200, updated.text
|
||||
assert Decimal(updated.json()["data"]["total_amount"]) == Decimal("300")
|
||||
|
||||
# 业务级两处汇总随编辑同步
|
||||
after = client.get(f"{_BUSINESSES}/{business['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(after["total_ship_amount"]) == Decimal("300")
|
||||
assert Decimal(after["total_freight_amount"]) == Decimal("12")
|
||||
|
||||
detail = client.get(f"{_SHIPMENTS}/{data['id']}", headers=headers).json()["data"]
|
||||
assert len(detail["items"]) == 1, "编辑是全量替换,旧行不得残留"
|
||||
assert Decimal(detail["items"][0]["amount"]) == Decimal("300")
|
||||
|
||||
|
||||
class TestDelete:
|
||||
"""删除保护与汇总回退:被回款指定禁删;删除后业务级汇总必须回算。"""
|
||||
|
||||
def test_被回款指定禁删_解除后可删_汇总回退(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
business["id"],
|
||||
freight_amount="20.00",
|
||||
items=[_item(quantity="1", sale_price="500.00")],
|
||||
)
|
||||
receipt = client.post(
|
||||
_RECEIPTS,
|
||||
json={
|
||||
"business_id": business["id"],
|
||||
"shipment_id": data["id"],
|
||||
"receipt_date": str(date.today()),
|
||||
"amount": "500.00",
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert receipt.status_code == 200, receipt.text
|
||||
|
||||
blocked = client.delete(f"{_SHIPMENTS}/{data['id']}", headers=headers)
|
||||
assert blocked.status_code == 400, blocked.text
|
||||
assert "已被回款批次指定" in blocked.json()["message"], blocked.text
|
||||
|
||||
# 解除回款的批次指定(未核算回款可删)后发货单可删,业务级汇总回退
|
||||
assert (
|
||||
client.delete(
|
||||
f"{_RECEIPTS}/{receipt.json()['data']['id']}", headers=headers
|
||||
).status_code
|
||||
== 200
|
||||
)
|
||||
freed = client.delete(f"{_SHIPMENTS}/{data['id']}", headers=headers)
|
||||
assert freed.status_code == 200, freed.text
|
||||
business_detail = client.get(f"{_BUSINESSES}/{business['id']}", headers=headers).json()[
|
||||
"data"
|
||||
]
|
||||
assert Decimal(business_detail["total_ship_amount"]) == Decimal("0")
|
||||
assert Decimal(business_detail["total_freight_amount"]) == Decimal("0")
|
||||
|
||||
def test_删除未被指定的发货单_业务级汇总回退(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(
|
||||
client,
|
||||
headers,
|
||||
business["id"],
|
||||
freight_amount="100.00",
|
||||
items=[_item(quantity="2", sale_price="1000.00")],
|
||||
)
|
||||
before = client.get(f"{_BUSINESSES}/{business['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(before["total_ship_amount"]) == Decimal("2000")
|
||||
|
||||
freed = client.delete(f"{_SHIPMENTS}/{data['id']}", headers=headers)
|
||||
assert freed.status_code == 200, freed.text
|
||||
assert client.get(f"{_SHIPMENTS}/{data['id']}", headers=headers).status_code == 404
|
||||
after = client.get(f"{_BUSINESSES}/{business['id']}", headers=headers).json()["data"]
|
||||
assert Decimal(after["total_ship_amount"]) == Decimal("0")
|
||||
assert Decimal(after["total_freight_amount"]) == Decimal("0")
|
||||
|
||||
|
||||
class TestTerminal:
|
||||
"""终态业务的发货单禁改禁删 —— 发货的运费/金额是业务级汇总与 M3 核算
|
||||
的源数据,终态后不得变动。"""
|
||||
|
||||
def test_终态业务发货单禁改_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(client, headers, business["id"])
|
||||
_terminate(client, headers, business["id"])
|
||||
|
||||
resp = client.put(
|
||||
f"{_SHIPMENTS}/{data['id']}",
|
||||
json={
|
||||
"ship_date": str(date.today()),
|
||||
"items": [_item(quantity="1", sale_price="1.00")],
|
||||
},
|
||||
headers=headers,
|
||||
)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "禁止编辑发货单" in resp.json()["message"], resp.text
|
||||
|
||||
def test_终态业务发货单禁删_400(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(client, headers, business["id"])
|
||||
_terminate(client, headers, business["id"])
|
||||
|
||||
resp = client.delete(f"{_SHIPMENTS}/{data['id']}", headers=headers)
|
||||
assert resp.status_code == 400, resp.text
|
||||
assert "禁止删除发货单" in resp.json()["message"], resp.text
|
||||
|
||||
|
||||
class TestAudit:
|
||||
"""写操作(含校验失败的)都在 operation_logs 留痕 —— 审计是验收项。"""
|
||||
|
||||
def test_新增发货单成功留审计(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
data = _create(client, headers, business["id"])
|
||||
logs = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_SHIPMENT and log.action == ACTION_CREATE
|
||||
]
|
||||
assert logs, "新增发货单未留操作日志"
|
||||
latest = logs[0]
|
||||
assert latest.success == 1
|
||||
assert "新增发货单" in latest.summary
|
||||
assert data["shipment_no"] in latest.summary
|
||||
|
||||
def test_终态禁新发货失败留审计(self, client: TestClient, normal: dict) -> None:
|
||||
headers = normal["headers"]
|
||||
business = _create_business(client, headers)
|
||||
_terminate(client, headers, business["id"])
|
||||
resp = client.post(_SHIPMENTS, json=_spayload(business["id"]), headers=headers)
|
||||
assert resp.status_code == 400, resp.text
|
||||
failed = [
|
||||
log
|
||||
for log in _logs_of(normal["username"])
|
||||
if log.module == MODULE_SHIPMENT and log.success == 0
|
||||
]
|
||||
assert failed, "失败操作未留痕"
|
||||
assert "禁止新发货" in (failed[0].error_message or ""), failed[0]
|
||||
@@ -62,7 +62,20 @@ class TestSerializeRequestData:
|
||||
def test_手机号被脱敏(self) -> None:
|
||||
text = _serialize_request_data({"phone": "13812345678"}) or ""
|
||||
assert "13812345678" not in text
|
||||
assert "138****5678" in text
|
||||
# phone 键已加入结构化抹除清单(整值 ***)—— 带空格/横线分隔的号码
|
||||
# (如 138 0013 8000)会穿过分值文本正则,键名整值抹除是更强的防线
|
||||
assert '"phone": "***"' in text
|
||||
|
||||
def test_带分隔符的手机号被脱敏(self) -> None:
|
||||
"""修复回归:'138 0013 8000' 类分隔符写法曾同时穿过分值正则与键名清单。"""
|
||||
for payload in (
|
||||
{"phone": "138 0013 8000"},
|
||||
{"phone": "138-0013-8000"},
|
||||
{"mobile": "13800138000"},
|
||||
):
|
||||
text = _serialize_request_data(payload) or ""
|
||||
assert "13800138000" not in text.replace(" ", "").replace("-", "")
|
||||
assert "***" in text
|
||||
|
||||
def test_超长中文按字节边界截断且无残字(self) -> None:
|
||||
"""75000 字节(25000 个汉字)必然超限:
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
"""公式纯函数测试。
|
||||
|
||||
守的是:算钱公式的精确性与边界 —— 一旦按 float 或字面量截断计算,
|
||||
360/361 天分界、4/360 斜率、27 天回款示例会全部错位,直接影响工资金额。
|
||||
断言一律用 Fraction/Decimal 精确值,禁近似比较。
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from decimal import Decimal
|
||||
from fractions import Fraction
|
||||
|
||||
from app.services.formula import (
|
||||
apply_barter,
|
||||
converted_profit,
|
||||
payment_days,
|
||||
payment_weight,
|
||||
performance_amount,
|
||||
profit_rate,
|
||||
salesperson_rate,
|
||||
start_payment_ok,
|
||||
)
|
||||
|
||||
# 与迁移种子一致的业务员参数(存储口径:start/floor 为 ‰ 数,slope 为 ‰/天)
|
||||
SP_START = Fraction(10)
|
||||
SP_SLOPE = Fraction(4, 360)
|
||||
SP_FLOOR = Fraction(4)
|
||||
SP_BOUNDARY = 360
|
||||
|
||||
|
||||
def _sp_rate(days: int) -> Fraction:
|
||||
return salesperson_rate(
|
||||
days, start=SP_START, slope=SP_SLOPE, floor=SP_FLOOR, boundary_days=SP_BOUNDARY
|
||||
)
|
||||
|
||||
|
||||
class TestPaymentDays:
|
||||
"""回款天数:发货日首日计第 1 天(对照表 #1;需规「26 天」示例作废)。"""
|
||||
|
||||
def test_发货日当天回款为第1天(self) -> None:
|
||||
d = date(2026, 1, 1)
|
||||
assert payment_days(d, d) == 1
|
||||
|
||||
def test_12月15日发货1月10日回款为27天(self) -> None:
|
||||
assert payment_days(date(2025, 12, 15), date(2026, 1, 10)) == 27
|
||||
|
||||
def test_跨年按自然日连续累计(self) -> None:
|
||||
assert payment_days(date(2025, 12, 31), date(2026, 1, 1)) == 2
|
||||
|
||||
|
||||
class TestSalespersonRate:
|
||||
"""业务员计提比例:1~360 天线性递减、≥361 天固定下限(对照表 #4)。"""
|
||||
|
||||
def test_第360天恰为千分之6_线性段终点(self) -> None:
|
||||
assert _sp_rate(360) == Fraction(6, 1000)
|
||||
|
||||
def test_第361天固定下限千分之4_分界线(self) -> None:
|
||||
# 公式外推为 5.989‰,业务确认「360 为分界线,360 以后按千分之四」
|
||||
assert _sp_rate(361) == Fraction(4, 1000)
|
||||
|
||||
def test_第1天按公式为899比90000_非取整为10(self) -> None:
|
||||
# 需规图示「第 1 天对应 10‰」为上限参考;公式值 = (10 − 4/360)/1000 = 899/90000
|
||||
assert _sp_rate(1) == Fraction(899, 90000)
|
||||
|
||||
def test_第180天线性段中点千分之8(self) -> None:
|
||||
assert _sp_rate(180) == Fraction(8, 1000)
|
||||
|
||||
def test_返回值为纯比例_非千分数(self) -> None:
|
||||
# 绩效 = 折算额 × 比例,比例必须是 0.006 而非 6
|
||||
assert _sp_rate(360) == Fraction(6, 1000)
|
||||
assert _sp_rate(360) != Fraction(6)
|
||||
|
||||
def test_负天数钳制为0天_按起始比例计提(self) -> None:
|
||||
"""先款后货(payment_days 为负)不线性外插:钳到 0 天取起始比例。
|
||||
|
||||
修复前 days=-5 会算出 (10 + 5×4/360)‰ —— 高于起始值,多算绩效。
|
||||
"""
|
||||
assert _sp_rate(-5) == _sp_rate(0)
|
||||
assert _sp_rate(-1) == Fraction(10, 1000)
|
||||
|
||||
|
||||
class TestProfitRate:
|
||||
"""毛利润率:不含运费口径(对照表 #2),毛利润额 / 销售额。"""
|
||||
|
||||
def test_毛利润率_不含运费(self) -> None:
|
||||
assert profit_rate(Decimal("45"), Decimal("100")) == Fraction(9, 20)
|
||||
|
||||
def test_销售额为零_返回零_防除零(self) -> None:
|
||||
assert profit_rate(Decimal("0"), Decimal("0")) == Fraction(0)
|
||||
|
||||
|
||||
class TestConvertedProfit:
|
||||
"""折算毛利润额(化简式):销售额 ×(毛利润率 − 阈值)(对照表 #12/#13)。"""
|
||||
|
||||
def test_化简式结果_市政水利30点阈值(self) -> None:
|
||||
# 100 × (9/20 − 30/100) = 15
|
||||
assert converted_profit(Decimal("100"), Fraction(9, 20), Fraction(30)) == Decimal("15")
|
||||
|
||||
def test_化简式与定义式等价(self) -> None:
|
||||
# 定义式:毛利润额 / 毛利润率 × (毛利润率 − 阈值) = 45 / (9/20) × (9/20 − 3/10) = 15
|
||||
revenue, profit = Decimal("100"), Decimal("45")
|
||||
rate = profit_rate(profit, revenue)
|
||||
assert converted_profit(revenue, rate, Fraction(30)) == Decimal("15")
|
||||
|
||||
def test_毛利润额为零_折算为零_不除零(self) -> None:
|
||||
assert converted_profit(Decimal("0"), Fraction(0), Fraction(30)) == Decimal("0")
|
||||
|
||||
def test_毛利润率低于阈值_折算为负_不归零(self) -> None:
|
||||
# 100 × (1/10 − 3/10) = -20(业务确认负值正常计算)
|
||||
assert converted_profit(Decimal("100"), Fraction(1, 10), Fraction(30)) == Decimal("-20")
|
||||
|
||||
|
||||
class TestPerformanceAmount:
|
||||
"""绩效 = 折算毛利润额 × 计提比例(乘法方向,对照表 #3)。"""
|
||||
|
||||
def test_乘法方向_折算额乘比例(self) -> None:
|
||||
# 15000 × 97/10000 = 145.5
|
||||
assert performance_amount(Decimal("15000"), Fraction(97, 10000)) == Decimal("145.5")
|
||||
|
||||
def test_负折算额_绩效为负不归零(self) -> None:
|
||||
assert performance_amount(Decimal("-20"), Fraction(6, 1000)) == Decimal("-0.12")
|
||||
|
||||
|
||||
class TestModifiers:
|
||||
"""修饰器:以物抵顶、支付权重 R×R、起付判定(对照表 #21/#22/#24)。"""
|
||||
|
||||
def test_以物抵顶_按80点折算(self) -> None:
|
||||
assert apply_barter(Decimal("145.5"), Fraction(80)) == Decimal("116.4")
|
||||
|
||||
def test_支付权重_R为60时0点36(self) -> None:
|
||||
assert payment_weight(60) == Fraction(36, 100)
|
||||
|
||||
def test_支付权重_R为100时全额(self) -> None:
|
||||
assert payment_weight(100) == Fraction(1)
|
||||
|
||||
def test_起付判定_达到60点(self) -> None:
|
||||
assert start_payment_ok(Decimal("60000"), Decimal("100000"), Fraction(60)) is True
|
||||
|
||||
def test_起付判定_未达到60点(self) -> None:
|
||||
assert start_payment_ok(Decimal("59999"), Decimal("100000"), Fraction(60)) is False
|
||||
@@ -19,8 +19,32 @@ EXPECTED_TABLES = {
|
||||
"role_permissions",
|
||||
"login_logs",
|
||||
"operation_logs",
|
||||
"business_roles",
|
||||
"system_settings",
|
||||
"approval_orders",
|
||||
"approval_steps",
|
||||
"business_secondary_allocations",
|
||||
"param_definitions",
|
||||
"param_change_batches",
|
||||
"param_values",
|
||||
"personnel",
|
||||
"personnel_regions",
|
||||
"personnel_plans",
|
||||
"products",
|
||||
"customers",
|
||||
"ownership_change_logs",
|
||||
"businesses",
|
||||
"business_items",
|
||||
"business_status_logs",
|
||||
"shipments",
|
||||
"shipment_items",
|
||||
"receipts",
|
||||
"customer_rating_grades",
|
||||
}
|
||||
|
||||
# 单复数同形的集合名词:本身即复数语义,不受「以 s 结尾」检查约束
|
||||
PLURAL_EXCEPTIONS = {"personnel"}
|
||||
|
||||
|
||||
def _ddl(table_name: str) -> str:
|
||||
"""返回某张表的建表 DDL 文本。"""
|
||||
@@ -39,7 +63,9 @@ class TestTableSet:
|
||||
def test_所有表名均为小写蛇形复数(self) -> None:
|
||||
for name in Base.metadata.tables:
|
||||
assert re.fullmatch(r"[a-z][a-z0-9_]*", name), f"表名 {name} 不符合小写蛇形"
|
||||
assert name.endswith("s"), f"表名 {name} 应为复数"
|
||||
# personnel 等集合名词单复数同形,本身即复数语义
|
||||
if name not in PLURAL_EXCEPTIONS:
|
||||
assert name.endswith("s"), f"表名 {name} 应为复数"
|
||||
|
||||
|
||||
class TestNamingConvention:
|
||||
|
||||
@@ -0,0 +1,173 @@
|
||||
"""参数注册表与公式模板注册表测试。
|
||||
|
||||
守的是:注册表是参数种子数据与运行期校验的唯一来源 —— 一旦编码或默认值
|
||||
与迁移种子漂移,参数解析会取到错误口径;一旦取值校验失守,
|
||||
畸形值(如 "1/0")会落库并在核算时崩溃或算错钱。
|
||||
"""
|
||||
|
||||
from fractions import Fraction
|
||||
|
||||
import pytest
|
||||
|
||||
from app.core.exceptions import BadRequestError
|
||||
from app.services.calc_templates import TEMPLATES, get_template, required_params
|
||||
from app.services.param_registry import (
|
||||
PARAM_REGISTRY,
|
||||
get_spec,
|
||||
parse_fraction,
|
||||
validate_and_normalize,
|
||||
)
|
||||
|
||||
# 与 db/migration 迁移种子保持一致的 18 项编码(V3 十六项 + V6 审批开关两项)
|
||||
EXPECTED_CODES = {
|
||||
"salesperson.rate.start",
|
||||
"salesperson.rate.slope",
|
||||
"salesperson.rate.floor",
|
||||
"salesperson.days.boundary",
|
||||
"manager.share.team",
|
||||
"manager.share.company",
|
||||
"enterprise.rate",
|
||||
"info.rate",
|
||||
"prepay.rate",
|
||||
"barter.discount",
|
||||
"payment.start.ratio",
|
||||
"payment.weight.mode",
|
||||
"product.threshold",
|
||||
"salary.basic.mode",
|
||||
"probation.annual.threshold",
|
||||
"probation.salary.basic",
|
||||
"approval.secondary_allocation.enabled",
|
||||
"approval.monthly_settlement.enabled",
|
||||
}
|
||||
|
||||
|
||||
class TestRegistry:
|
||||
"""注册表元数据完整性(与迁移种子同源)。"""
|
||||
|
||||
def test_注册表共18项(self) -> None:
|
||||
assert len(PARAM_REGISTRY) == 18
|
||||
|
||||
def test_编码集合与迁移种子一致(self) -> None:
|
||||
assert set(PARAM_REGISTRY) == EXPECTED_CODES
|
||||
|
||||
def test_每项必填字段非空(self) -> None:
|
||||
for spec in PARAM_REGISTRY.values():
|
||||
assert spec.code, "code 为空"
|
||||
assert spec.name, f"{spec.code} 缺中文名称"
|
||||
assert spec.group, f"{spec.code} 缺分组"
|
||||
assert spec.value_type in {"DECIMAL", "INT", "BOOL", "ENUM", "TEXT"}
|
||||
|
||||
def test_默认值可按类型解析(self) -> None:
|
||||
for spec in PARAM_REGISTRY.values():
|
||||
if spec.default_value is None:
|
||||
continue
|
||||
if spec.value_type in {"DECIMAL", "INT"}:
|
||||
parse_fraction(spec.default_value) # 不可解析会抛 BadRequestError
|
||||
elif spec.value_type == "BOOL":
|
||||
assert spec.default_value in {"0", "1"}, f"{spec.code} 默认值非 0/1"
|
||||
elif spec.value_type == "ENUM":
|
||||
assert spec.options, f"{spec.code} 为 ENUM 但无选项"
|
||||
assert spec.default_value in spec.options
|
||||
|
||||
def test_BOOL开关_仅接受0与1(self) -> None:
|
||||
"""V6 首例 BOOL 注册的两个审批开关:合法值与非法值边界。"""
|
||||
for code in (
|
||||
"approval.secondary_allocation.enabled",
|
||||
"approval.monthly_settlement.enabled",
|
||||
):
|
||||
spec = PARAM_REGISTRY[code]
|
||||
assert spec.value_type == "BOOL"
|
||||
assert validate_and_normalize(spec, "0") == "0"
|
||||
assert validate_and_normalize(spec, "1") == "1"
|
||||
with pytest.raises(BadRequestError):
|
||||
validate_and_normalize(spec, "true")
|
||||
with pytest.raises(BadRequestError):
|
||||
validate_and_normalize(spec, "2")
|
||||
|
||||
def test_取值域上下限可解析(self) -> None:
|
||||
for spec in PARAM_REGISTRY.values():
|
||||
if spec.value_min is not None:
|
||||
parse_fraction(spec.value_min)
|
||||
if spec.value_max is not None:
|
||||
parse_fraction(spec.value_max)
|
||||
|
||||
def test_取未注册编码抛ValueError_属代码缺陷(self) -> None:
|
||||
with pytest.raises(ValueError):
|
||||
get_spec("not.exist.code")
|
||||
|
||||
|
||||
class TestParseFraction:
|
||||
"""Fraction 精确解析:4/360 不许经 float 中转。"""
|
||||
|
||||
def test_分数式精确解析_4除以360(self) -> None:
|
||||
assert parse_fraction("4/360") == Fraction(1, 90)
|
||||
|
||||
def test_整数解析(self) -> None:
|
||||
assert parse_fraction("10") == Fraction(10)
|
||||
|
||||
def test_小数解析(self) -> None:
|
||||
assert parse_fraction("12.5") == Fraction(25, 2)
|
||||
|
||||
def test_除零分数拒绝(self) -> None:
|
||||
with pytest.raises(BadRequestError):
|
||||
parse_fraction("1/0")
|
||||
|
||||
def test_非数字拒绝(self) -> None:
|
||||
with pytest.raises(BadRequestError):
|
||||
parse_fraction("abc")
|
||||
|
||||
|
||||
class TestValidateAndNormalize:
|
||||
"""参数值校验:类型/取值域/枚举(审查重点 1:畸形值不得落库)。"""
|
||||
|
||||
def test_去除首尾空白后返回规范值(self) -> None:
|
||||
spec = PARAM_REGISTRY["barter.discount"]
|
||||
assert validate_and_normalize(spec, " 80 ") == "80"
|
||||
|
||||
def test_超取值域上限拒绝(self) -> None:
|
||||
spec = PARAM_REGISTRY["barter.discount"] # value_max=100
|
||||
with pytest.raises(BadRequestError):
|
||||
validate_and_normalize(spec, "120")
|
||||
|
||||
def test_低于取值域下限拒绝(self) -> None:
|
||||
spec = PARAM_REGISTRY["barter.discount"] # value_min=0
|
||||
with pytest.raises(BadRequestError):
|
||||
validate_and_normalize(spec, "-1")
|
||||
|
||||
def test_枚举越界拒绝(self) -> None:
|
||||
spec = PARAM_REGISTRY["payment.weight.mode"]
|
||||
with pytest.raises(BadRequestError):
|
||||
validate_and_normalize(spec, "PARTIAL")
|
||||
|
||||
def test_枚举合法值通过(self) -> None:
|
||||
spec = PARAM_REGISTRY["payment.weight.mode"]
|
||||
assert validate_and_normalize(spec, "BALANCE") == "BALANCE"
|
||||
|
||||
def test_整数类型拒绝小数(self) -> None:
|
||||
spec = PARAM_REGISTRY["salesperson.days.boundary"]
|
||||
with pytest.raises(BadRequestError):
|
||||
validate_and_normalize(spec, "360.5")
|
||||
|
||||
def test_分数式斜率原样保留不截断(self) -> None:
|
||||
spec = PARAM_REGISTRY["salesperson.rate.slope"]
|
||||
assert validate_and_normalize(spec, "4/360") == "4/360"
|
||||
|
||||
|
||||
class TestTemplates:
|
||||
"""公式模板注册表:有限集合,声明参数必须真实存在。"""
|
||||
|
||||
def test_共五个模板(self) -> None:
|
||||
assert len(TEMPLATES) == 5
|
||||
|
||||
def test_模板声明参数均在注册表内(self) -> None:
|
||||
for tpl in TEMPLATES.values():
|
||||
for code in tpl.params:
|
||||
assert code in PARAM_REGISTRY, f"{tpl.code} 声明了未注册参数 {code}"
|
||||
|
||||
def test_取模板声明参数(self) -> None:
|
||||
params = required_params("TPL_SALESPERSON_DECAY")
|
||||
assert "salesperson.rate.slope" in params
|
||||
|
||||
def test_未知模板抛ValueError_属代码缺陷(self) -> None:
|
||||
with pytest.raises(ValueError):
|
||||
get_template("TPL_NOT_EXIST")
|
||||
Loaded 100 of 169 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user