diff --git a/.gitignore b/.gitignore
index 33eb9d1..1884a20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,8 @@ website/dist.zip
 
 # go
 go/go-platform.zip
-go/server.exe
+# Go 构建产物（go build 默认输出 main.exe / server.exe 等），不入库
+go/*.exe
 go/conf
 
 # codegraph
diff --git a/backend/src/api/erpDocument.js b/backend/src/api/erpDocument.js
new file mode 100644
index 0000000..87605c6
--- /dev/null
+++ b/backend/src/api/erpDocument.js
@@ -0,0 +1,96 @@
+import request from '@/utils/request'
+
+/**
+ * 进销存单据中心接口（/backend/erp/document*）
+ * 采购/销售/库存十类单据共用同一套接口，用 doc_type 区分。
+ */
+
+export function getDocumentList(params) {
+  return request({
+    url: '/backend/erp/document/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getDocumentDetail(id) {
+  return request({
+    url: `/backend/erp/document/${id}`,
+    method: 'get'
+  })
+}
+
+/** 新建或覆盖保存草稿：payload 带 id 即为编辑 */
+export function saveDocument(data) {
+  return request({
+    url: '/backend/erp/document',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteDocument(id) {
+  return request({
+    url: `/backend/erp/document/${id}`,
+    method: 'delete'
+  })
+}
+
+/** 提交审批：flow_id 走查询参数（后端从 query 取），不传则由后端按单据类型挑选审批流 */
+export function submitDocument(id, params) {
+  return request({
+    url: `/backend/erp/document/${id}/submit`,
+    method: 'post',
+    params: params || {}
+  })
+}
+
+export function approveDocument(id) {
+  return request({
+    url: `/backend/erp/document/${id}/approve`,
+    method: 'post',
+    data: {}
+  })
+}
+
+export function cancelDocument(id) {
+  return request({
+    url: `/backend/erp/document/${id}/cancel`,
+    method: 'post',
+    data: {}
+  })
+}
+
+/** 该单据类型当前可用的审批流，为空时前端只显示「直接审核」 */
+export function getDocumentFlows(docType) {
+  return request({
+    url: '/backend/erp/document/flows',
+    method: 'get',
+    params: { doc_type: docType }
+  })
+}
+
+/** 来源订单/原单中尚可执行的明细行（含 remain_qty），用于按行带出 */
+export function getExecutableItems(id) {
+  return request({
+    url: `/backend/erp/document/${id}/executable`,
+    method: 'get'
+  })
+}
+
+/** 盘点表：带出仓库当前账面数量与加权成本 */
+export function getTakeSheet(warehouseId) {
+  return request({
+    url: '/backend/erp/document/takeSheet',
+    method: 'get',
+    params: { warehouse_id: warehouseId }
+  })
+}
+
+/** 开单页所需字典与默认值（单据类型、状态、默认仓、售价口径、负库存开关） */
+export function getDocumentMeta() {
+  return request({
+    url: '/backend/erp/document/meta',
+    method: 'get'
+  })
+}
diff --git a/backend/src/api/erpFinance.js b/backend/src/api/erpFinance.js
new file mode 100644
index 0000000..0763d42
--- /dev/null
+++ b/backend/src/api/erpFinance.js
@@ -0,0 +1,103 @@
+import request from '@/utils/request'
+
+/**
+ * 进销存财务接口（/backend/erp/finance*）
+ * 往来账（应收/应付）由已生效单据自动生成，收付款单确认时按单核销或 FIFO 核销。
+ */
+
+export function getBillList(params) {
+  return request({
+    url: '/backend/erp/finance/bill/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getBillDetail(id) {
+  return request({
+    url: `/backend/erp/finance/bill/${id}`,
+    method: 'get'
+  })
+}
+
+export function getAging(params) {
+  return request({
+    url: '/backend/erp/finance/aging',
+    method: 'get',
+    params
+  })
+}
+
+export function getCashFlow(params) {
+  return request({
+    url: '/backend/erp/finance/cashflow',
+    method: 'get',
+    params
+  })
+}
+
+/** 往来单位对账汇总（应收/应付累计与未结） */
+export function getPartnerSummary(params) {
+  return request({
+    url: '/backend/erp/finance/partner',
+    method: 'get',
+    params
+  })
+}
+
+export function getFundList(params) {
+  return request({
+    url: '/backend/erp/finance/fund/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getFundDetail(id) {
+  return request({
+    url: `/backend/erp/finance/fund/${id}`,
+    method: 'get'
+  })
+}
+
+/** 新建/修改收付款草稿，返回 {id, fund_no} */
+export function saveFund(data) {
+  return request({
+    url: '/backend/erp/finance/fund',
+    method: 'post',
+    data
+  })
+}
+
+/** 确认收付款：body 传 {settles:[{partner_bill_id,amount}]}，不传则按账期 FIFO 自动核销 */
+export function confirmFund(id, data) {
+  return request({
+    url: `/backend/erp/finance/fund/${id}/confirm`,
+    method: 'post',
+    data: data || {}
+  })
+}
+
+export function voidFund(id) {
+  return request({
+    url: `/backend/erp/finance/fund/${id}/void`,
+    method: 'post',
+    data: {}
+  })
+}
+
+export function deleteFund(id) {
+  return request({
+    url: `/backend/erp/finance/fund/${id}`,
+    method: 'delete'
+  })
+}
+
+/** 某往来单位当前未结的往来账，供核销勾选 */
+export function getFundOpenBills(params) {
+  return request({
+    url: '/backend/erp/finance/fund/openBills',
+    method: 'get',
+    params
+  })
+}
diff --git a/backend/src/api/erpProduct.js b/backend/src/api/erpProduct.js
new file mode 100644
index 0000000..01fe54f
--- /dev/null
+++ b/backend/src/api/erpProduct.js
@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+/**
+ * 进销存商品档案接口（/backend/erp/product*）
+ * 商品支持基础单位+辅助单位换算、五级价格、安全/最高库存与保质期批次开关。
+ */
+
+export function getProductList(params) {
+  return request({
+    url: '/backend/erp/product/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getProductDetail(id) {
+  return request({
+    url: `/backend/erp/product/${id}`,
+    method: 'get'
+  })
+}
+
+export function createProduct(data) {
+  return request({
+    url: '/backend/erp/product',
+    method: 'post',
+    data
+  })
+}
+
+export function updateProduct(id, data) {
+  return request({
+    url: `/backend/erp/product/${id}`,
+    method: 'put',
+    data
+  })
+}
+
+export function deleteProduct(id) {
+  return request({
+    url: `/backend/erp/product/${id}`,
+    method: 'delete'
+  })
+}
+
+export function toggleProductStatus(id, status) {
+  return request({
+    url: `/backend/erp/product/${id}/status`,
+    method: 'post',
+    data: { status }
+  })
+}
+
+export function getCategoryList() {
+  return request({
+    url: '/backend/erp/product/category/list',
+    method: 'get'
+  })
+}
+
+export function saveCategory(data) {
+  return request({
+    url: '/backend/erp/product/category',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteCategory(id) {
+  return request({
+    url: `/backend/erp/product/category/${id}`,
+    method: 'delete'
+  })
+}
diff --git a/backend/src/api/erpReport.js b/backend/src/api/erpReport.js
new file mode 100644
index 0000000..87be346
--- /dev/null
+++ b/backend/src/api/erpReport.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+/**
+ * 进销存报表接口（/backend/erp/report*）
+ * 统计口径只含「已生效」单据与库存流水，因此报表数字与往来账、库存结存永远一致。
+ * 公共参数：date_from、date_to（YYYY-MM-DD，缺省为当月）。
+ */
+
+export function getPurchaseSummary(params) {
+  return request({
+    url: '/backend/erp/report/purchase',
+    method: 'get',
+    params
+  })
+}
+
+export function getSalesSummary(params) {
+  return request({
+    url: '/backend/erp/report/sales',
+    method: 'get',
+    params
+  })
+}
+
+export function getSalesRank(params) {
+  return request({
+    url: '/backend/erp/report/rank',
+    method: 'get',
+    params
+  })
+}
+
+export function getStockMoveReport(params) {
+  return request({
+    url: '/backend/erp/report/stockmove',
+    method: 'get',
+    params
+  })
+}
+
+export function getProfitReport(params) {
+  return request({
+    url: '/backend/erp/report/profit',
+    method: 'get',
+    params
+  })
+}
+
+export function getRfmReport(params) {
+  return request({
+    url: '/backend/erp/report/rfm',
+    method: 'get',
+    params
+  })
+}
+
+export function getErpDashboard(params) {
+  return request({
+    url: '/backend/erp/report/dashboard',
+    method: 'get',
+    params
+  })
+}
diff --git a/backend/src/api/erpStock.js b/backend/src/api/erpStock.js
new file mode 100644
index 0000000..7dd7be2
--- /dev/null
+++ b/backend/src/api/erpStock.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+/**
+ * 进销存库存查询接口（/backend/erp/stock*）
+ * 结存全部由流水驱动，这里只有读接口 + 补货建议。
+ */
+
+export function getStockList(params) {
+  return request({
+    url: '/backend/erp/stock/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getStockLedger(params) {
+  return request({
+    url: '/backend/erp/stock/ledger',
+    method: 'get',
+    params
+  })
+}
+
+export function getStockWarning(params) {
+  return request({
+    url: '/backend/erp/stock/warning',
+    method: 'get',
+    params
+  })
+}
+
+export function getReplenishList(params) {
+  return request({
+    url: '/backend/erp/stock/replenish',
+    method: 'get',
+    params
+  })
+}
+
+export function getBatchList(params) {
+  return request({
+    url: '/backend/erp/stock/batch',
+    method: 'get',
+    params
+  })
+}
diff --git a/backend/src/api/erpWarehouse.js b/backend/src/api/erpWarehouse.js
new file mode 100644
index 0000000..a45f005
--- /dev/null
+++ b/backend/src/api/erpWarehouse.js
@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+/** 进销存仓库档案接口（/backend/erp/warehouse*），列表带库存品种数与货值 */
+
+export async function getWarehouseList(params) {
+  const res = await request({
+    url: '/backend/erp/warehouse/list',
+    method: 'get',
+    params
+  })
+  // 后端按 {warehouse, stock_kinds, stock_value} 嵌套返回，拍平后下拉与表格可共用同一行结构
+  if (res && res.code === 200 && Array.isArray(res.data?.list)) {
+    res.data.list = res.data.list.map((row) => ({
+      ...(row.warehouse || {}),
+      stock_kinds: row.stock_kinds,
+      stock_value: row.stock_value
+    }))
+  }
+  return res
+}
+
+export function getWarehouseDetail(id) {
+  return request({
+    url: `/backend/erp/warehouse/${id}`,
+    method: 'get'
+  })
+}
+
+export function createWarehouse(data) {
+  return request({
+    url: '/backend/erp/warehouse',
+    method: 'post',
+    data
+  })
+}
+
+export function updateWarehouse(id, data) {
+  return request({
+    url: `/backend/erp/warehouse/${id}`,
+    method: 'put',
+    data
+  })
+}
+
+export function deleteWarehouse(id) {
+  return request({
+    url: `/backend/erp/warehouse/${id}`,
+    method: 'delete'
+  })
+}
diff --git a/backend/src/views/apps/erp/basic/product.vue b/backend/src/views/apps/erp/basic/product.vue
new file mode 100644
index 0000000..4c347e2
--- /dev/null
+++ b/backend/src/views/apps/erp/basic/product.vue
@@ -0,0 +1,658 @@
+<template>
+  <div class="product-page">
+    <div class="page-header">
+      <div>
+        <h2>商品档案</h2>
+        <p>多规格多单位、五级价格体系、安全库存与批次保质期设置</p>
+      </div>
+      <div class="header-actions">
+        <el-button type="primary" :icon="Plus" @click="openCreate">新增商品</el-button>
+      </div>
+    </div>
+
+    <div class="body">
+      <div class="cat-panel">
+        <div class="cat-head">
+          <span>商品分类</span>
+          <el-button link type="primary" size="small" :icon="Plus" @click="openCatEdit(null)">新增</el-button>
+        </div>
+        <el-input v-model="catFilter" size="small" placeholder="搜索分类" clearable :prefix-icon="Search" class="cat-search" />
+        <el-tree
+          ref="catTree"
+          :data="categoryTree"
+          :props="{ label: 'category_name', children: 'children' }"
+          node-key="id"
+          highlight-current
+          :filter-node-method="filterCat"
+          :expand-on-click-node="false"
+          default-expand-all
+          @node-click="onCatClick"
+        >
+          <template #default="{ data }">
+            <span class="cat-node">
+              <span>{{ data.category_name }}</span>
+              <span class="cat-count">{{ data.product_count || 0 }}</span>
+              <el-button link type="primary" size="small" @click.stop="openCatEdit(data)">改名</el-button>
+              <el-button link type="danger" size="small" @click.stop="removeCat(data)">删除</el-button>
+            </span>
+          </template>
+        </el-tree>
+        <div class="cat-all" @click="clearCat">全部商品</div>
+      </div>
+
+      <div class="main-panel">
+        <div class="filter-bar">
+          <el-form :inline="true" @submit.prevent>
+            <el-form-item>
+              <el-input v-model="filters.keyword" clearable placeholder="搜索名称/编码/条码/品牌" :prefix-icon="Search" style="width: 230px" @keyup.enter="handleSearch" />
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-select v-model="filters.status" clearable placeholder="全部" style="width: 110px" @change="handleSearch">
+                <el-option label="启用" value="1" />
+                <el-option label="停用" value="0" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+              <el-button :icon="Refresh" @click="resetFilters">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <div v-loading="loading" class="table-container">
+          <el-table :data="rows" stripe border size="small">
+            <el-table-column prop="product_code" label="编码" width="120" />
+            <el-table-column label="商品名称" min-width="180" show-overflow-tooltip>
+              <template #default="{ row }">
+                <span class="link" @click="openEdit(row)">{{ row.product_name }}</span>
+                <el-tag v-if="row.enable_batch === 1" size="small" effect="plain" type="warning" class="mini-tag">批次</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="spec" label="规格" width="110" show-overflow-tooltip />
+            <el-table-column prop="category_name" label="分类" width="110" show-overflow-tooltip />
+            <el-table-column label="单位" width="120" align="center">
+              <template #default="{ row }">
+                {{ row.base_unit }}<span v-if="row.aux_unit" class="text-muted"> / {{ row.aux_unit }}×{{ row.aux_ratio }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="采购价" width="100" align="right">
+              <template #default="{ row }">{{ money(row.purchase_price) }}</template>
+            </el-table-column>
+            <el-table-column label="零售价" width="100" align="right">
+              <template #default="{ row }">{{ money(row.sale_price) }}</template>
+            </el-table-column>
+            <el-table-column label="最低价" width="100" align="right">
+              <template #default="{ row }">
+                <span :class="{ 'text-muted': !row.min_price }">{{ money(row.min_price) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="库存" width="100" align="right">
+              <template #default="{ row }">
+                <span :class="stockClass(row.safety_state)">{{ qty(row.total_stock) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="安全/最高" width="110" align="right">
+              <template #default="{ row }">
+                <span class="text-muted">{{ qty(row.safety_qty) }} / {{ qty(row.max_qty) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" width="80" align="center">
+              <template #default="{ row }">
+                <el-tag :type="row.status === 1 ? 'success' : 'info'" size="small">{{ row.status === 1 ? '启用' : '停用' }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="180" align="center" fixed="right">
+              <template #default="{ row }">
+                <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
+                <el-button link type="success" size="small" @click="toggle(row)">{{ row.status === 1 ? '停用' : '启用' }}</el-button>
+                <el-button link type="danger" size="small" @click="remove(row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div class="pagination">
+            <el-pagination
+              v-model:current-page="page.page"
+              v-model:page-size="page.pageSize"
+              :total="page.total"
+              :page-sizes="[20, 50, 100]"
+              layout="total, sizes, prev, pager, next"
+              @size-change="fetchList"
+              @current-change="fetchList"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <el-drawer v-model="editVisible" :title="editForm.id ? '编辑商品' : '新增商品'" direction="rtl" size="52%">
+      <el-form :model="editForm" label-width="100px" class="edit-form">
+        <div class="form-group">基本信息</div>
+        <el-row :gutter="16">
+          <el-col :span="12"><el-form-item label="商品名称" required><el-input v-model="editForm.product_name" maxlength="200" /></el-form-item></el-col>
+          <el-col :span="12"><el-form-item label="商品编码"><el-input v-model="editForm.product_code" placeholder="留空自动生成" /></el-form-item></el-col>
+          <el-col :span="12">
+            <el-form-item label="分类">
+              <el-tree-select
+                v-model="editForm.category_id"
+                :data="categoryTree"
+                :props="{ label: 'category_name', children: 'children', value: 'id' }"
+                check-strictly
+                clearable
+                placeholder="请选择分类"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"><el-form-item label="品牌"><el-input v-model="editForm.brand" /></el-form-item></el-col>
+          <el-col :span="6"><el-form-item label="型号"><el-input v-model="editForm.model" /></el-form-item></el-col>
+          <el-col :span="12"><el-form-item label="规格"><el-input v-model="editForm.spec" placeholder="如 500g/袋" /></el-form-item></el-col>
+          <el-col :span="12"><el-form-item label="条码"><el-input v-model="editForm.barcode" /></el-form-item></el-col>
+        </el-row>
+
+        <div class="form-group">单位与换算</div>
+        <el-row :gutter="16">
+          <el-col :span="8"><el-form-item label="基本单位" required><el-input v-model="editForm.base_unit" placeholder="个/箱/kg" /></el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="辅助单位"><el-input v-model="editForm.aux_unit" placeholder="如 箱" /></el-form-item></el-col>
+          <el-col :span="8">
+            <el-form-item label="换算系数">
+              <el-input-number v-model="editForm.aux_ratio" :min="0" :precision="4" :step="1" controls-position="right" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="form-hint">库存与销售一律按基本单位记账，换算系数表示 1 个辅助单位等于多少基本单位。</div>
+
+        <div class="form-group">价格体系</div>
+        <el-row :gutter="16">
+          <el-col :span="8"><el-form-item label="采购价"><el-input-number v-model="editForm.purchase_price" :min="0" :precision="4" controls-position="right" style="width: 100%" /></el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="零售价"><el-input-number v-model="editForm.sale_price" :min="0" :precision="4" controls-position="right" style="width: 100%" /></el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="批发价"><el-input-number v-model="editForm.wholesale_price" :min="0" :precision="4" controls-position="right" style="width: 100%" /></el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="会员价"><el-input-number v-model="editForm.member_price" :min="0" :precision="4" controls-position="right" style="width: 100%" /></el-form-item></el-col>
+          <el-col :span="8">
+            <el-form-item label="最低售价">
+              <el-input-number v-model="editForm.min_price" :min="0" :precision="4" controls-position="right" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="税率(%)">
+              <el-input-number v-model="editForm.tax_rate" :min="0" :max="100" :precision="2" controls-position="right" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="form-hint">最低售价用于销售出库的限价校验，低于该价需有审核权限。</div>
+
+        <div class="form-group">库存与批次</div>
+        <el-row :gutter="16">
+          <el-col :span="8"><el-form-item label="安全库存"><el-input-number v-model="editForm.safety_qty" :min="0" :precision="4" controls-position="right" style="width: 100%" /></el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="最高库存"><el-input-number v-model="editForm.max_qty" :min="0" :precision="4" controls-position="right" style="width: 100%" /></el-form-item></el-col>
+          <el-col :span="8"><el-form-item label="保质期(天)"><el-input-number v-model="editForm.shelf_life_days" :min="0" :precision="0" controls-position="right" style="width: 100%" /></el-form-item></el-col>
+          <el-col :span="8">
+            <el-form-item label="批次管理">
+              <el-switch v-model="editForm.enable_batch" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="状态">
+              <el-switch v-model="editForm.status" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="停用" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24"><el-form-item label="备注"><el-input v-model="editForm.remark" type="textarea" :rows="2" maxlength="500" /></el-form-item></el-col>
+        </el-row>
+      </el-form>
+
+      <template #footer>
+        <el-button @click="editVisible = false">取消</el-button>
+        <el-button type="primary" :loading="saving" @click="submit">保存</el-button>
+      </template>
+    </el-drawer>
+
+    <el-dialog v-model="catVisible" :title="catForm.id ? '编辑分类' : '新增分类'" width="420px">
+      <el-form :model="catForm" label-width="90px">
+        <el-form-item label="上级">
+          <el-tree-select
+            v-model="catForm.parent_id"
+            :data="categoryTree"
+            :props="{ label: 'category_name', children: 'children', value: 'id' }"
+            check-strictly
+            clearable
+            placeholder="不选为一级分类"
+            style="width: 100%"
+          />
+        </el-form-item>
+        <el-form-item label="名称" required><el-input v-model="catForm.category_name" maxlength="50" /></el-form-item>
+        <el-form-item label="排序"><el-input-number v-model="catForm.sort_order" :min="0" :precision="0" controls-position="right" /></el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="catVisible = false">取消</el-button>
+        <el-button type="primary" :loading="catSaving" @click="submitCat">保存</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, reactive, ref, watch } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Plus, Search, Refresh } from '@element-plus/icons-vue'
+import {
+  createProduct,
+  deleteCategory,
+  deleteProduct,
+  getCategoryList,
+  getProductList,
+  saveCategory,
+  toggleProductStatus,
+  updateProduct
+} from '@/api/erpProduct'
+import { money, qty } from '../document/dict'
+
+const loading = ref(false)
+const saving = ref(false)
+const rows = ref([])
+const categoryTree = ref([])
+const catFilter = ref('')
+const catTree = ref(null)
+
+const filters = reactive({ keyword: '', status: '', category_id: '' })
+const page = reactive({ page: 1, pageSize: 20, total: 0 })
+
+const editVisible = ref(false)
+const editForm = reactive(emptyForm())
+
+const catVisible = ref(false)
+const catSaving = ref(false)
+const catForm = reactive({ id: 0, category_name: '', parent_id: undefined, sort_order: 0 })
+
+function emptyForm() {
+  return {
+    id: 0,
+    product_code: '',
+    product_name: '',
+    category_id: undefined,
+    brand: '',
+    spec: '',
+    model: '',
+    base_unit: '个',
+    aux_unit: '',
+    aux_ratio: 1,
+    barcode: '',
+    extra_barcodes: '',
+    purchase_price: 0,
+    sale_price: 0,
+    wholesale_price: 0,
+    member_price: 0,
+    min_price: 0,
+    tax_rate: 0,
+    safety_qty: 0,
+    max_qty: 0,
+    shelf_life_days: 0,
+    enable_batch: 0,
+    status: 1,
+    remark: ''
+  }
+}
+
+const stockClass = (state) => (state === 'low' ? 'danger' : state === 'over' ? 'warning' : '')
+
+watch(catFilter, (v) => catTree.value && catTree.value.filter(v))
+
+function filterCat(value, data) {
+  if (!value) return true
+  return String(data.category_name || '').includes(value)
+}
+
+async function fetchCategories() {
+  try {
+    const res = await getCategoryList()
+    if (res.code === 200) categoryTree.value = res.data.tree || []
+  } catch (e) {
+    categoryTree.value = []
+  }
+}
+
+async function fetchList() {
+  loading.value = true
+  try {
+    const params = { page: page.page, pageSize: page.pageSize }
+    if (filters.keyword) params.keyword = filters.keyword
+    if (filters.status !== '') params.status = filters.status
+    if (filters.category_id) params.category_id = filters.category_id
+    const res = await getProductList(params)
+    if (res.code === 200) {
+      rows.value = res.data.list || []
+      page.total = Number(res.data.total) || 0
+    } else {
+      ElMessage.error(res.msg || '商品加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '商品加载失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+function handleSearch() {
+  page.page = 1
+  fetchList()
+}
+
+function resetFilters() {
+  filters.keyword = ''
+  filters.status = ''
+  handleSearch()
+}
+
+function onCatClick(node) {
+  filters.category_id = node.id
+  handleSearch()
+}
+
+function clearCat() {
+  filters.category_id = ''
+  if (catTree.value) catTree.value.setCurrentKey(null)
+  handleSearch()
+}
+
+function openCreate() {
+  Object.assign(editForm, emptyForm())
+  if (filters.category_id) editForm.category_id = filters.category_id
+  editVisible.value = true
+}
+
+function openEdit(row) {
+  Object.assign(editForm, emptyForm(), {
+    id: row.id,
+    product_code: row.product_code || '',
+    product_name: row.product_name || '',
+    category_id: row.category_id || undefined,
+    brand: row.brand || '',
+    spec: row.spec || '',
+    model: row.model || '',
+    base_unit: row.base_unit || '个',
+    aux_unit: row.aux_unit || '',
+    aux_ratio: Number(row.aux_ratio) || 1,
+    barcode: row.barcode || '',
+    extra_barcodes: row.extra_barcodes || '',
+    purchase_price: Number(row.purchase_price) || 0,
+    sale_price: Number(row.sale_price) || 0,
+    wholesale_price: Number(row.wholesale_price) || 0,
+    member_price: Number(row.member_price) || 0,
+    min_price: Number(row.min_price) || 0,
+    tax_rate: Number(row.tax_rate) || 0,
+    safety_qty: Number(row.safety_qty) || 0,
+    max_qty: Number(row.max_qty) || 0,
+    shelf_life_days: Number(row.shelf_life_days) || 0,
+    enable_batch: Number(row.enable_batch) || 0,
+    status: Number(row.status) || 0,
+    remark: row.remark || ''
+  })
+  editVisible.value = true
+}
+
+async function submit() {
+  if (!editForm.product_name.trim()) {
+    ElMessage.warning('请填写商品名称')
+    return
+  }
+  if (!String(editForm.base_unit || '').trim()) {
+    ElMessage.warning('请填写基本单位')
+    return
+  }
+  const payload = { ...editForm }
+  delete payload.id
+  delete payload.total_stock
+  delete payload.safety_state
+  delete payload.category_name
+  payload.category_id = Number(payload.category_id) || 0
+  saving.value = true
+  try {
+    const res = editForm.id ? await updateProduct(editForm.id, payload) : await createProduct(payload)
+    if (res.code === 200) {
+      ElMessage.success('已保存')
+      editVisible.value = false
+      fetchList()
+      fetchCategories()
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+async function toggle(row) {
+  try {
+    await toggleProductStatus(row.id, row.status === 1 ? 0 : 1)
+    ElMessage.success('状态已更新')
+  } catch (e) {
+    ElMessage.error(e.message || '操作失败')
+  }
+  fetchList()
+}
+
+async function remove(row) {
+  try {
+    await ElMessageBox.confirm(`确认删除商品「${row.product_name}」？`, '删除确认', { type: 'warning' })
+  } catch (e) {
+    return
+  }
+  try {
+    await deleteProduct(row.id)
+    ElMessage.success('已删除')
+  } catch (e) {
+    ElMessage.error(e.message || '删除失败')
+    return
+  }
+  fetchList()
+  fetchCategories()
+}
+
+function openCatEdit(data) {
+  if (data) {
+    catForm.id = data.id
+    catForm.category_name = data.category_name
+    catForm.parent_id = data.parent_id || undefined
+    catForm.sort_order = Number(data.sort_order) || 0
+  } else {
+    catForm.id = 0
+    catForm.category_name = ''
+    catForm.parent_id = filters.category_id || undefined
+    catForm.sort_order = 0
+  }
+  catVisible.value = true
+}
+
+async function submitCat() {
+  if (!catForm.category_name.trim()) {
+    ElMessage.warning('请填写分类名称')
+    return
+  }
+  catSaving.value = true
+  try {
+    const res = await saveCategory({
+      id: catForm.id,
+      category_name: catForm.category_name,
+      parent_id: Number(catForm.parent_id) || 0,
+      sort_order: catForm.sort_order
+    })
+    if (res.code === 200) {
+      ElMessage.success('分类已保存')
+      catVisible.value = false
+      fetchCategories()
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '保存失败')
+  } finally {
+    catSaving.value = false
+  }
+}
+
+async function removeCat(data) {
+  try {
+    await ElMessageBox.confirm(`确认删除分类「${data.category_name}」？`, '删除确认', { type: 'warning' })
+  } catch (e) {
+    return
+  }
+  try {
+    await deleteCategory(data.id)
+    ElMessage.success('已删除')
+    if (filters.category_id === data.id) clearCat()
+    fetchCategories()
+    fetchList()
+  } catch (e) {
+    ElMessage.error(e.message || '删除失败')
+  }
+}
+
+onMounted(() => {
+  fetchCategories()
+  fetchList()
+})
+</script>
+
+<style lang="less" scoped>
+.product-page {
+  padding: 20px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 20px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.body {
+  display: flex;
+  gap: 16px;
+  align-items: flex-start;
+}
+
+.cat-panel {
+  width: 230px;
+  flex: 0 0 230px;
+  background: var(--el-bg-color);
+  border: 1px solid var(--el-border-color-lighter);
+  border-radius: 4px;
+  padding: 12px;
+}
+
+.cat-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 14px;
+  font-weight: 600;
+  margin-bottom: 10px;
+}
+
+.cat-search {
+  margin-bottom: 10px;
+}
+
+.cat-node {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  width: 100%;
+  font-size: 13px;
+}
+
+.cat-count {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.cat-all {
+  margin-top: 10px;
+  padding: 6px 8px;
+  font-size: 13px;
+  color: var(--el-color-primary);
+  cursor: pointer;
+  border-radius: 4px;
+
+  &:hover {
+    background: var(--el-color-primary-light-9);
+  }
+}
+
+.main-panel {
+  flex: 1;
+  min-width: 0;
+}
+
+.filter-bar {
+  background: var(--el-bg-color);
+  padding: 16px 16px 0;
+  border-radius: 4px;
+  margin-bottom: 16px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.table-container {
+  background: var(--el-bg-color);
+  padding: 16px;
+  border-radius: 4px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.link {
+  cursor: pointer;
+  color: var(--el-color-primary);
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.mini-tag {
+  margin-left: 6px;
+}
+
+.text-muted {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.danger {
+  color: var(--el-color-danger);
+}
+
+.warning {
+  color: var(--el-color-warning);
+}
+
+.pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16px;
+}
+
+.form-group {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--el-color-primary);
+  margin: 6px 0 12px;
+  padding-left: 8px;
+  border-left: 3px solid var(--el-color-primary);
+}
+
+.form-hint {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  margin: -6px 0 12px;
+}
+</style>
diff --git a/backend/src/views/apps/erp/basic/warehouse.vue b/backend/src/views/apps/erp/basic/warehouse.vue
new file mode 100644
index 0000000..3a1bd32
--- /dev/null
+++ b/backend/src/views/apps/erp/basic/warehouse.vue
@@ -0,0 +1,247 @@
+<template>
+  <div class="warehouse-page">
+    <div class="page-header">
+      <div>
+        <h2>仓库档案</h2>
+        <p>多仓管理、默认仓库设置，列表显示各仓在库品种数与货值</p>
+      </div>
+      <div class="header-actions">
+        <el-button type="primary" :icon="Plus" @click="openCreate">新增仓库</el-button>
+      </div>
+    </div>
+
+    <div v-loading="loading" class="table-container">
+      <el-table :data="rows" stripe border size="small">
+        <el-table-column prop="warehouse_code" label="仓库编号" width="140" />
+        <el-table-column label="仓库名称" min-width="160">
+          <template #default="{ row }">
+            <span class="link" @click="openEdit(row)">{{ row.warehouse_name }}</span>
+            <el-tag v-if="row.is_default === 1" type="success" size="small" effect="plain" class="mini-tag">默认仓</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="manager" label="负责人" width="110" />
+        <el-table-column prop="phone" label="联系电话" width="130" />
+        <el-table-column prop="address" label="地址" min-width="180" show-overflow-tooltip />
+        <el-table-column label="在库品种" width="100" align="right">
+          <template #default="{ row }">{{ row.stock_kinds || 0 }}</template>
+        </el-table-column>
+        <el-table-column label="库存货值" width="130" align="right">
+          <template #default="{ row }">{{ money(row.stock_value) }}</template>
+        </el-table-column>
+        <el-table-column label="状态" width="80" align="center">
+          <template #default="{ row }">
+            <el-tag :type="row.status === 1 ? 'success' : 'info'" size="small">{{ row.status === 1 ? '启用' : '停用' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="190" align="center" fixed="right">
+          <template #default="{ row }">
+            <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
+            <el-button v-if="row.is_default !== 1" link type="success" size="small" @click="setDefault(row)">设为默认</el-button>
+            <el-button link type="danger" size="small" @click="remove(row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <el-drawer v-model="editVisible" :title="form.id ? '编辑仓库' : '新增仓库'" direction="rtl" size="420px">
+      <el-form :model="form" label-width="90px">
+        <el-form-item label="仓库名称" required><el-input v-model="form.warehouse_name" maxlength="100" /></el-form-item>
+        <el-form-item label="仓库编号"><el-input v-model="form.warehouse_code" placeholder="留空自动生成" /></el-form-item>
+        <el-form-item label="负责人"><el-input v-model="form.manager" /></el-form-item>
+        <el-form-item label="联系电话"><el-input v-model="form.phone" maxlength="20" /></el-form-item>
+        <el-form-item label="地址"><el-input v-model="form.address" type="textarea" :rows="2" /></el-form-item>
+        <el-form-item label="默认仓库">
+          <el-switch v-model="form.is_default" :active-value="1" :inactive-value="0" />
+          <span class="hint">开单时默认带出该仓</span>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch v-model="form.status" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="停用" />
+        </el-form-item>
+        <el-form-item label="备注"><el-input v-model="form.remark" type="textarea" :rows="2" maxlength="500" /></el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="editVisible = false">取消</el-button>
+        <el-button type="primary" :loading="saving" @click="submit">保存</el-button>
+      </template>
+    </el-drawer>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import { createWarehouse, deleteWarehouse, getWarehouseList, updateWarehouse } from '@/api/erpWarehouse'
+import { money } from '../document/dict'
+
+const loading = ref(false)
+const saving = ref(false)
+const editVisible = ref(false)
+const rows = ref([])
+const form = reactive({
+  id: 0,
+  warehouse_code: '',
+  warehouse_name: '',
+  address: '',
+  manager: '',
+  phone: '',
+  is_default: 0,
+  status: 1,
+  remark: ''
+})
+
+async function fetchList() {
+  loading.value = true
+  try {
+    const res = await getWarehouseList({})
+    if (res.code === 200) rows.value = res.data.list || []
+    else ElMessage.error(res.msg || '仓库加载失败')
+  } catch (e) {
+    ElMessage.error(e.message || '仓库加载失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+function openCreate() {
+  Object.assign(form, {
+    id: 0,
+    warehouse_code: '',
+    warehouse_name: '',
+    address: '',
+    manager: '',
+    phone: '',
+    is_default: rows.value.length === 0 ? 1 : 0,
+    status: 1,
+    remark: ''
+  })
+  editVisible.value = true
+}
+
+function openEdit(row) {
+  Object.assign(form, {
+    id: row.id,
+    warehouse_code: row.warehouse_code || '',
+    warehouse_name: row.warehouse_name || '',
+    address: row.address || '',
+    manager: row.manager || '',
+    phone: row.phone || '',
+    is_default: Number(row.is_default) || 0,
+    status: Number(row.status) || 0,
+    remark: row.remark || ''
+  })
+  editVisible.value = true
+}
+
+async function submit() {
+  if (!form.warehouse_name.trim()) {
+    ElMessage.warning('请填写仓库名称')
+    return
+  }
+  const payload = { ...form }
+  delete payload.id
+  saving.value = true
+  try {
+    const res = form.id ? await updateWarehouse(form.id, payload) : await createWarehouse(payload)
+    if (res.code === 200) {
+      ElMessage.success('已保存')
+      editVisible.value = false
+      fetchList()
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+async function setDefault(row) {
+  try {
+    await updateWarehouse(row.id, {
+      warehouse_code: row.warehouse_code,
+      warehouse_name: row.warehouse_name,
+      address: row.address,
+      manager: row.manager,
+      phone: row.phone,
+      is_default: 1,
+      status: row.status,
+      remark: row.remark
+    })
+    ElMessage.success('已设为默认仓库')
+  } catch (e) {
+    ElMessage.error(e.message || '操作失败')
+    return
+  }
+  fetchList()
+}
+
+async function remove(row) {
+  try {
+    await ElMessageBox.confirm(`确认删除仓库「${row.warehouse_name}」？`, '删除确认', { type: 'warning' })
+  } catch (e) {
+    return
+  }
+  try {
+    await deleteWarehouse(row.id)
+    ElMessage.success('已删除')
+  } catch (e) {
+    ElMessage.error(e.message || '删除失败')
+    return
+  }
+  fetchList()
+}
+
+onMounted(fetchList)
+</script>
+
+<style lang="less" scoped>
+.warehouse-page {
+  padding: 20px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 20px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.table-container {
+  background: var(--el-bg-color);
+  padding: 16px;
+  border-radius: 4px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.link {
+  cursor: pointer;
+  color: var(--el-color-primary);
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.mini-tag {
+  margin-left: 6px;
+}
+
+.hint {
+  margin-left: 10px;
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+</style>
diff --git a/backend/src/views/apps/erp/customer/components/edit.vue b/backend/src/views/apps/erp/customer/components/edit.vue
index 64d637d..3b923cf 100644
--- a/backend/src/views/apps/erp/customer/components/edit.vue
+++ b/backend/src/views/apps/erp/customer/components/edit.vue
@@ -148,6 +148,37 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="信用额度">
+              <el-input-number
+                v-model="form.credit_limit"
+                :min="0"
+                :precision="2"
+                :step="1000"
+                controls-position="right"
+                placeholder="0 表示不限制"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="账期(天)">
+              <el-input-number
+                v-model="form.payment_days"
+                :min="0"
+                :precision="0"
+                :step="10"
+                controls-position="right"
+                placeholder="0 表示现结"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <div class="credit-tip">
+              信用额度用于销售出库审核时的超限拦截，账期决定应收单的到期日与逾期起算。
+            </div>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="经营范围" prop="business_scope">
               <el-input
@@ -348,6 +379,8 @@ const defaultForm = () => ({
   address: "",
   status: "1",
   is_draft: 0,
+  credit_limit: 0,
+  payment_days: 0,
   remark: "",
   invoice_title: "",
   tax_number: "",
@@ -499,6 +532,12 @@ function handleSaveDraft() {
   padding: 0 20px;
 }
 
+.credit-tip {
+  margin: -8px 0 12px;
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
 .dialog-footer {
   display: flex;
   justify-content: space-between;
diff --git a/backend/src/views/apps/erp/dashboard/index.vue b/backend/src/views/apps/erp/dashboard/index.vue
index 42eeb48..8143520 100644
--- a/backend/src/views/apps/erp/dashboard/index.vue
+++ b/backend/src/views/apps/erp/dashboard/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="erp-dashboard">
+  <div v-loading="loading" class="erp-dashboard">
     <!-- 第一行统计卡片 -->
     <el-row :gutter="16" class="stat-row">
       <el-col :span="4" :xs="12" v-for="(item, index) in firstRowStats" :key="'first-' + index">
@@ -9,8 +9,8 @@
             <el-icon class="stat-icon"><Info-Filled /></el-icon>
           </div>
           <div class="stat-value">
-            <span class="currency">¥</span>
-            <span class="number">{{ formatMoney(item.value) }}</span>
+            <span v-if="item.prefix" class="currency">{{ item.prefix }}</span>
+            <span class="number">{{ item.text }}</span>
           </div>
         </div>
       </el-col>
@@ -25,8 +25,8 @@
             <el-icon class="stat-icon"><Info-Filled /></el-icon>
           </div>
           <div class="stat-value">
-            <span class="currency">¥</span>
-            <span class="number">{{ formatMoney(item.value) }}</span>
+            <span v-if="item.prefix" class="currency">{{ item.prefix }}</span>
+            <span class="number">{{ item.text }}</span>
           </div>
         </div>
       </el-col>
@@ -36,19 +36,19 @@
     <el-row :gutter="16" class="chart-row" style="margin-top: 16px;">
       <el-col :span="8" :xs="24">
         <div class="chart-card">
-          <div class="chart-title">销售统计</div>
+          <div class="chart-title">销售趋势</div>
           <div ref="salesChartRef" class="chart-container"></div>
         </div>
       </el-col>
       <el-col :span="8" :xs="24">
         <div class="chart-card">
-          <div class="chart-title">零售统计</div>
-          <div ref="retailChartRef" class="chart-container"></div>
+          <div class="chart-title">购销差额</div>
+          <div ref="netChartRef" class="chart-container"></div>
         </div>
       </el-col>
       <el-col :span="8" :xs="24">
         <div class="chart-card">
-          <div class="chart-title">采购统计</div>
+          <div class="chart-title">采购趋势</div>
           <div ref="purchaseChartRef" class="chart-container"></div>
         </div>
       </el-col>
@@ -60,39 +60,32 @@
 import { ref, onMounted, onUnmounted, shallowRef, nextTick } from 'vue';
 import * as echarts from 'echarts';
 import { InfoFilled } from '@element-plus/icons-vue';
+import { ElMessage } from 'element-plus';
+import { getErpDashboard } from '@/api/erpReport';
 
-// 统计卡片数据 - 第一行
-const firstRowStats = ref([
-  { label: '今日销售', value: 0 },
-  { label: '今日零售', value: 0 },
-  { label: '今日采购', value: 0 },
-  { label: '本月累计销售', value: 0 },
-  { label: '本月累计零售', value: 0 },
-  { label: '本月累计采购', value: 0 },
-]);
+type Stat = { label: string; text: string; prefix?: string };
 
-// 统计卡片数据 - 第二行
-const secondRowStats = ref([
-  { label: '昨日销售', value: 0 },
-  { label: '昨日零售', value: 0 },
-  { label: '昨日采购', value: 0 },
-  { label: '今年累计销售', value: 0 },
-  { label: '今年累计零售', value: 0 },
-  { label: '今年累计采购', value: 0 },
-]);
+const loading = ref(false);
+
+// 统计卡片数据 - 第一行（金额）
+const firstRowStats = ref<Stat[]>([]);
+
+// 统计卡片数据 - 第二行（成本、往来与预警）
+const secondRowStats = ref<Stat[]>([]);
 
 // 图表实例
 const salesChartRef = ref<HTMLElement | null>(null);
-const retailChartRef = ref<HTMLElement | null>(null);
+const netChartRef = ref<HTMLElement | null>(null);
 const purchaseChartRef = ref<HTMLElement | null>(null);
 const salesChartInstance = shallowRef<echarts.ECharts | null>(null);
-const retailChartInstance = shallowRef<echarts.ECharts | null>(null);
+const netChartInstance = shallowRef<echarts.ECharts | null>(null);
 const purchaseChartInstance = shallowRef<echarts.ECharts | null>(null);
 
 // 格式化金额
-const formatMoney = (value: number): string => {
-  return value.toLocaleString();
-};
+const money = (value: unknown): string =>
+  Number(value || 0).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+
+const plain = (value: unknown): string => String(Number(value || 0));
 
 // 生成最近6个月的月份标签
 const getMonthLabels = (): string[] => {
@@ -170,69 +163,80 @@ const initCharts = () => {
   if (salesChartRef.value) {
     salesChartInstance.value = initChart(salesChartRef.value, '销售', '#409EFF');
   }
-  if (retailChartRef.value) {
-    retailChartInstance.value = initChart(retailChartRef.value, '零售', '#67C23A');
+  if (netChartRef.value) {
+    netChartInstance.value = initChart(netChartRef.value, '购销差额', '#67C23A');
   }
   if (purchaseChartRef.value) {
     purchaseChartInstance.value = initChart(purchaseChartRef.value, '采购', '#E6A23C');
   }
 };
 
-// 加载数据（模拟接口调用）
+// 加载数据：口径与报表中心完全一致（只统计已生效单据与库存流水）
 const loadData = async () => {
-  // TODO: 调用接口获取真实数据
-  // const res = await getErpDashboard();
-  
-  // 模拟数据更新
-  firstRowStats.value = [
-    { label: '今日销售', value: 12580 },
-    { label: '今日零售', value: 8560 },
-    { label: '今日采购', value: 23400 },
-    { label: '本月累计销售', value: 358600 },
-    { label: '本月累计零售', value: 245800 },
-    { label: '本月累计采购', value: 568900 },
-  ];
-  
-  secondRowStats.value = [
-    { label: '昨日销售', value: 15230 },
-    { label: '昨日零售', value: 9870 },
-    { label: '昨日采购', value: 18900 },
-    { label: '今年累计销售', value: 2856000 },
-    { label: '今年累计零售', value: 1985000 },
-    { label: '今年累计采购', value: 4568000 },
-  ];
-  
-  // 更新图表数据
-  updateCharts();
+  loading.value = true;
+  try {
+    const res = await getErpDashboard({});
+    if (res.code !== 200) {
+      throw new Error(res.msg || '看板数据加载失败');
+    }
+    const d = res.data || {};
+    const m = d.month || {};
+    const t = d.today || {};
+    const s = d.stock || {};
+    const b = d.partner_bill || {};
+    const w = d.warning || {};
+
+    firstRowStats.value = [
+      { label: '今日销售额', text: money(t.sales_amount), prefix: '¥' },
+      { label: '本月销售额', text: money(m.sales_amount), prefix: '¥' },
+      { label: '本月采购额', text: money(m.purchase_amount), prefix: '¥' },
+      { label: '本月毛利', text: money(m.profit), prefix: '¥' },
+      { label: '库存金额', text: money(s.value), prefix: '¥' },
+      { label: '未结应收', text: money(b.receivable), prefix: '¥' },
+    ];
+    secondRowStats.value = [
+      { label: '本月销售成本', text: money(m.cost), prefix: '¥' },
+      { label: '本月退货额', text: money(m.return_amount), prefix: '¥' },
+      { label: '未结应付', text: money(b.payable), prefix: '¥' },
+      { label: '往来净额', text: money(b.net), prefix: '¥' },
+      { label: '本月毛利率', text: `${Number(m.profit_rate || 0).toFixed(2)}%` },
+      { label: '缺货 / 低于安全库存', text: `${plain(w.out)} / ${plain(w.low)}` },
+    ];
+    updateCharts(d.trend || []);
+  } catch (e: any) {
+    ElMessage.error(e?.message || '看板数据加载失败');
+  } finally {
+    loading.value = false;
+  }
 };
 
 // 更新图表数据
-const updateCharts = () => {
-  const salesData = [28000, 32000, 35000, 38000, 42000, 358600];
-  const retailData = [18000, 21000, 22000, 25000, 28000, 245800];
-  const purchaseData = [45000, 48000, 52000, 55000, 58000, 568900];
-  
+const updateCharts = (trend: Array<{ sale?: number; buy?: number }>) => {
+  const sale = trend.map((x) => Number(x.sale || 0));
+  const buy = trend.map((x) => Number(x.buy || 0));
+  const net = trend.map((x) => Number(x.sale || 0) - Number(x.buy || 0));
+
   if (salesChartInstance.value) {
-    salesChartInstance.value.setOption({ series: [{ data: salesData }] });
+    salesChartInstance.value.setOption({ series: [{ data: sale }] });
   }
-  if (retailChartInstance.value) {
-    retailChartInstance.value.setOption({ series: [{ data: retailData }] });
+  if (netChartInstance.value) {
+    netChartInstance.value.setOption({ series: [{ data: net }] });
   }
   if (purchaseChartInstance.value) {
-    purchaseChartInstance.value.setOption({ series: [{ data: purchaseData }] });
+    purchaseChartInstance.value.setOption({ series: [{ data: buy }] });
   }
 };
 
 // 自适应窗口大小
 const handleResize = () => {
   salesChartInstance.value?.resize();
-  retailChartInstance.value?.resize();
+  netChartInstance.value?.resize();
   purchaseChartInstance.value?.resize();
 };
 
 onMounted(async () => {
-  initCharts();
   await nextTick();
+  initCharts();
   await loadData();
   window.addEventListener('resize', handleResize);
 });
@@ -240,7 +244,7 @@ onMounted(async () => {
 onUnmounted(() => {
   window.removeEventListener('resize', handleResize);
   salesChartInstance.value?.dispose();
-  retailChartInstance.value?.dispose();
+  netChartInstance.value?.dispose();
   purchaseChartInstance.value?.dispose();
 });
 </script>
diff --git a/backend/src/views/apps/erp/document/DocDetailDrawer.vue b/backend/src/views/apps/erp/document/DocDetailDrawer.vue
new file mode 100644
index 0000000..77fa976
--- /dev/null
+++ b/backend/src/views/apps/erp/document/DocDetailDrawer.vue
@@ -0,0 +1,185 @@
+<template>
+  <el-drawer
+    :model-value="visible"
+    :title="title"
+    direction="rtl"
+    size="60%"
+    @open="load"
+    @close="close"
+  >
+    <div v-loading="loading" class="doc-detail">
+      <template v-if="doc.id">
+        <el-descriptions :column="3" border size="small">
+          <el-descriptions-item label="单据编号">{{ doc.doc_no }}</el-descriptions-item>
+          <el-descriptions-item label="业务日期">{{ dateOnly(doc.biz_date) }}</el-descriptions-item>
+          <el-descriptions-item label="状态">
+            <el-tag :type="docStatusTag(doc.status)" size="small">{{ docStatusText(doc.status) }}</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="往来单位">{{ doc.partner_name || '-' }}</el-descriptions-item>
+          <el-descriptions-item :label="doc.to_warehouse_name ? '调出仓库' : '仓库'">
+            {{ doc.warehouse_name || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="doc.to_warehouse_name" label="调入仓库">
+            {{ doc.to_warehouse_name }}
+          </el-descriptions-item>
+          <el-descriptions-item label="来源单据">{{ doc.source_doc_no || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="制单">{{ doc.create_user_name || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="审核">{{ doc.auditor_name || '-' }}</el-descriptions-item>
+          <el-descriptions-item v-if="showPrice" label="单据金额">{{ money(doc.total_amount) }}</el-descriptions-item>
+          <el-descriptions-item v-if="showPrice" label="整单折扣">{{ money(doc.discount_amount) }}</el-descriptions-item>
+          <el-descriptions-item v-if="showPrice" label="成交金额">
+            <span class="amount">{{ money(doc.actual_amount) }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="合计数量">{{ qty(doc.total_qty) }}</el-descriptions-item>
+          <el-descriptions-item label="备注" :span="3">{{ doc.remark || '-' }}</el-descriptions-item>
+        </el-descriptions>
+
+        <div class="section-title">明细行</div>
+        <el-table :data="doc.items || []" border size="small">
+          <el-table-column type="index" label="#" width="46" align="center" />
+          <el-table-column prop="product_code" label="商品编码" width="120" />
+          <el-table-column prop="product_name" label="商品名称" min-width="160" />
+          <el-table-column prop="spec" label="规格" width="110" />
+          <el-table-column prop="unit" label="单位" width="64" align="center" />
+          <el-table-column label="数量" width="96" align="right">
+            <template #default="{ row }">{{ qty(row.quantity) }}</template>
+          </el-table-column>
+          <el-table-column v-if="isStockTake" label="账面数" width="96" align="right">
+            <template #default="{ row }">{{ qty(row.book_qty) }}</template>
+          </el-table-column>
+          <el-table-column v-if="hasExecuted" label="已执行" width="96" align="right">
+            <template #default="{ row }">
+              <span :class="{ 'text-muted': !row.executed_qty }">{{ qty(row.executed_qty) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="hasExecuted" label="未执行" width="96" align="right">
+            <template #default="{ row }">{{ qty(row.quantity - row.executed_qty) }}</template>
+          </el-table-column>
+          <el-table-column v-if="showPrice" label="单价" width="100" align="right">
+            <template #default="{ row }">{{ money(row.unit_price) }}</template>
+          </el-table-column>
+          <el-table-column v-if="showPrice" label="金额" width="110" align="right">
+            <template #default="{ row }">{{ money(row.amount) }}</template>
+          </el-table-column>
+          <el-table-column prop="batch_no" label="批次" width="110" />
+          <el-table-column v-if="showBatchDates" label="到期日" width="110">
+            <template #default="{ row }">{{ dateOnly(row.expire_date) }}</template>
+          </el-table-column>
+          <el-table-column prop="remark" label="行备注" min-width="110" />
+        </el-table>
+
+        <template v-if="doc.instance">
+          <div class="section-title">审批进度</div>
+          <div class="inst-head">
+            <span>{{ doc.instance.flow_name || '审批流程' }}</span>
+            <el-tag size="small" :type="doc.instance.status === 2 ? 'success' : doc.instance.status === 3 ? 'danger' : 'warning'">
+              {{ doc.instance.status_label }}
+            </el-tag>
+            <span class="text-muted">提交人：{{ doc.instance.submit_name || '-' }}</span>
+            <span class="text-muted">当前节点：{{ doc.instance.current_node || '-' }}</span>
+          </div>
+          <el-timeline class="inst-line">
+            <el-timeline-item
+              v-for="t in doc.instance.tasks || []"
+              :key="t.task_id"
+              :timestamp="dateOnly(t.finish_time || t.create_time)"
+              :type="t.status === 2 ? 'success' : t.status === 3 ? 'danger' : 'primary'"
+              size="small"
+            >
+              <b>{{ t.node_name }}</b> · {{ t.approver_name || '-' }} · {{ t.status_label }}
+              <div v-if="t.comment" class="text-muted">{{ t.comment }}</div>
+            </el-timeline-item>
+          </el-timeline>
+        </template>
+      </template>
+      <el-empty v-else-if="!loading" description="单据未找到" />
+    </div>
+  </el-drawer>
+</template>
+
+<script setup>
+import { computed, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getDocumentDetail } from '@/api/erpDocument'
+import {
+  dateOnly,
+  docStatusTag,
+  docStatusText,
+  docTypeLabel,
+  money,
+  qty
+} from './dict'
+
+const props = defineProps({
+  visible: { type: Boolean, default: false },
+  docId: { type: [Number, String], default: 0 }
+})
+const emit = defineEmits(['update:visible'])
+
+const doc = ref({})
+const loading = ref(false)
+
+const title = computed(() => (doc.value.doc_no ? `${docTypeLabel(doc.value.doc_type)} ${doc.value.doc_no}` : '单据详情'))
+const isStockTake = computed(() => doc.value.doc_type === 'stock_take')
+const showPrice = computed(() => String(doc.value.doc_type || '').startsWith('purchase')
+  || String(doc.value.doc_type || '').startsWith('sales')
+  || doc.value.doc_type === 'other_in')
+const showBatchDates = computed(() => String(doc.value.doc_type || '').startsWith('purchase')
+  || doc.value.doc_type === 'other_in')
+const hasExecuted = computed(() => (doc.value.items || []).some((it) => Number(it.executed_qty) > 0))
+
+watch(() => props.docId, () => { doc.value = {} })
+
+async function load() {
+  if (!props.docId) return
+  loading.value = true
+  try {
+    const res = await getDocumentDetail(props.docId)
+    if (res.code === 200) doc.value = res.data || {}
+    else ElMessage.error(res.msg || '单据加载失败')
+  } catch (e) {
+    ElMessage.error(e.message || '单据加载失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+function close() {
+  emit('update:visible', false)
+}
+</script>
+
+<style lang="less" scoped>
+.doc-detail {
+  padding-bottom: 8px;
+}
+
+.section-title {
+  margin: 18px 0 10px;
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.amount {
+  color: var(--el-color-danger);
+  font-weight: 600;
+}
+
+.text-muted {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.inst-head {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  font-size: 13px;
+  margin-bottom: 12px;
+}
+
+.inst-line {
+  padding-left: 4px;
+}
+</style>
diff --git a/backend/src/views/apps/erp/document/DocEditor.vue b/backend/src/views/apps/erp/document/DocEditor.vue
new file mode 100644
index 0000000..8c1bf96
--- /dev/null
+++ b/backend/src/views/apps/erp/document/DocEditor.vue
@@ -0,0 +1,719 @@
+<template>
+  <el-drawer
+    :model-value="visible"
+    :title="drawerTitle"
+    direction="rtl"
+    size="70%"
+    :close-on-click-modal="false"
+    @open="onOpen"
+    @close="close"
+  >
+    <div class="doc-editor">
+      <el-form :model="form" label-width="96px" class="head-form">
+        <el-row :gutter="16">
+          <el-col :span="8">
+            <el-form-item label="单据编号">
+              <el-input :model-value="form.doc_no || '保存后自动生成'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="业务日期" required>
+              <el-date-picker
+                v-model="form.biz_date"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="isTransfer ? '调出仓库' : '仓库'" required>
+              <el-select v-model="form.warehouse_id" placeholder="请选择仓库" style="width: 100%" @change="onWarehouseChange">
+                <el-option v-for="w in warehouses" :key="w.id" :label="w.warehouse_name" :value="w.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col v-if="isTransfer" :span="8">
+            <el-form-item label="调入仓库" required>
+              <el-select v-model="form.to_warehouse_id" placeholder="请选择调入仓库" style="width: 100%">
+                <el-option
+                  v-for="w in warehouses.filter((x) => x.id !== form.warehouse_id)"
+                  :key="w.id"
+                  :label="w.warehouse_name"
+                  :value="w.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col v-if="partnerType" :span="8">
+            <el-form-item :label="partnerType === 'supplier' ? '供应商' : '客户'" required>
+              <el-select
+                v-model="form.partner_id"
+                filterable
+                clearable
+                placeholder="搜索名称选择"
+                style="width: 100%"
+                @change="onPartnerChange"
+              >
+                <el-option v-for="p in partners" :key="p.id" :label="partnerLabel(p)" :value="p.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col v-if="partnerType && creditTip" :span="8">
+            <el-form-item label="信用占用">
+              <span class="credit-tip">{{ creditTip }}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col v-if="sourceTypes.length" :span="8">
+            <el-form-item label="来源单据">
+              <el-select
+                v-model="form.source_doc_id"
+                filterable
+                clearable
+                placeholder="可不选，选择后按行带入"
+                style="width: 100%"
+                @change="onSourceChange"
+              >
+                <el-option
+                  v-for="d in sourceDocs"
+                  :key="d.id"
+                  :label="d.doc_no + ' · ' + (d.partner_name || '')"
+                  :value="d.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col v-if="flows.length" :span="8">
+            <el-form-item label="审批流程">
+              <el-select v-model="form.flow_id" placeholder="提交时使用的审批流" style="width: 100%">
+                <el-option v-for="f in flows" :key="f.flow_id" :label="f.flow_name" :value="f.flow_id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col v-if="!isStockTake && !isTransfer" :span="8">
+            <el-form-item label="整单折扣">
+              <el-input-number v-model="form.discount_amount" :min="0" :precision="2" :step="10" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="sourceTypes.length ? 8 : 16">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" placeholder="备注（可选）" maxlength="200" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="items-bar">
+        <el-button type="primary" :icon="Plus" size="small" @click="addRow">添加明细行</el-button>
+        <el-button v-if="form.source_doc_id" size="small" :icon="Download" @click="importFromSource">
+          按来源单据带入
+        </el-button>
+        <el-button v-if="isStockTake && form.warehouse_id" size="small" :icon="DocumentCopy" @click="loadTakeSheet">
+          载入盘点表
+        </el-button>
+        <span class="items-tip">{{ itemsTip }}</span>
+      </div>
+
+      <el-table :data="items" border size="small" class="items-table" v-loading="importing">
+        <el-table-column type="index" label="#" width="46" align="center" />
+        <el-table-column label="商品" min-width="220">
+          <template #default="{ row }">
+            <ProductSelect v-model="row.product_id" @pick="(p) => onPickProduct(row, p)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" width="110">
+          <template #default="{ row }">
+            <span>{{ row.spec || '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位" width="70" align="center">
+          <template #default="{ row }">
+            <el-input v-model="row.unit" size="small" placeholder="单位" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="isStockTake" label="账面数" width="100" align="right">
+          <template #default="{ row }">
+            <span>{{ fmtQty(row.book_qty) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="isStockTake ? '实盘数' : '数量'" width="130" align="right">
+          <template #default="{ row }">
+            <el-input-number v-model="row.quantity" :min="0" :precision="4" :step="1" size="small" controls-position="right" style="width: 100%" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showPrice" label="单价" width="130" align="right">
+          <template #default="{ row }">
+            <el-input-number v-model="row.unit_price" :min="0" :precision="2" :step="1" size="small" controls-position="right" style="width: 100%" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showPrice" label="金额" width="110" align="right">
+          <template #default="{ row }">
+            <span>{{ fmtMoney(round2(row.quantity * row.unit_price)) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showCost && !showPrice" label="参考成本" width="110" align="right">
+          <template #default="{ row }">
+            <el-input-number v-model="row.unit_price" :min="0" :precision="2" :step="1" size="small" controls-position="right" style="width: 100%" />
+          </template>
+        </el-table-column>
+        <el-table-column label="批次" width="130">
+          <template #default="{ row }">
+            <el-input v-model="row.batch_no" size="small" :placeholder="row.enable_batch ? '必填' : '可选'" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showBatchDates" label="生产日期" width="150">
+          <template #default="{ row }">
+            <el-date-picker v-model="row.production_date" type="date" value-format="YYYY-MM-DD" size="small" style="width: 100%" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showBatchDates" label="到期日" width="150">
+          <template #default="{ row }">
+            <el-date-picker v-model="row.expire_date" type="date" value-format="YYYY-MM-DD" size="small" style="width: 100%" />
+          </template>
+        </el-table-column>
+        <el-table-column v-if="!isTransfer" label="行备注" min-width="120">
+          <template #default="{ row }">
+            <el-input v-model="row.remark" size="small" placeholder="可选" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="70" align="center" fixed="right">
+          <template #default="{ $index }">
+            <el-button link type="danger" size="small" @click="removeRow($index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="totals">
+        <span>合计数量：<b>{{ fmtQty(totalQty) }}</b></span>
+        <span v-if="showPrice">合计金额：<b>{{ fmtMoney(totalAmount) }}</b></span>
+        <span v-if="showPrice && form.discount_amount">折扣：<b>-{{ fmtMoney(form.discount_amount) }}</b></span>
+        <span v-if="showPrice">成交金额：<b class="amount">{{ fmtMoney(totalAmount - form.discount_amount) }}</b></span>
+      </div>
+    </div>
+
+    <template #footer>
+      <div class="drawer-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button :loading="saving" @click="save('draft')">保存草稿</el-button>
+        <el-button v-if="flows.length" type="warning" :loading="saving" @click="save('submit')">保存并提交审批</el-button>
+        <el-button type="primary" :loading="saving" @click="save('approve')">保存并审核生效</el-button>
+      </div>
+    </template>
+  </el-drawer>
+</template>
+
+<script setup>
+import { computed, reactive, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { Plus, Download, DocumentCopy } from '@element-plus/icons-vue'
+import ProductSelect from './ProductSelect.vue'
+import {
+  dateOnly,
+  docTypeLabel,
+  docTypePartner,
+  docTypeSources,
+  money as fmtMoney,
+  pickPrice,
+  qty as fmtQty,
+  todayStr
+} from './dict'
+import { getWarehouseList } from '@/api/erpWarehouse'
+import { getCustomerList } from '@/api/customer'
+import { getSupplierList } from '@/api/supplier'
+import { getProductDetail } from '@/api/erpProduct'
+import { getDocumentList, getDocumentFlows, getDocumentMeta, getExecutableItems, getTakeSheet, saveDocument, submitDocument, approveDocument } from '@/api/erpDocument'
+import { getPartnerSummary } from '@/api/erpFinance'
+
+const props = defineProps({
+  visible: { type: Boolean, default: false },
+  docType: { type: String, required: true },
+  editData: { type: Object, default: null },
+  /** 下推入参：{ doc, type }，打开时自动带上来源单与明细 */
+  pushFrom: { type: Object, default: null },
+  /** 预填明细（补货建议转采购单用）：[{ product_id, product_name, spec, unit, quantity, unit_price }] */
+  presetItems: { type: Array, default: null }
+})
+const emit = defineEmits(['update:visible', 'success'])
+
+let rowSeq = 0
+const warehouses = ref([])
+const partners = ref([])
+const sourceDocs = ref([])
+const flows = ref([])
+const items = ref([])
+const saving = ref(false)
+const importing = ref(false)
+const salesPriceType = ref('sale')
+const creditUsage = ref(null)
+
+const form = reactive({
+  id: 0,
+  doc_no: '',
+  biz_date: todayStr(),
+  warehouse_id: 0,
+  to_warehouse_id: 0,
+  partner_type: '',
+  partner_id: 0,
+  partner_name: '',
+  source_doc_id: 0,
+  discount_amount: 0,
+  flow_id: 0,
+  remark: ''
+})
+
+const partnerType = computed(() => docTypePartner(props.docType))
+const sourceTypes = computed(() => docTypeSources(props.docType))
+const isTransfer = computed(() => props.docType === 'transfer')
+const isStockTake = computed(() => props.docType === 'stock_take')
+const isPurchase = computed(() => props.docType.startsWith('purchase'))
+const isSales = computed(() => props.docType.startsWith('sales'))
+const showPrice = computed(() => isPurchase.value || isSales.value || props.docType === 'other_in')
+const showCost = computed(() => props.docType === 'stock_take' || props.docType === 'other_out')
+const showBatchDates = computed(() => isPurchase.value || props.docType === 'other_in')
+const drawerTitle = computed(() => (props.editData ? '编辑' : '新建') + docTypeLabel(props.docType))
+const itemsTip = computed(() => {
+  if (isStockTake.value) return '选择仓库后「载入盘点表」带出账面数，实盘数与账面数的差额自动生成盘盈盘亏流水。'
+  if (isTransfer.value) return '调拨按加权成本在两个仓之间平移，不产生损益。'
+  if (sourceTypes.value.length) return '可关联来源单据按行带入，超出可执行量会在保存时拦截。'
+  return ''
+})
+
+const totalQty = computed(() => items.value.reduce((s, r) => s + (Number(r.quantity) || 0), 0))
+const totalAmount = computed(() => items.value.reduce((s, r) => s + round2((Number(r.quantity) || 0) * (Number(r.unit_price) || 0)), 0))
+
+function round2(v) {
+  return Math.round((Number(v) || 0) * 100) / 100
+}
+
+function partnerLabel(p) {
+  return props.docType.startsWith('sales') || partnerType.value === 'customer' ? p.customer_name : p.supplier_name
+}
+
+// 抽屉打开时才加载基础数据：列表页可能同时挂着多个类型的编辑器实例
+async function onOpen() {
+  resetForm()
+  await loadBasics()
+}
+
+async function loadBasics() {
+  try {
+    const [whRes, metaRes] = await Promise.all([getWarehouseList({ pageSize: 100 }), getDocumentMeta()])
+    if (whRes.code === 200) warehouses.value = whRes.data.list || []
+    if (metaRes.code === 200) {
+      salesPriceType.value = metaRes.data.sales_price_type || 'sale'
+      if (!form.warehouse_id && metaRes.data.default_warehouse_id) form.warehouse_id = metaRes.data.default_warehouse_id
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '基础数据加载失败')
+  }
+  if (partnerType.value) loadPartners()
+  if (sourceTypes.value.length) loadSourceDocs()
+  loadFlows()
+}
+
+async function loadPartners() {
+  try {
+    const res = partnerType.value === 'customer'
+      ? await getCustomerList({ pageSize: 100, is_draft: 0, status: '1' })
+      : await getSupplierList({ pageSize: 100, is_draft: 0, status: '1' })
+    if (res.code === 200) partners.value = res.data.list || []
+  } catch (e) {
+    ElMessage.error(e.message || '往来单位加载失败')
+  }
+}
+
+async function loadSourceDocs() {
+  try {
+    const res = await getDocumentList({ doc_types: sourceTypes.value.join(','), status: 2, pageSize: 50 })
+    if (res.code === 200) sourceDocs.value = res.data.list || []
+  } catch (e) {
+    sourceDocs.value = []
+  }
+}
+
+async function loadFlows() {
+  try {
+    const res = await getDocumentFlows(props.docType)
+    flows.value = res.code === 200 ? res.data.list || [] : []
+  } catch (e) {
+    flows.value = []
+  }
+  form.flow_id = flows.value.length ? flows.value[0].flow_id : 0
+}
+
+function resetForm() {
+  const src = props.editData
+  form.id = src ? Number(src.id) || 0 : 0
+  form.doc_no = src ? src.doc_no || '' : ''
+  form.biz_date = src ? dateOnly(src.biz_date) : todayStr()
+  form.warehouse_id = src ? Number(src.warehouse_id) || 0 : form.warehouse_id || 0
+  form.to_warehouse_id = src ? Number(src.to_warehouse_id) || 0 : 0
+  form.partner_type = partnerType.value
+  form.partner_id = src ? Number(src.partner_id) || 0 : 0
+  form.partner_name = src ? src.partner_name || '' : ''
+  form.source_doc_id = src ? Number(src.source_doc_id) || 0 : 0
+  form.discount_amount = src ? Number(src.discount_amount) || 0 : 0
+  form.flow_id = 0
+  form.remark = src ? src.remark || '' : ''
+
+  if (src && src.items) {
+    items.value = src.items.map((it) => ({
+      key: ++rowSeq,
+      product_id: it.product_id,
+      product_name: it.product_name,
+      spec: it.spec,
+      unit: it.unit || it.base_unit,
+      quantity: Number(it.quantity) || 0,
+      book_qty: Number(it.book_qty) || 0,
+      unit_price: Number(it.unit_price) || 0,
+      batch_no: it.batch_no || '',
+      production_date: dateOnlyOrEmpty(it.production_date),
+      expire_date: dateOnlyOrEmpty(it.expire_date),
+      ref_item_id: Number(it.ref_item_id) || 0,
+      remark: it.remark || '',
+      enable_batch: false
+    }))
+    syncBatchFlags(items.value)
+  } else if (props.pushFrom) {
+    applyPushFrom(props.pushFrom)
+  } else if (props.presetItems && props.presetItems.length) {
+    items.value = props.presetItems.map((it) => ({
+      key: ++rowSeq,
+      product_id: Number(it.product_id) || 0,
+      product_name: it.product_name || '',
+      spec: it.spec || '',
+      unit: it.unit || '',
+      quantity: Number(it.quantity) || 0,
+      book_qty: 0,
+      unit_price: Number(it.unit_price) || 0,
+      batch_no: '',
+      production_date: '',
+      expire_date: '',
+      ref_item_id: 0,
+      remark: it.remark || '',
+      enable_batch: false
+    }))
+    syncBatchFlags(items.value)
+  } else {
+    items.value = []
+    addRow()
+  }
+  if (form.partner_id) loadCredit()
+}
+
+function dateOnlyOrEmpty(v) {
+  if (!v) return ''
+  const d = new Date(v)
+  return isNaN(d.getTime()) ? '' : dateOnly(v)
+}
+
+/** 编辑已有单据时回查商品是否启用批次，让批次列显示「必填」提示 */
+async function syncBatchFlags(rows) {
+  const ids = [...new Set(rows.map((r) => Number(r.product_id)).filter(Boolean))]
+  if (!ids.length) return
+  const results = await Promise.allSettled(ids.map((id) => getProductDetail(id)))
+  const byId = {}
+  results.forEach((r) => {
+    if (r.status === 'fulfilled' && r.value?.code === 200) byId[r.value.data.id] = r.value.data
+  })
+  rows.forEach((r) => {
+    const p = byId[r.product_id]
+    if (p) r.enable_batch = Number(p.enable_batch) === 1
+  })
+}
+
+function applyPushFrom(pf) {
+  const src = pf.doc || {}
+  form.partner_type = src.partner_type || partnerType.value
+  form.partner_id = Number(src.partner_id) || 0
+  form.partner_name = src.partner_name || ''
+  form.warehouse_id = Number(src.warehouse_id) || form.warehouse_id
+  form.source_doc_id = Number(src.id) || 0
+  items.value = []
+  importFromSource()
+}
+
+function addRow() {
+  items.value.push({
+    key: ++rowSeq,
+    product_id: 0,
+    product_name: '',
+    spec: '',
+    unit: '',
+    quantity: 1,
+    book_qty: 0,
+    unit_price: 0,
+    batch_no: '',
+    production_date: '',
+    expire_date: '',
+    ref_item_id: 0,
+    remark: '',
+    enable_batch: false
+  })
+}
+
+function removeRow(index) {
+  items.value.splice(index, 1)
+}
+
+function onPickProduct(row, p) {
+  row.product_name = p.product_name
+  row.spec = p.spec || ''
+  row.unit = p.base_unit || ''
+  row.enable_batch = Number(p.enable_batch) === 1
+  const price = pickPrice(p, props.docType, salesPriceType.value)
+  if (price) row.unit_price = price
+}
+
+function onWarehouseChange() {
+  if (isTransfer.value && form.to_warehouse_id === form.warehouse_id) form.to_warehouse_id = 0
+}
+
+function onPartnerChange(id) {
+  const p = partners.value.find((x) => String(x.id) === String(id))
+  form.partner_name = p ? partnerLabel(p) : ''
+  loadSourceDocs()
+  loadCredit()
+}
+
+/** 客户信用额度与未结应收：开单时就提示，避免审核时才被信用控制拦下 */
+async function loadCredit() {
+  creditUsage.value = null
+  if (partnerType.value !== 'customer' || !form.partner_id) return
+  const p = partners.value.find((x) => String(x.id) === String(form.partner_id))
+  if (!p) return
+  try {
+    const res = await getPartnerSummary({ partner_type: 'customer' })
+    if (res.code !== 200) return
+    const row = (res.data.list || []).find((x) => Number(x.partner_id) === Number(form.partner_id))
+    const limit = Number(p.credit_limit) || 0
+    const open = row ? Number(row.recv_open) || 0 : 0
+    if (!limit) {
+      creditUsage.value = `未收 ${fmtMoney(open)}（不设额度上限）`
+      return
+    }
+    const rest = limit - open
+    creditUsage.value = rest < 0
+      ? `额度 ${fmtMoney(limit)}，已超 ${fmtMoney(-rest)}`
+      : `额度 ${fmtMoney(limit)}，剩余 ${fmtMoney(rest)}`
+  } catch (e) {
+    creditUsage.value = null
+  }
+}
+
+async function onSourceChange(id) {
+  if (!id) {
+    items.value = []
+    addRow()
+    return
+  }
+  await importFromSource()
+}
+
+async function importFromSource() {
+  if (!form.source_doc_id) return
+  importing.value = true
+  try {
+    const res = await getExecutableItems(form.source_doc_id)
+    if (res.code !== 200) return
+    const rows = (res.data.items || []).filter((it) => Number(it.remain_qty) > 0)
+    if (!rows.length) {
+      ElMessage.warning('来源单据已无待执行数量')
+      return
+    }
+    items.value = rows.map((it) => ({
+      key: ++rowSeq,
+      product_id: it.product_id,
+      product_name: it.product_name,
+      spec: it.spec || '',
+      unit: it.unit || '',
+      quantity: Number(it.remain_qty) || 0,
+      book_qty: 0,
+      unit_price: Number(it.unit_price) || 0,
+      batch_no: it.batch_no || '',
+      production_date: '',
+      expire_date: '',
+      ref_item_id: it.item_id,
+      remark: '',
+      enable_batch: !!it.batch_no
+    }))
+    syncBatchFlags(items.value)
+  } catch (e) {
+    ElMessage.error(e.message || '来源单据明细加载失败')
+  } finally {
+    importing.value = false
+  }
+}
+
+async function loadTakeSheet() {
+  importing.value = true
+  try {
+    const res = await getTakeSheet(form.warehouse_id)
+    if (res.code !== 200) return
+    const rows = res.data.list || []
+    if (!rows.length) {
+      ElMessage.warning('该仓库暂无账面库存')
+      return
+    }
+    items.value = rows.map((r) => ({
+      key: ++rowSeq,
+      product_id: r.product_id,
+      product_name: r.product_name,
+      spec: r.spec || '',
+      unit: r.unit || '',
+      quantity: Number(r.book_qty) || 0,
+      book_qty: Number(r.book_qty) || 0,
+      unit_price: round2(r.cost_price) || 0,
+      batch_no: r.batch_no || '',
+      production_date: '',
+      expire_date: '',
+      ref_item_id: 0,
+      remark: '',
+      enable_batch: !!r.batch_no
+    }))
+  } catch (e) {
+    ElMessage.error(e.message || '盘点表加载失败')
+  } finally {
+    importing.value = false
+  }
+}
+
+function validate() {
+  if (!form.biz_date) return '请选择业务日期'
+  if (!form.warehouse_id) return isTransfer.value ? '请选择调出仓库' : '请选择仓库'
+  if (isTransfer.value && !form.to_warehouse_id) return '请选择调入仓库'
+  if (partnerType.value && !form.partner_id) return `请选择${partnerType.value === 'supplier' ? '供应商' : '客户'}`
+  const rows = items.value.filter((r) => r.product_id)
+  if (!rows.length) return '请至少添加一行明细'
+  for (const r of rows) {
+    if (!(Number(r.quantity) > 0)) return `商品「${r.product_name}」的数量必须大于 0`
+    if (r.enable_batch && !r.batch_no) return `商品「${r.product_name}」启用批次管理，请填写批次号`
+  }
+  return ''
+}
+
+function buildPayload() {
+  return {
+    id: form.id || 0,
+    doc_type: props.docType,
+    biz_date: form.biz_date,
+    warehouse_id: form.warehouse_id,
+    to_warehouse_id: form.to_warehouse_id,
+    partner_type: partnerType.value,
+    partner_id: form.partner_id,
+    source_doc_id: form.source_doc_id,
+    // 调拨/盘点等不涉及成交价的单据不允许有折扣，否则会被后端计入金额
+    discount_amount: showPrice.value ? form.discount_amount : 0,
+    remark: form.remark,
+    items: items.value
+      .filter((r) => r.product_id)
+      .map((r, i) => ({
+        product_id: r.product_id,
+        product_name: r.product_name,
+        spec: r.spec,
+        unit: r.unit,
+        quantity: r.quantity,
+        book_qty: r.book_qty,
+        unit_price: r.unit_price,
+        batch_no: r.batch_no,
+        production_date: r.production_date,
+        expire_date: r.expire_date,
+        ref_item_id: r.ref_item_id,
+        remark: r.remark,
+        sort_order: i + 1
+      }))
+  }
+}
+
+async function save(mode) {
+  const msg = validate()
+  if (msg) {
+    ElMessage.warning(msg)
+    return
+  }
+  saving.value = true
+  try {
+    const res = await saveDocument(buildPayload())
+    if (res.code !== 200) return
+    const id = res.data.id
+    if (mode === 'submit') {
+      await submitDocument(id, form.flow_id ? { flow_id: form.flow_id } : {})
+      ElMessage.success('已提交审批')
+    } else if (mode === 'approve') {
+      await approveDocument(id)
+      ElMessage.success('单据已审核生效，库存与往来账已更新')
+    } else {
+      ElMessage.success('草稿已保存')
+    }
+    emit('success')
+    close()
+  } catch (e) {
+    ElMessage.error(e.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+function close() {
+  emit('update:visible', false)
+}
+</script>
+
+<style lang="less" scoped>
+.doc-editor {
+  padding-bottom: 8px;
+}
+
+.head-form {
+  margin-bottom: 8px;
+}
+
+.credit-tip {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
+.items-bar {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 10px;
+
+  .items-tip {
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.items-table {
+  width: 100%;
+}
+
+.totals {
+  display: flex;
+  gap: 24px;
+  justify-content: flex-end;
+  margin-top: 14px;
+  font-size: 13px;
+  color: var(--el-text-color-regular);
+
+  .amount {
+    color: var(--el-color-danger);
+    font-size: 16px;
+  }
+}
+
+.drawer-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+</style>
diff --git a/backend/src/views/apps/erp/document/DocListPage.vue b/backend/src/views/apps/erp/document/DocListPage.vue
new file mode 100644
index 0000000..070b686
--- /dev/null
+++ b/backend/src/views/apps/erp/document/DocListPage.vue
@@ -0,0 +1,432 @@
+<template>
+  <div class="doc-page">
+    <div class="page-header">
+      <div>
+        <h2>{{ title }}</h2>
+        <p>{{ subtitle }}</p>
+      </div>
+      <div class="header-actions">
+        <el-dropdown v-if="typeOptions.length > 1" @command="openCreate">
+          <el-button type="primary" :icon="Plus">
+            新建单据<el-icon class="el-icon--right"><ArrowDown /></el-icon>
+          </el-button>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item v-for="t in typeOptions" :key="t" :command="t">{{ docTypeLabel(t) }}</el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+        <el-button v-else type="primary" :icon="Plus" @click="openCreate(typeOptions[0])">新建{{ docTypeLabel(typeOptions[0]) }}</el-button>
+      </div>
+    </div>
+
+    <div class="filter-bar">
+      <el-form :inline="true" @submit.prevent>
+        <el-form-item v-if="typeOptions.length > 1" label="单据类型">
+          <el-select v-model="filters.doc_type" clearable placeholder="全部" style="width: 140px" @change="handleSearch">
+            <el-option v-for="t in typeOptions" :key="t" :label="docTypeLabel(t)" :value="t" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            v-model="filters.keyword"
+            clearable
+            placeholder="搜索单号/往来单位/备注"
+            :prefix-icon="Search"
+            style="width: 220px"
+            @keyup.enter="handleSearch"
+          />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="filters.status" clearable placeholder="全部" style="width: 110px" @change="handleSearch">
+            <el-option v-for="s in statusOptions" :key="s.value" :label="s.label" :value="s.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库">
+          <el-select v-model="filters.warehouse_id" clearable placeholder="全部" style="width: 140px" @change="handleSearch">
+            <el-option v-for="w in warehouses" :key="w.id" :label="w.warehouse_name" :value="w.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="业务日期">
+          <el-date-picker
+            v-model="dateRange"
+            type="daterange"
+            value-format="YYYY-MM-DD"
+            start-placeholder="开始"
+            end-placeholder="结束"
+            style="width: 240px"
+            @change="handleSearch"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+          <el-button :icon="Refresh" @click="resetFilters">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div v-loading="loading" class="table-container">
+      <el-table :data="rows" stripe border size="small">
+        <el-table-column v-if="typeOptions.length > 1" label="类型" width="116" align="center">
+          <template #default="{ row }">
+            <el-tag size="small" effect="plain">{{ row.doc_type_label || docTypeLabel(row.doc_type) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据编号" min-width="150">
+          <template #default="{ row }">
+            <span class="doc-no doc-link" @click="openDetail(row)">{{ row.doc_no }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务日期" width="110" align="center">
+          <template #default="{ row }">{{ dateOnly(row.biz_date) }}</template>
+        </el-table-column>
+        <el-table-column label="往来单位" min-width="140" show-overflow-tooltip>
+          <template #default="{ row }">{{ row.partner_name || '-' }}</template>
+        </el-table-column>
+        <el-table-column label="仓库" min-width="120" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.warehouse_name || '-' }}<span v-if="row.to_warehouse_name"> → {{ row.to_warehouse_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" width="92" align="right">
+          <template #default="{ row }">{{ qty(row.total_qty) }}</template>
+        </el-table-column>
+        <el-table-column label="金额" width="120" align="right">
+          <template #default="{ row }">
+            <span :class="{ 'text-muted': !amountOf(row) }">{{ money(amountOf(row)) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" width="90" align="center">
+          <template #default="{ row }">
+            <el-tag :type="docStatusTag(row.status)" size="small">{{ docStatusText(row.status) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_user_name" label="制单" width="100" show-overflow-tooltip />
+        <el-table-column label="操作" width="230" align="center" fixed="right">
+          <template #default="{ row }">
+            <el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
+            <el-button v-if="canEdit(row)" link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
+            <el-button v-if="canEdit(row)" link type="warning" size="small" @click="handleSubmit(row)">提交审批</el-button>
+            <el-button v-if="canApprove(row)" link type="success" size="small" @click="handleApprove(row)">审核</el-button>
+            <el-dropdown v-if="nextTypes(row).length" trigger="click" @command="(t) => openPush(row, t)">
+              <el-button link type="primary" size="small">下推<el-icon class="el-icon--right"><ArrowDown /></el-icon></el-button>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item v-for="n in nextTypes(row)" :key="n.type" :command="n.type">{{ n.label }}</el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
+            <el-button v-if="row.status !== 2 && row.status !== 4" link type="danger" size="small" @click="handleCancel(row)">作废</el-button>
+            <el-button v-if="canEdit(row)" link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="pagination">
+        <el-pagination
+          v-model:current-page="pagination.page"
+          v-model:page-size="pagination.pageSize"
+          :total="pagination.total"
+          :page-sizes="[10, 20, 50, 100]"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="fetchList"
+          @current-change="fetchList"
+        />
+      </div>
+    </div>
+
+    <DocEditor
+      v-model:visible="editorVisible"
+      :doc-type="editorType"
+      :edit-data="editData"
+      :push-from="pushFrom"
+      @success="fetchList"
+    />
+    <DocDetailDrawer v-model:visible="detailVisible" :doc-id="detailId" />
+  </div>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Plus, Search, Refresh, ArrowDown } from '@element-plus/icons-vue'
+import DocEditor from './DocEditor.vue'
+import DocDetailDrawer from './DocDetailDrawer.vue'
+import {
+  DOC_NEXT_TYPES,
+  DOC_STATUS,
+  dateOnly,
+  docStatusTag,
+  docStatusText,
+  docTypeLabel,
+  money,
+  qty
+} from './dict'
+import {
+  approveDocument,
+  cancelDocument,
+  deleteDocument,
+  getDocumentDetail,
+  getDocumentList,
+  submitDocument
+} from '@/api/erpDocument'
+import { getWarehouseList } from '@/api/erpWarehouse'
+
+const props = defineProps({
+  /** 本页面覆盖的单据类型；单个即专用列表，多个即混合列表 */
+  types: { type: Array, required: true },
+  title: { type: String, default: '单据管理' },
+  subtitle: { type: String, default: '' }
+})
+
+const loading = ref(false)
+const rows = ref([])
+const warehouses = ref([])
+const dateRange = ref([])
+const statusOptions = Object.keys(DOC_STATUS).map((k) => ({ value: k, label: DOC_STATUS[k].label }))
+
+const filters = reactive({ keyword: '', status: '', doc_type: '', warehouse_id: '' })
+const pagination = reactive({ page: 1, pageSize: 20, total: 0 })
+
+const editorVisible = ref(false)
+const editorType = ref(props.types[0])
+const editData = ref(null)
+const pushFrom = ref(null)
+const detailVisible = ref(false)
+const detailId = ref(0)
+
+const typeOptions = computed(() => props.types)
+
+/** 金额列口径：采购销售取成交金额，库存类单据无金额概念只显示数量 */
+function amountOf(row) {
+  const t = row.doc_type
+  if (String(t).startsWith('purchase') || String(t).startsWith('sales') || t === 'other_in') {
+    return Number(row.actual_amount) || 0
+  }
+  return 0
+}
+
+function canEdit(row) {
+  return row.status === 0 || row.status === 3
+}
+
+function canApprove(row) {
+  return row.status === 0 || row.status === 3 || row.status === 1
+}
+
+function nextTypes(row) {
+  return DOC_NEXT_TYPES[row.doc_type] || []
+}
+
+async function fetchList() {
+  loading.value = true
+  try {
+    const params = {
+      page: pagination.page,
+      pageSize: pagination.pageSize,
+      doc_types: typeOptions.value.join(',')
+    }
+    if (filters.keyword) params.keyword = filters.keyword
+    if (filters.status !== '') params.status = filters.status
+    if (filters.doc_type) params.doc_type = filters.doc_type
+    if (filters.warehouse_id) params.warehouse_id = filters.warehouse_id
+    if (dateRange.value && dateRange.value.length === 2) {
+      params.date_from = dateRange.value[0]
+      params.date_to = dateRange.value[1]
+    }
+    const res = await getDocumentList(params)
+    if (res.code === 200) {
+      rows.value = res.data.list || []
+      pagination.total = Number(res.data.total) || 0
+    } else {
+      ElMessage.error(res.msg || '单据加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '单据加载失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+function handleSearch() {
+  pagination.page = 1
+  fetchList()
+}
+
+function resetFilters() {
+  filters.keyword = ''
+  filters.status = ''
+  filters.doc_type = ''
+  filters.warehouse_id = ''
+  dateRange.value = []
+  handleSearch()
+}
+
+function openCreate(type) {
+  editData.value = null
+  pushFrom.value = null
+  editorType.value = type
+  editorVisible.value = true
+}
+
+async function openEdit(row) {
+  // 列表接口不含明细行，编辑前先取完整单据回填
+  try {
+    const res = await getDocumentDetail(row.id)
+    editData.value = res.code === 200 ? res.data : row
+  } catch (e) {
+    editData.value = row
+  }
+  pushFrom.value = null
+  editorType.value = row.doc_type
+  editorVisible.value = true
+}
+
+function openPush(row, targetType) {
+  editData.value = null
+  pushFrom.value = { doc: row, type: targetType }
+  editorType.value = targetType
+  editorVisible.value = true
+}
+
+function openDetail(row) {
+  detailId.value = row.id
+  detailVisible.value = true
+}
+
+async function handleSubmit(row) {
+  try {
+    const res = await submitDocument(row.id)
+    if (res.code === 200) ElMessage.success('已提交审批')
+  } catch (e) {
+    ElMessage.error(e.message || '提交失败')
+    return
+  }
+  fetchList()
+}
+
+async function handleApprove(row) {
+  try {
+    await ElMessageBox.confirm(
+      `确认审核「${row.doc_no}」？审核通过后将立即产生库存流水与往来账。`,
+      '审核确认',
+      { type: 'warning' }
+    )
+  } catch (e) {
+    return
+  }
+  try {
+    await approveDocument(row.id)
+    ElMessage.success('单据已生效')
+  } catch (e) {
+    ElMessage.error(e.message || '审核失败')
+    return
+  }
+  fetchList()
+}
+
+async function handleCancel(row) {
+  try {
+    await ElMessageBox.confirm(`确认作废「${row.doc_no}」？作废后不可恢复。`, '作废确认', { type: 'warning' })
+  } catch (e) {
+    return
+  }
+  try {
+    await cancelDocument(row.id)
+    ElMessage.success('已作废')
+  } catch (e) {
+    ElMessage.error(e.message || '作废失败')
+    return
+  }
+  fetchList()
+}
+
+async function handleDelete(row) {
+  try {
+    await ElMessageBox.confirm(`确认删除草稿「${row.doc_no}」？`, '删除确认', { type: 'warning' })
+  } catch (e) {
+    return
+  }
+  try {
+    await deleteDocument(row.id)
+    ElMessage.success('已删除')
+  } catch (e) {
+    ElMessage.error(e.message || '删除失败')
+    return
+  }
+  fetchList()
+}
+
+onMounted(async () => {
+  try {
+    const res = await getWarehouseList({ pageSize: 100 })
+    if (res.code === 200) warehouses.value = res.data.list || []
+  } catch (e) {
+    warehouses.value = []
+  }
+  fetchList()
+})
+</script>
+
+<style lang="less" scoped>
+.doc-page {
+  padding: 20px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 20px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.filter-bar {
+  background: var(--el-bg-color);
+  padding: 16px 16px 0;
+  border-radius: 4px;
+  margin-bottom: 16px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.table-container {
+  background: var(--el-bg-color);
+  padding: 16px;
+  border-radius: 4px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.doc-no {
+  font-weight: 500;
+}
+
+.doc-link {
+  cursor: pointer;
+  color: var(--el-color-primary);
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.text-muted {
+  color: var(--el-text-color-secondary);
+}
+
+.pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16px;
+}
+</style>
diff --git a/backend/src/views/apps/erp/document/ProductSelect.vue b/backend/src/views/apps/erp/document/ProductSelect.vue
new file mode 100644
index 0000000..5395256
--- /dev/null
+++ b/backend/src/views/apps/erp/document/ProductSelect.vue
@@ -0,0 +1,93 @@
+<template>
+  <el-select
+    v-model="selected"
+    filterable
+    clearable
+    remote
+    reserve-keyword
+    :remote-method="search"
+    :loading="loading"
+    :placeholder="placeholder"
+    @change="onChange"
+  >
+    <el-option
+      v-for="p in options"
+      :key="p.id"
+      :value="p.id"
+      :label="p.product_name + (p.spec ? ' ' + p.spec : '')"
+    >
+      <div class="product-option">
+        <span class="po-name">{{ p.product_name }}</span>
+        <span class="po-meta">{{ p.product_code }}{{ p.spec ? ' · ' + p.spec : '' }} · 库存 {{ fmtQty(p.total_stock) }}{{ p.base_unit }}</span>
+      </div>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { qty as fmtQty } from './dict'
+import { getProductList } from '@/api/erpProduct'
+
+const props = defineProps({
+  modelValue: { type: [Number, String], default: 0 },
+  placeholder: { type: String, default: '搜索商品名称/编码/条码' }
+})
+const emit = defineEmits(['update:modelValue', 'pick'])
+
+const selected = ref(props.modelValue || undefined)
+const options = ref([])
+const loading = ref(false)
+
+watch(() => props.modelValue, (v) => {
+  selected.value = v || undefined
+})
+
+async function search(keyword) {
+  loading.value = true
+  try {
+    const res = await getProductList({
+      keyword: keyword || '',
+      only_enabled: 1,
+      page: 1,
+      pageSize: 30
+    })
+    if (res.code === 200) {
+      options.value = res.data.list || []
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '商品加载失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+function onChange(id) {
+  emit('update:modelValue', id || 0)
+  const p = options.value.find((x) => String(x.id) === String(id))
+  if (p) emit('pick', p)
+}
+
+// 首次展开即带出一批常用商品，避免用户以为下拉是空的
+search('')
+</script>
+
+<style lang="less" scoped>
+.product-option {
+  display: flex;
+  flex-direction: column;
+  line-height: 1.4;
+  padding: 2px 0;
+
+  .po-name {
+    font-size: 13px;
+    color: var(--el-text-color-primary);
+  }
+
+  .po-meta {
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
+}
+</style>
diff --git a/backend/src/views/apps/erp/document/dict.js b/backend/src/views/apps/erp/document/dict.js
new file mode 100644
index 0000000..a03d409
--- /dev/null
+++ b/backend/src/views/apps/erp/document/dict.js
@@ -0,0 +1,104 @@
+/**
+ * 进销存单据字典与格式化工具。
+ *
+ * 十类单据共用一套接口与界面，类型文案、状态色、往来单位要求都在这里收口，
+ * 页面只按 doc_type 取差异，避免各处硬编码。
+ */
+
+export const DOC_TYPES = {
+  purchase_order: { label: '采购订单', partner: 'supplier', affectsStock: false, prefix: 'CGDD' },
+  purchase_in: { label: '采购入库单', partner: 'supplier', affectsStock: true, source: ['purchase_order'] },
+  purchase_return: { label: '采购退货单', partner: 'supplier', affectsStock: true, source: ['purchase_order', 'purchase_in'] },
+  sales_order: { label: '销售订单', partner: 'customer', affectsStock: false },
+  sales_out: { label: '销售出库单', partner: 'customer', affectsStock: true, source: ['sales_order'] },
+  sales_return: { label: '销售退货单', partner: 'customer', affectsStock: true, source: ['sales_order', 'sales_out'] },
+  other_in: { label: '其他入库单', partner: '', affectsStock: true },
+  other_out: { label: '其他出库单', partner: '', affectsStock: true },
+  transfer: { label: '库存调拨单', partner: '', affectsStock: true, toWarehouse: true },
+  stock_take: { label: '库存盘点单', partner: '', affectsStock: true, takeSheet: true }
+}
+
+export const DOC_TYPE_ORDER = [
+  'purchase_order', 'purchase_in', 'purchase_return',
+  'sales_order', 'sales_out', 'sales_return',
+  'other_in', 'other_out', 'transfer', 'stock_take'
+]
+
+export const DOC_STATUS = {
+  0: { label: '草稿', tag: 'info' },
+  1: { label: '审批中', tag: 'warning' },
+  2: { label: '已生效', tag: 'success' },
+  3: { label: '已驳回', tag: 'danger' },
+  4: { label: '已作废', tag: 'info' }
+}
+
+/** 下游单据：从已生效单据「下推」时用的目标类型 */
+export const DOC_NEXT_TYPES = {
+  purchase_order: [
+    { type: 'purchase_in', label: '采购入库' },
+    { type: 'purchase_return', label: '采购退货' }
+  ],
+  purchase_in: [{ type: 'purchase_return', label: '采购退货' }],
+  sales_order: [
+    { type: 'sales_out', label: '销售出库' },
+    { type: 'sales_return', label: '销售退货' }
+  ],
+  sales_out: [{ type: 'sales_return', label: '销售退货' }]
+}
+
+export function docTypeLabel(docType) {
+  return DOC_TYPES[docType]?.label || docType
+}
+
+export function docTypePartner(docType) {
+  return DOC_TYPES[docType]?.partner || ''
+}
+
+export function docTypeSources(docType) {
+  return DOC_TYPES[docType]?.source || []
+}
+
+export function docStatusText(status) {
+  return DOC_STATUS[status]?.label || '未知'
+}
+
+export function docStatusTag(status) {
+  return DOC_STATUS[status]?.tag || 'info'
+}
+
+export function money(v) {
+  const n = Number(v || 0)
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+}
+
+export function qty(v) {
+  const n = Number(v || 0)
+  // 数量按 4 位小数存储，尾部多余的 0 不显示
+  return String(Number(n.toFixed(4)))
+}
+
+/**
+ * 价格体系取价：采购类取采购价，销售类按基础设置的售价口径（零售/批发/会员）。
+ * 其他出入库、调拨、盘点不带价，由后端按移动加权成本结转。
+ */
+export function pickPrice(product, docType, salesPriceType) {
+  if (!product) return 0
+  if (docType.startsWith('purchase')) return Number(product.purchase_price) || 0
+  if (docType.startsWith('sales')) {
+    const field = { sale: 'sale_price', wholesale: 'wholesale_price', member: 'member_price' }[salesPriceType] || 'sale_price'
+    return Number(product[field]) || 0
+  }
+  return 0
+}
+
+export function todayStr() {
+  const d = new Date()
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
+}
+
+export function dateOnly(val) {
+  if (!val) return '-'
+  const d = new Date(val)
+  if (isNaN(d.getTime())) return String(val)
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
+}
diff --git a/backend/src/views/apps/erp/finance/components/BillListPage.vue b/backend/src/views/apps/erp/finance/components/BillListPage.vue
new file mode 100644
index 0000000..ed6ec2e
--- /dev/null
+++ b/backend/src/views/apps/erp/finance/components/BillListPage.vue
@@ -0,0 +1,413 @@
+<template>
+  <div class="bill-page">
+    <div class="page-header">
+      <div>
+        <h2>{{ title }}</h2>
+        <p>{{ subtitle }}</p>
+      </div>
+      <div class="header-actions">
+        <el-button type="primary" :icon="Plus" @click="$emit('fund', billType)">新建{{ fundLabel }}</el-button>
+      </div>
+    </div>
+
+    <div class="kpi-row">
+      <div class="kpi">
+        <span class="kpi-label">未收应收合计</span>
+        <b class="danger">{{ money(summary.open_receivable) }}</b>
+      </div>
+      <div class="kpi">
+        <span class="kpi-label">未付应付合计</span>
+        <b class="warning">{{ money(summary.open_payable) }}</b>
+      </div>
+      <div class="kpi">
+        <span class="kpi-label">{{ title }}未结</span>
+        <b>{{ money(ownOpen) }}</b>
+      </div>
+    </div>
+
+    <el-tabs v-model="tab">
+      <el-tab-pane label="往来账" name="bill">
+        <div class="filter-bar">
+          <el-form :inline="true" @submit.prevent>
+            <el-form-item>
+              <el-input v-model="filters.keyword" clearable placeholder="搜索往来单位/来源单号" :prefix-icon="Search" style="width: 220px" @keyup.enter="handleSearch" />
+            </el-form-item>
+            <el-form-item label="核销状态">
+              <el-select v-model="filters.settle_state" clearable placeholder="全部" style="width: 120px" @change="handleSearch">
+                <el-option label="未结清" value="open" />
+                <el-option label="部分核销" value="part" />
+                <el-option label="已结清" value="done" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="账期">
+              <el-date-picker v-model="dates" type="daterange" value-format="YYYY-MM-DD" start-placeholder="开始" end-placeholder="结束" style="width: 240px" @change="handleSearch" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+              <el-button :icon="Refresh" @click="resetFilters">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <div v-loading="loading" class="table-container">
+          <el-table :data="rows" stripe border size="small">
+            <el-table-column label="来源单据" min-width="150">
+              <template #default="{ row }">
+                <span class="link" @click="openDetail(row)">{{ row.bill.source_doc_no || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="往来单位" min-width="150" show-overflow-tooltip>
+              <template #default="{ row }">{{ row.bill.partner_name || '-' }}</template>
+            </el-table-column>
+            <el-table-column label="记账日期" width="110" align="center">
+              <template #default="{ row }">{{ dateOnly(row.bill.bill_date) }}</template>
+            </el-table-column>
+            <el-table-column label="到期日" width="110" align="center">
+              <template #default="{ row }">
+                <span :class="{ 'text-muted': !row.bill.due_date }">{{ row.bill.due_date ? dateOnly(row.bill.due_date) : '现结' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" width="120" align="right">
+              <template #default="{ row }">{{ money(row.bill.amount) }}</template>
+            </el-table-column>
+            <el-table-column label="已核销" width="110" align="right">
+              <template #default="{ row }">{{ money(row.bill.settled_amount) }}</template>
+            </el-table-column>
+            <el-table-column label="未结余额" width="120" align="right">
+              <template #default="{ row }">
+                <b :class="row.balance > 0 ? 'danger' : 'text-muted'">{{ money(row.balance) }}</b>
+              </template>
+            </el-table-column>
+            <el-table-column label="逾期" width="90" align="center">
+              <template #default="{ row }">
+                <el-tag v-if="row.overdue_days > 0" type="danger" size="small">{{ row.overdue_days }} 天</el-tag>
+                <span v-else class="text-muted">-</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" width="90" align="center">
+              <template #default="{ row }">
+                <el-tag :type="row.bill.status === 2 ? 'success' : row.bill.status === 1 ? 'warning' : 'info'" size="small">
+                  {{ row.status_label }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="80" align="center" fixed="right">
+              <template #default="{ row }">
+                <el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div class="pagination">
+            <el-pagination
+              v-model:current-page="page.page"
+              v-model:page-size="page.pageSize"
+              :total="page.total"
+              :page-sizes="[20, 50, 100]"
+              layout="total, sizes, prev, pager, next"
+              @size-change="fetchList"
+              @current-change="fetchList"
+            />
+          </div>
+        </div>
+      </el-tab-pane>
+
+      <el-tab-pane label="账龄分析" name="aging">
+        <div v-loading="agingLoading" class="table-container">
+          <el-alert
+            :title="`按到期日逾期天数分桶，未到期表示尚未逾期；合计 ${money(agingTotal)}`"
+            type="info"
+            :closable="false"
+            class="aging-alert"
+          />
+          <el-table :data="agingRows" stripe border size="small">
+            <el-table-column prop="partner_name" label="往来单位" min-width="160" show-overflow-tooltip />
+            <el-table-column label="性质" width="90" align="center">
+              <template #default="{ row }">{{ row.bill_type === 1 ? '应收' : '应付' }}</template>
+            </el-table-column>
+            <el-table-column label="未结合计" width="130" align="right">
+              <template #default="{ row }"><b>{{ money(row.total) }}</b></template>
+            </el-table-column>
+            <el-table-column v-for="b in bucketLabels" :key="b" :label="b" min-width="110" align="right">
+              <template #default="{ row }">
+                <span :class="{ 'danger': b !== '未到期' && Number(row.buckets[b] || 0) > 0 }">
+                  {{ money(row.buckets[b] || 0) }}
+                </span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-empty v-if="!agingLoading && !agingRows.length" description="当前没有未结往来账" />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-drawer v-model="detailVisible" title="往来账详情" direction="rtl" size="46%">
+      <div v-if="detail.bill">
+        <el-descriptions :column="2" border size="small">
+          <el-descriptions-item label="往来单位">{{ detail.bill.partner_name }}</el-descriptions-item>
+          <el-descriptions-item label="性质">{{ detail.bill.bill_type === 1 ? '应收' : '应付' }}</el-descriptions-item>
+          <el-descriptions-item label="来源单据">{{ detail.bill.source_doc_no || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="状态">{{ detail.bill.status === 2 ? '已结清' : detail.bill.status === 1 ? '部分核销' : '未核销' }}</el-descriptions-item>
+          <el-descriptions-item label="记账日期">{{ dateOnly(detail.bill.bill_date) }}</el-descriptions-item>
+          <el-descriptions-item label="到期日">{{ detail.bill.due_date ? dateOnly(detail.bill.due_date) : '现结' }}</el-descriptions-item>
+          <el-descriptions-item label="金额">{{ money(detail.bill.amount) }}</el-descriptions-item>
+          <el-descriptions-item label="未结余额">
+            <b class="danger">{{ money(detail.balance) }}</b>
+          </el-descriptions-item>
+        </el-descriptions>
+
+        <div class="section-title">核销记录</div>
+        <el-table :data="detail.settles || []" border size="small" empty-text="尚无核销记录">
+          <el-table-column label="收付款单" min-width="140">
+            <template #default="{ row }">{{ (detail.funds && detail.funds[row.fund_bill_id] ? detail.funds[row.fund_bill_id].fund_no : row.fund_bill_id) }}</template>
+          </el-table-column>
+          <el-table-column label="核销金额" width="120" align="right">
+            <template #default="{ row }">{{ money(row.amount) }}</template>
+          </el-table-column>
+          <el-table-column label="时间" width="170" align="center">
+            <template #default="{ row }">{{ dateOnly(row.create_time) }}</template>
+          </el-table-column>
+        </el-table>
+
+        <template v-if="detail.doc_items && detail.doc_items.length">
+          <div class="section-title">来源单据明细</div>
+          <el-table :data="detail.doc_items" border size="small">
+            <el-table-column prop="product_name" label="商品" min-width="150" show-overflow-tooltip />
+            <el-table-column prop="spec" label="规格" width="100" />
+            <el-table-column label="数量" width="90" align="right">
+              <template #default="{ row }">{{ qty(row.quantity) }}</template>
+            </el-table-column>
+            <el-table-column label="单价" width="100" align="right">
+              <template #default="{ row }">{{ money(row.unit_price) }}</template>
+            </el-table-column>
+            <el-table-column label="金额" width="110" align="right">
+              <template #default="{ row }">{{ money(row.amount) }}</template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { Plus, Search, Refresh } from '@element-plus/icons-vue'
+import { getAging, getBillDetail, getBillList } from '@/api/erpFinance'
+import { dateOnly, money, qty } from '../../document/dict'
+
+const props = defineProps({
+  /** 1=应收（客户） 2=应付（供应商） */
+  billType: { type: [Number, String], required: true },
+  title: { type: String, default: '应收账款' },
+  subtitle: { type: String, default: '' }
+})
+defineEmits(['fund'])
+
+const billTypeNum = computed(() => Number(props.billType))
+const fundLabel = computed(() => (billTypeNum.value === 1 ? '收款单' : '付款单'))
+const loading = ref(false)
+const rows = ref([])
+const summary = ref({ open_receivable: 0, open_payable: 0 })
+const tab = ref('bill')
+const filters = reactive({ keyword: '', settle_state: '' })
+const dates = ref([])
+const page = reactive({ page: 1, pageSize: 20, total: 0 })
+
+const agingRows = ref([])
+const agingLoading = ref(false)
+const bucketLabels = ref(['未到期', '1-30天', '31-60天', '61-90天', '90天以上'])
+
+const detailVisible = ref(false)
+const detail = ref({})
+
+const ownOpen = computed(() =>
+  billTypeNum.value === 1 ? Number(summary.value.open_receivable) || 0 : Number(summary.value.open_payable) || 0
+)
+const agingTotal = computed(() => agingRows.value.reduce((s, r) => s + (Number(r.total) || 0), 0))
+
+async function fetchList() {
+  loading.value = true
+  try {
+    const params = { page: page.page, pageSize: page.pageSize, bill_type: billTypeNum.value }
+    if (filters.keyword) params.keyword = filters.keyword
+    if (filters.settle_state) params.settle_state = filters.settle_state
+    if (dates.value && dates.value.length === 2) {
+      params.date_from = dates.value[0]
+      params.date_to = dates.value[1]
+    }
+    const res = await getBillList(params)
+    if (res.code === 200) {
+      rows.value = res.data.list || []
+      page.total = Number(res.data.total) || 0
+      summary.value = res.data.summary || { open_receivable: 0, open_payable: 0 }
+    } else {
+      ElMessage.error(res.msg || '往来账加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '往来账加载失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+function handleSearch() {
+  page.page = 1
+  fetchList()
+}
+
+function resetFilters() {
+  filters.keyword = ''
+  filters.settle_state = ''
+  dates.value = []
+  handleSearch()
+}
+
+async function fetchAging() {
+  agingLoading.value = true
+  try {
+    const res = await getAging({ bill_type: billTypeNum.value })
+    if (res.code === 200) {
+      const list = (res.data.list || []).filter((r) => Number(r.bill_type) === billTypeNum.value)
+      list.sort((a, b) => (Number(b.total) || 0) - (Number(a.total) || 0))
+      agingRows.value = list
+      if (Array.isArray(res.data.buckets) && res.data.buckets.length) {
+        bucketLabels.value = res.data.buckets.map((b) => b.label)
+      }
+    } else {
+      ElMessage.error(res.msg || '账龄加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '账龄加载失败')
+  } finally {
+    agingLoading.value = false
+  }
+}
+
+async function openDetail(row) {
+  try {
+    const res = await getBillDetail(row.bill.id)
+    if (res.code === 200) {
+      detail.value = res.data || {}
+      detailVisible.value = true
+    } else {
+      ElMessage.error(res.msg || '详情加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '详情加载失败')
+  }
+}
+
+watch(tab, (v) => {
+  if (v === 'aging' && !agingRows.value.length) fetchAging()
+})
+
+onMounted(fetchList)
+</script>
+
+<style lang="less" scoped>
+.bill-page {
+  padding: 20px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 16px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.kpi-row {
+  display: flex;
+  gap: 12px;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.kpi {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  min-width: 170px;
+  padding: 12px 16px;
+  border: 1px solid var(--el-border-color-lighter);
+  border-radius: 6px;
+  background: var(--el-bg-color);
+
+  .kpi-label {
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
+
+  b {
+    font-size: 20px;
+  }
+}
+
+.filter-bar {
+  background: var(--el-bg-color);
+  padding: 16px 16px 0;
+  border-radius: 4px;
+  margin-bottom: 16px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.table-container {
+  background: var(--el-bg-color);
+  padding: 16px;
+  border-radius: 4px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.aging-alert {
+  margin-bottom: 12px;
+}
+
+.section-title {
+  margin: 18px 0 10px;
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.link {
+  cursor: pointer;
+  color: var(--el-color-primary);
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.danger {
+  color: var(--el-color-danger);
+}
+
+.warning {
+  color: var(--el-color-warning);
+}
+
+.text-muted {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16px;
+}
+</style>
diff --git a/backend/src/views/apps/erp/finance/payable.vue b/backend/src/views/apps/erp/finance/payable.vue
new file mode 100644
index 0000000..618ff15
--- /dev/null
+++ b/backend/src/views/apps/erp/finance/payable.vue
@@ -0,0 +1,19 @@
+<template>
+  <BillListPage
+    :bill-type="2"
+    title="应付账款"
+    subtitle="采购入库与退货自动生成应付，按供应商账期计算到期日，支持按单核销"
+    @fund="toPayment"
+  />
+</template>
+
+<script setup>
+import { useRouter } from 'vue-router'
+import BillListPage from './components/BillListPage.vue'
+
+const router = useRouter()
+
+function toPayment() {
+  router.push('/apps/erp/finance/payment')
+}
+</script>
diff --git a/backend/src/views/apps/erp/finance/payment.vue b/backend/src/views/apps/erp/finance/payment.vue
new file mode 100644
index 0000000..be0de0b
--- /dev/null
+++ b/backend/src/views/apps/erp/finance/payment.vue
@@ -0,0 +1,644 @@
+<template>
+  <div class="fund-page">
+    <div class="page-header">
+      <div>
+        <h2>收付款管理</h2>
+        <p>收款自动核销应收、付款自动核销应付；不指定往来账时按到期日 FIFO 冲抵</p>
+      </div>
+      <div class="header-actions">
+        <el-button type="primary" :icon="Plus" @click="openCreate">新建收付款</el-button>
+      </div>
+    </div>
+
+    <el-tabs v-model="tab">
+      <el-tab-pane label="收付款单" name="fund">
+        <div class="filter-bar">
+          <el-form :inline="true" @submit.prevent>
+            <el-form-item label="方式">
+              <el-select v-model="filters.fund_type" clearable placeholder="全部" style="width: 130px" @change="handleSearch">
+                <el-option v-for="f in fundTypes" :key="f.value" :label="f.label" :value="f.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-select v-model="filters.status" clearable placeholder="全部" style="width: 120px" @change="handleSearch">
+                <el-option label="草稿" value="0" />
+                <el-option label="已确认" value="1" />
+                <el-option label="已作废" value="4" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-input v-model="filters.keyword" clearable placeholder="搜索单号/往来单位" :prefix-icon="Search" style="width: 200px" @keyup.enter="handleSearch" />
+            </el-form-item>
+            <el-form-item label="日期">
+              <el-date-picker v-model="dates" type="daterange" value-format="YYYY-MM-DD" start-placeholder="开始" end-placeholder="结束" style="width: 240px" @change="handleSearch" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+              <el-button :icon="Refresh" @click="resetFilters">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <div v-loading="loading" class="table-container">
+          <el-table :data="rows" stripe border size="small">
+            <el-table-column prop="fund_no" label="单号" min-width="150" />
+            <el-table-column label="方式" width="100" align="center">
+              <template #default="{ row }">
+                <el-tag :type="fundTag(row.fund_type)" size="small">{{ fundLabel(row.fund_type) }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="往来单位" min-width="140" show-overflow-tooltip>
+              <template #default="{ row }">{{ row.partner_name || '-' }}</template>
+            </el-table-column>
+            <el-table-column label="金额" width="120" align="right">
+              <template #default="{ row }">
+                <b :class="row.fund_type === 1 || row.fund_type === 3 ? 'in' : 'out'">{{ money(row.amount) }}</b>
+              </template>
+            </el-table-column>
+            <el-table-column label="已核销" width="110" align="right">
+              <template #default="{ row }">{{ money(row.settled_amount) }}</template>
+            </el-table-column>
+            <el-table-column label="收款方式" width="110" align="center">
+              <template #default="{ row }">{{ methodLabel(row.pay_method) }}</template>
+            </el-table-column>
+            <el-table-column prop="pay_account" label="账户" width="130" show-overflow-tooltip />
+            <el-table-column label="业务日期" width="110" align="center">
+              <template #default="{ row }">{{ dateOnly(row.biz_date) }}</template>
+            </el-table-column>
+            <el-table-column label="状态" width="90" align="center">
+              <template #default="{ row }">
+                <el-tag :type="row.status === 1 ? 'success' : row.status === 4 ? 'info' : 'warning'" size="small">
+                  {{ statusLabel(row.status) }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="210" align="center" fixed="right">
+              <template #default="{ row }">
+                <el-button v-if="row.status === 0" link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
+                <el-button v-if="row.status === 0" link type="success" size="small" @click="openConfirm(row)">确认</el-button>
+                <el-button link type="primary" size="small" @click="openDetail(row)">核销明细</el-button>
+                <el-button v-if="row.status === 1" link type="danger" size="small" @click="handleVoid(row)">作废</el-button>
+                <el-button v-if="row.status === 0" link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div class="pagination">
+            <el-pagination
+              v-model:current-page="page.page"
+              v-model:page-size="page.pageSize"
+              :total="page.total"
+              :page-sizes="[20, 50, 100]"
+              layout="total, sizes, prev, pager, next"
+              @size-change="fetchList"
+              @current-change="fetchList"
+            />
+          </div>
+        </div>
+      </el-tab-pane>
+
+      <el-tab-pane label="资金流水" name="cash">
+        <div class="filter-bar">
+          <el-form :inline="true" @submit.prevent>
+            <el-form-item label="区间">
+              <el-date-picker v-model="cashDates" type="daterange" value-format="YYYY-MM-DD" start-placeholder="开始" end-placeholder="结束" style="width: 240px" @change="loadCash" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :icon="Search" @click="loadCash">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div v-loading="cashLoading" class="table-container">
+          <div class="kpi-row">
+            <div class="kpi"><span class="kpi-label">收入合计</span><b class="in">{{ money(cash.total_in) }}</b></div>
+            <div class="kpi"><span class="kpi-label">支出合计</span><b class="out">{{ money(cash.total_out) }}</b></div>
+            <div class="kpi"><span class="kpi-label">净额</span><b>{{ money(cash.net) }}</b></div>
+          </div>
+          <el-table :data="cash.list" stripe border size="small" max-height="480">
+            <el-table-column prop="date" label="日期" width="130" align="center" />
+            <el-table-column label="收入" width="140" align="right">
+              <template #default="{ row }"><span class="in">{{ money(row.in) }}</span></template>
+            </el-table-column>
+            <el-table-column label="支出" width="140" align="right">
+              <template #default="{ row }"><span class="out">{{ money(row.out) }}</span></template>
+            </el-table-column>
+            <el-table-column label="当日净额" width="140" align="right">
+              <template #default="{ row }">{{ money(row.net) }}</template>
+            </el-table-column>
+          </el-table>
+          <el-empty v-if="!cashLoading && !(cash.list || []).length" description="区间内没有已确认的收付款" />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-dialog v-model="editVisible" :title="form.id ? '编辑收付款单' : '新建收付款单'" width="520px">
+      <el-form :model="form" label-width="92px">
+        <el-form-item label="方式">
+          <el-select v-model="form.fund_type" style="width: 100%" @change="onFundTypeChange">
+            <el-option v-for="f in fundTypes" :key="f.value" :label="f.label" :value="f.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="needPartner" :label="form.fund_type === 1 ? '客户' : '供应商'" required>
+          <el-select v-model="form.partner_id" filterable clearable placeholder="搜索名称选择" style="width: 100%">
+            <el-option v-for="p in partners" :key="p.id" :label="p.name" :value="p.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="金额" required>
+          <el-input-number v-model="form.amount" :min="0" :precision="2" :step="100" controls-position="right" style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="收款方式">
+          <el-select v-model="form.pay_method" style="width: 100%">
+            <el-option v-for="m in payMethods" :key="m.value" :label="m.label" :value="m.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账户">
+          <el-input v-model="form.pay_account" placeholder="如 工商银行 6222****" />
+        </el-form-item>
+        <el-form-item label="业务日期">
+          <el-date-picker v-model="form.biz_date" type="date" value-format="YYYY-MM-DD" style="width: 100%" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" :rows="2" maxlength="200" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="editVisible = false">取消</el-button>
+        <el-button :loading="saving" @click="submit(0)">仅保存草稿</el-button>
+        <el-button type="primary" :loading="saving" @click="submit(1)">保存并确认</el-button>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="confirmVisible" title="确认收付款并核销" width="720px">
+      <div class="confirm-head">
+        <span>{{ current.fund_no }} · {{ fundLabel(current.fund_type) }} {{ money(current.amount) }}</span>
+        <span class="text-muted">不勾选任何往来账时，按到期日最早的单据自动冲抵</span>
+      </div>
+      <el-table :data="openBills" border size="small" max-height="320" @selection-change="onSettleSelect">
+        <el-table-column type="selection" width="46" />
+        <el-table-column prop="source_doc_no" label="来源单据" min-width="150" />
+        <el-table-column label="记账日" width="110" align="center">
+          <template #default="{ row }">{{ dateOnly(row.bill_date) }}</template>
+        </el-table-column>
+        <el-table-column label="到期日" width="110" align="center">
+          <template #default="{ row }">{{ row.due_date ? dateOnly(row.due_date) : '现结' }}</template>
+        </el-table-column>
+        <el-table-column label="金额" width="110" align="right">
+          <template #default="{ row }">{{ money(row.amount) }}</template>
+        </el-table-column>
+        <el-table-column label="未结" width="110" align="right">
+          <template #default="{ row }">{{ money(row.balance) }}</template>
+        </el-table-column>
+        <el-table-column label="本次核销" width="150" align="right">
+          <template #default="{ row }">
+            <el-input-number v-model="row._settle" :min="0" :max="row.balance" :precision="2" :step="100" size="small" controls-position="right" style="width: 100%" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="confirm-foot">
+        <span>本次核销合计：<b>{{ money(settleTotal) }}</b></span>
+        <span :class="settleTotal > current.amount ? 'out' : 'text-muted'">
+          {{ settleTotal > current.amount ? '核销金额超出收付款金额' : `剩余 ${money(current.amount - settleTotal)} 将作为预收/预付挂账` }}
+        </span>
+      </div>
+      <template #footer>
+        <el-button @click="confirmVisible = false">取消</el-button>
+        <el-button type="primary" :loading="confirming" :disabled="settleTotal > current.amount" @click="doConfirm">
+          确认收付款
+        </el-button>
+      </template>
+    </el-dialog>
+
+    <el-drawer v-model="detailVisible" title="核销明细" direction="rtl" size="420px">
+      <div v-if="fundDetail.fund">
+        <el-descriptions :column="1" border size="small">
+          <el-descriptions-item label="单号">{{ fundDetail.fund.fund_no }}</el-descriptions-item>
+          <el-descriptions-item label="金额">{{ money(fundDetail.fund.amount) }}</el-descriptions-item>
+          <el-descriptions-item label="已核销">{{ money(fundDetail.fund.settled_amount) }}</el-descriptions-item>
+          <el-descriptions-item label="状态">{{ statusLabel(fundDetail.fund.status) }}</el-descriptions-item>
+        </el-descriptions>
+        <div class="section-title">核销的往来账</div>
+        <el-table :data="fundDetail.fund.settles || []" border size="small" empty-text="未核销任何往来账">
+          <el-table-column prop="partner_bill_no" label="往来账单号" min-width="130" />
+          <el-table-column label="金额" width="110" align="right">
+            <template #default="{ row }">{{ money(row.amount) }}</template>
+          </el-table-column>
+        </el-table>
+        <div class="section-title">关联单据</div>
+        <el-table :data="fundDetail.bills || []" border size="small" empty-text="无">
+          <el-table-column prop="source_doc_no" label="来源单据" min-width="140" />
+          <el-table-column prop="partner_name" label="往来单位" min-width="120" />
+          <el-table-column label="未结" width="110" align="right">
+            <template #default="{ row }">{{ money(row.amount - row.settled_amount) }}</template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Plus, Search, Refresh } from '@element-plus/icons-vue'
+import {
+  confirmFund,
+  deleteFund,
+  getCashFlow,
+  getFundDetail,
+  getFundList,
+  getFundOpenBills,
+  saveFund,
+  voidFund
+} from '@/api/erpFinance'
+import { getCustomerList } from '@/api/customer'
+import { getSupplierList } from '@/api/supplier'
+import { dateOnly, money, todayStr } from '../document/dict'
+
+const fundTypes = [
+  { value: 1, label: '收款' },
+  { value: 2, label: '付款' },
+  { value: 3, label: '其他收入' },
+  { value: 4, label: '费用支出' }
+]
+const payMethods = [
+  { value: 'cash', label: '现金' },
+  { value: 'bank', label: '银行转账' },
+  { value: 'wechat', label: '微信' },
+  { value: 'alipay', label: '支付宝' },
+  { value: 'draft', label: '票据' },
+  { value: 'other', label: '其他' }
+]
+
+const tab = ref('fund')
+const loading = ref(false)
+const saving = ref(false)
+const confirming = ref(false)
+const rows = ref([])
+const filters = reactive({ fund_type: '', status: '', keyword: '' })
+const dates = ref([])
+const page = reactive({ page: 1, pageSize: 20, total: 0 })
+
+const editVisible = ref(false)
+const form = reactive(emptyForm())
+const partners = ref([])
+
+const confirmVisible = ref(false)
+const current = ref({ amount: 0 })
+const openBills = ref([])
+const settleRows = ref([])
+
+const detailVisible = ref(false)
+const fundDetail = ref({})
+
+const cash = ref({ list: [], total_in: 0, total_out: 0, net: 0 })
+const cashDates = ref([])
+const cashLoading = ref(false)
+
+const needPartner = computed(() => form.fund_type === 1 || form.fund_type === 2)
+const settleTotal = computed(() =>
+  (settleRows.value || []).reduce((s, r) => s + (Number(r._settle) || 0), 0)
+)
+
+function emptyForm() {
+  return { id: 0, fund_type: 1, partner_id: 0, amount: 0, pay_method: 'bank', pay_account: '', biz_date: todayStr(), remark: '' }
+}
+
+const fundLabelOf = (v) => fundTypes.find((f) => f.value === Number(v))?.label || '收付款'
+const fundLabel = fundLabelOf
+const fundTag = (v) => ({ 1: 'success', 2: 'danger', 3: 'success', 4: 'warning' }[Number(v)] || 'info')
+const statusLabel = (s) => ({ 0: '草稿', 1: '已确认', 4: '已作废' }[Number(s)] || '草稿')
+const methodLabel = (m) => payMethods.find((x) => x.value === m)?.label || m || '-'
+
+async function fetchList() {
+  loading.value = true
+  try {
+    const params = { page: page.page, pageSize: page.pageSize }
+    if (filters.fund_type !== '') params.fund_type = filters.fund_type
+    if (filters.status !== '') params.status = filters.status
+    if (filters.keyword) params.keyword = filters.keyword
+    if (dates.value && dates.value.length === 2) {
+      params.date_from = dates.value[0]
+      params.date_to = dates.value[1]
+    }
+    const res = await getFundList(params)
+    if (res.code === 200) {
+      rows.value = res.data.list || []
+      page.total = Number(res.data.total) || 0
+    } else {
+      ElMessage.error(res.msg || '收付款加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '收付款加载失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+function handleSearch() {
+  page.page = 1
+  fetchList()
+}
+
+function resetFilters() {
+  filters.fund_type = ''
+  filters.status = ''
+  filters.keyword = ''
+  dates.value = []
+  handleSearch()
+}
+
+async function loadPartners() {
+  try {
+    const res = form.fund_type === 2
+      ? await getSupplierList({ pageSize: 100, is_draft: 0, status: '1' })
+      : await getCustomerList({ pageSize: 100, is_draft: 0, status: '1' })
+    const list = res.code === 200 ? res.data.list || [] : []
+    partners.value = list.map((p) => ({ id: p.id, name: p.customer_name || p.supplier_name }))
+  } catch (e) {
+    partners.value = []
+  }
+}
+
+function onFundTypeChange() {
+  form.partner_id = 0
+  if (needPartner.value) loadPartners()
+}
+
+function openCreate() {
+  Object.assign(form, emptyForm())
+  loadPartners()
+  editVisible.value = true
+}
+
+function openEdit(row) {
+  Object.assign(form, emptyForm(), {
+    id: row.id,
+    fund_type: Number(row.fund_type) || 1,
+    partner_id: Number(row.partner_id) || 0,
+    amount: Number(row.amount) || 0,
+    pay_method: row.pay_method || 'bank',
+    pay_account: row.pay_account || '',
+    biz_date: dateOnly(row.biz_date),
+    remark: row.remark || ''
+  })
+  if (needPartner.value) loadPartners()
+  editVisible.value = true
+}
+
+/** after 为 1 时保存后立即确认（草稿状态直接生效并核销） */
+async function submit(after) {
+  if (!(Number(form.amount) > 0)) {
+    ElMessage.warning('请填写大于 0 的金额')
+    return
+  }
+  if (needPartner.value && !form.partner_id) {
+    ElMessage.warning(form.fund_type === 1 ? '请选择客户' : '请选择供应商')
+    return
+  }
+  saving.value = true
+  try {
+    const res = await saveFund({ ...form })
+    if (res.code !== 200) return
+    if (after === 1) {
+      await confirmFund(res.data.id, {})
+      ElMessage.success('已确认并核销')
+    } else {
+      ElMessage.success('草稿已保存')
+    }
+    editVisible.value = false
+    fetchList()
+  } catch (e) {
+    ElMessage.error(e.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+async function openConfirm(row) {
+  current.value = row
+  try {
+    const res = await getFundOpenBills({ fund_type: row.fund_type, partner_id: row.partner_id })
+    if (res.code === 200) {
+      openBills.value = (res.data.list || []).map((b) => ({ ...b, _settle: 0 }))
+    } else {
+      openBills.value = []
+    }
+  } catch (e) {
+    openBills.value = []
+  }
+  settleRows.value = []
+  confirmVisible.value = true
+}
+
+/** 勾选即填满未结余额（不超过本单剩余可核销额），取消勾选清零 */
+function onSettleSelect(sel) {
+  const ids = new Set(sel.map((r) => r.id))
+  let left = Number(current.value.amount) || 0
+  openBills.value.forEach((r) => {
+    if (!ids.has(r.id)) {
+      r._settle = 0
+      return
+    }
+    const want = Math.min(Number(r.balance) || 0, round2(left))
+    r._settle = want
+    left = round2(left - want)
+  })
+  settleRows.value = openBills.value.filter((r) => ids.has(r.id))
+}
+
+function round2(v) {
+  return Math.round((Number(v) || 0) * 100) / 100
+}
+
+async function doConfirm() {
+  const settles = openBills.value
+    .filter((r) => Number(r._settle) > 0)
+    .map((r) => ({ partner_bill_id: r.id, amount: round2(r._settle) }))
+  confirming.value = true
+  try {
+    await confirmFund(current.value.id, settles.length ? { settles } : {})
+    ElMessage.success('已确认，库存往来账同步完成')
+    confirmVisible.value = false
+    fetchList()
+  } catch (e) {
+    ElMessage.error(e.message || '确认失败')
+  } finally {
+    confirming.value = false
+  }
+}
+
+async function openDetail(row) {
+  try {
+    const res = await getFundDetail(row.id)
+    if (res.code === 200) {
+      fundDetail.value = res.data || {}
+      detailVisible.value = true
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '明细加载失败')
+  }
+}
+
+async function handleVoid(row) {
+  try {
+    await ElMessageBox.confirm(`确认作废「${row.fund_no}」？作废将回滚其核销记录。`, '作废确认', { type: 'warning' })
+  } catch (e) {
+    return
+  }
+  try {
+    await voidFund(row.id)
+    ElMessage.success('已作废')
+  } catch (e) {
+    ElMessage.error(e.message || '作废失败')
+    return
+  }
+  fetchList()
+}
+
+async function handleDelete(row) {
+  try {
+    await ElMessageBox.confirm(`确认删除草稿「${row.fund_no}」？`, '删除确认', { type: 'warning' })
+  } catch (e) {
+    return
+  }
+  try {
+    await deleteFund(row.id)
+    ElMessage.success('已删除')
+  } catch (e) {
+    ElMessage.error(e.message || '删除失败')
+    return
+  }
+  fetchList()
+}
+
+async function loadCash() {
+  cashLoading.value = true
+  try {
+    const params = {}
+    if (cashDates.value && cashDates.value.length === 2) {
+      params.date_from = cashDates.value[0]
+      params.date_to = cashDates.value[1]
+    }
+    const res = await getCashFlow(params)
+    if (res.code === 200) {
+      cash.value = res.data || { list: [] }
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '资金流水加载失败')
+  } finally {
+    cashLoading.value = false
+  }
+}
+
+watch(tab, (v) => {
+  if (v === 'cash' && !(cash.value.list || []).length) loadCash()
+})
+
+onMounted(fetchList)
+</script>
+
+<style lang="less" scoped>
+.fund-page {
+  padding: 20px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 16px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.filter-bar {
+  background: var(--el-bg-color);
+  padding: 16px 16px 0;
+  border-radius: 4px;
+  margin-bottom: 16px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.table-container {
+  background: var(--el-bg-color);
+  padding: 16px;
+  border-radius: 4px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.kpi-row {
+  display: flex;
+  gap: 12px;
+  margin-bottom: 14px;
+}
+
+.kpi {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  min-width: 160px;
+  padding: 12px 16px;
+  border: 1px solid var(--el-border-color-lighter);
+  border-radius: 6px;
+
+  .kpi-label {
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
+
+  b {
+    font-size: 20px;
+  }
+}
+
+.confirm-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10px;
+  font-size: 13px;
+}
+
+.confirm-foot {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 12px;
+  font-size: 13px;
+}
+
+.section-title {
+  margin: 18px 0 10px;
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.in {
+  color: var(--el-color-success);
+}
+
+.out {
+  color: var(--el-color-danger);
+}
+
+.text-muted {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16px;
+}
+</style>
diff --git a/backend/src/views/apps/erp/finance/receivable.vue b/backend/src/views/apps/erp/finance/receivable.vue
new file mode 100644
index 0000000..45dc6e4
--- /dev/null
+++ b/backend/src/views/apps/erp/finance/receivable.vue
@@ -0,0 +1,19 @@
+<template>
+  <BillListPage
+    :bill-type="1"
+    title="应收账款"
+    subtitle="销售出库与退货自动生成应收，按账期计算到期日，支持按单核销与逾期跟踪"
+    @fund="toPayment"
+  />
+</template>
+
+<script setup>
+import { useRouter } from 'vue-router'
+import BillListPage from './components/BillListPage.vue'
+
+const router = useRouter()
+
+function toPayment() {
+  router.push('/apps/erp/finance/payment')
+}
+</script>
diff --git a/backend/src/views/apps/erp/purchase/inbound.vue b/backend/src/views/apps/erp/purchase/inbound.vue
new file mode 100644
index 0000000..a8d587e
--- /dev/null
+++ b/backend/src/views/apps/erp/purchase/inbound.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['purchase_in']" title="采购入库单" subtitle="审核生效即增加库存并按采购价生成应付账款" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/purchase/order.vue b/backend/src/views/apps/erp/purchase/order.vue
new file mode 100644
index 0000000..fc1b25c
--- /dev/null
+++ b/backend/src/views/apps/erp/purchase/order.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['purchase_order']" title="采购订单" subtitle="先下单后入库，按行记录执行进度，未执行量可下推为入库单或退货单" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/purchase/return.vue b/backend/src/views/apps/erp/purchase/return.vue
new file mode 100644
index 0000000..70ad12e
--- /dev/null
+++ b/backend/src/views/apps/erp/purchase/return.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['purchase_return']" title="采购退货单" subtitle="红字冲减库存与应付，退货数量按原单剩余可退量校验" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/report/SummaryTable.vue b/backend/src/views/apps/erp/report/SummaryTable.vue
new file mode 100644
index 0000000..c0207ce
--- /dev/null
+++ b/backend/src/views/apps/erp/report/SummaryTable.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="sum-table">
+    <div class="mini-summary">
+      <span>合计数量 <b>{{ qty(data.summary?.qty) }}</b></span>
+      <span>合计金额 <b>{{ money(data.summary?.amount) }}</b></span>
+      <span>{{ (data.list || []).length }} 行</span>
+    </div>
+    <el-table :data="data.list" stripe border size="small">
+      <el-table-column type="index" label="#" width="55" align="center" />
+      <el-table-column prop="label" :label="dimLabel" min-width="200" show-overflow-tooltip />
+      <el-table-column label="数量" width="120" align="right">
+        <template #default="{ row }">{{ qty(row.qty) }}</template>
+      </el-table-column>
+      <el-table-column :label="amountLabel" width="140" align="right">
+        <template #default="{ row }">
+          <b :class="Number(row.amount) < 0 ? 'out' : ''">{{ money(row.amount) }}</b>
+        </template>
+      </el-table-column>
+      <el-table-column label="单据行数" width="100" align="right">
+        <template #default="{ row }">{{ row.lines }}</template>
+      </el-table-column>
+      <el-table-column label="金额占比" min-width="160">
+        <template #default="{ row }">
+          <el-progress :percentage="pct(row.amount)" :stroke-width="10" :show-text="false" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-empty v-if="!(data.list || []).length" description="区间内没有已生效单据" />
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { money, qty } from '../document/dict'
+
+const props = defineProps({
+  data: { type: Object, default: () => ({ list: [], summary: {} }) },
+  amountLabel: { type: String, default: '金额' },
+  dimLabel: { type: String, default: '名称' }
+})
+
+const total = computed(() =>
+  (props.data.list || []).reduce((s, r) => s + Math.abs(Number(r.amount) || 0), 0)
+)
+
+function pct(v) {
+  if (!total.value) return 0
+  return Math.round((Math.abs(Number(v) || 0) / total.value) * 1000) / 10
+}
+</script>
+
+<style lang="less" scoped>
+.mini-summary {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 18px;
+  margin-bottom: 12px;
+  font-size: 13px;
+  color: var(--el-text-color-secondary);
+
+  b {
+    color: var(--el-text-color-primary);
+  }
+}
+
+.out {
+  color: var(--el-color-danger);
+}
+</style>
diff --git a/backend/src/views/apps/erp/report/index.vue b/backend/src/views/apps/erp/report/index.vue
new file mode 100644
index 0000000..45cce7d
--- /dev/null
+++ b/backend/src/views/apps/erp/report/index.vue
@@ -0,0 +1,795 @@
+<template>
+  <div class="erp-report">
+    <div class="page-header">
+      <div>
+        <h2>报表中心</h2>
+        <p>统计口径只含已生效单据与库存流水，因此报表数字与库存结存、往来账永远一致</p>
+      </div>
+      <el-form :inline="true" class="range-form" @submit.prevent>
+        <el-form-item v-if="tab !== 'dashboard' && tab !== 'rfm'" label="统计区间">
+          <el-date-picker
+            v-model="dates"
+            type="daterange"
+            value-format="YYYY-MM-DD"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: 240px"
+            @change="reloadCurrent"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button :icon="Refresh" @click="reloadCurrent">刷新</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <el-tabs v-model="tab" class="report-tabs" @tab-change="onTabChange">
+      <!-- 经营看板 -->
+      <el-tab-pane label="经营看板" name="dashboard">
+        <div v-loading="dashLoading" class="tab-body">
+          <div class="kpi-grid">
+            <div v-for="k in kpiCards" :key="k.label" class="kpi-card">
+              <span class="kpi-label">{{ k.label }}</span>
+              <b :class="k.cls">{{ k.text }}</b>
+              <span class="kpi-sub">{{ k.sub }}</span>
+            </div>
+          </div>
+
+          <div class="panel-row">
+            <div class="panel">
+              <div class="panel-title">近 6 个月采购 / 销售趋势</div>
+              <div ref="trendRef" class="chart"></div>
+            </div>
+            <div class="panel side">
+              <div class="panel-title">库存预警与待办</div>
+              <div class="warn-grid">
+                <div v-for="w in warnCards" :key="w.label" class="warn-item" @click="w.to && router.push(w.to)">
+                  <b :class="w.cls">{{ w.value }}</b>
+                  <span>{{ w.label }}</span>
+                </div>
+              </div>
+              <div class="todo-line">
+                <span>待我审批 <b>{{ dash.todo?.approval_pending || 0 }}</b> 单</span>
+                <span>草稿 <b>{{ dash.todo?.draft_docs || 0 }}</b> 单</span>
+                <span>今日销售 <b>{{ money(dash.today?.sales_amount) }}</b> / {{ dash.today?.sales_count || 0 }} 单</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-tab-pane>
+
+      <!-- 采购汇总 -->
+      <el-tab-pane label="采购汇总" name="purchase">
+        <div v-loading="sumLoading.purchase" class="tab-body">
+          <div class="dim-bar">
+            <el-radio-group v-model="sumDim.purchase" size="small" @change="() => loadSummary('purchase')">
+              <el-radio-button value="product">按商品</el-radio-button>
+              <el-radio-button value="supplier">按供应商</el-radio-button>
+              <el-radio-button value="month">按月</el-radio-button>
+            </el-radio-group>
+            <span class="sum-tip">净额已扣除采购退货</span>
+          </div>
+          <SummaryTable :data="sumData.purchase" amount-label="采购金额" :dim-label="dimLabel(sumDim.purchase)" />
+        </div>
+      </el-tab-pane>
+
+      <!-- 销售汇总 -->
+      <el-tab-pane label="销售汇总" name="sales">
+        <div v-loading="sumLoading.sales" class="tab-body">
+          <div class="dim-bar">
+            <el-radio-group v-model="sumDim.sales" size="small" @change="() => loadSummary('sales')">
+              <el-radio-button value="product">按商品</el-radio-button>
+              <el-radio-button value="customer">按客户</el-radio-button>
+              <el-radio-button value="month">按月</el-radio-button>
+            </el-radio-group>
+            <span class="sum-tip">净额已扣除销售退货</span>
+          </div>
+          <SummaryTable :data="sumData.sales" amount-label="销售金额" :dim-label="dimLabel(sumDim.sales)" />
+        </div>
+      </el-tab-pane>
+
+      <!-- 销售排行 -->
+      <el-tab-pane label="热销/滞销" name="rank">
+        <div v-loading="rankLoading" class="tab-body">
+          <div class="dim-bar">
+            <el-radio-group v-model="rankOrder" size="small" @change="loadRank">
+              <el-radio-button value="desc">热销榜</el-radio-button>
+              <el-radio-button value="asc">滞销榜</el-radio-button>
+            </el-radio-group>
+            <el-select v-model="rankTop" size="small" style="width: 110px" @change="loadRank">
+              <el-option v-for="n in [10, 20, 30, 50]" :key="n" :label="`Top ${n}`" :value="n" />
+            </el-select>
+            <span class="sum-tip">{{ rankOrder === 'asc' ? '滞销榜含区间内一件未卖的在售商品' : '' }}</span>
+          </div>
+          <el-table :data="rankList" stripe border size="small">
+            <el-table-column type="index" label="#" width="55" align="center" />
+            <el-table-column prop="product_code" label="商品编码" width="140" />
+            <el-table-column prop="product_name" label="商品名称" min-width="160" show-overflow-tooltip />
+            <el-table-column prop="spec" label="规格" width="110" show-overflow-tooltip />
+            <el-table-column prop="unit" label="单位" width="70" align="center" />
+            <el-table-column label="数量" width="110" align="right">
+              <template #default="{ row }">{{ qty(row.qty) }}</template>
+            </el-table-column>
+            <el-table-column label="金额" width="130" align="right">
+              <template #default="{ row }"><b>{{ money(row.amount) }}</b></template>
+            </el-table-column>
+            <el-table-column label="金额占比" min-width="160">
+              <template #default="{ row }">
+                <el-progress :percentage="pct(row.amount, rankTotal)" :stroke-width="10" :show-text="false" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-tab-pane>
+
+      <!-- 收发存 -->
+      <el-tab-pane label="收发存" name="stockmove">
+        <div v-loading="moveLoading" class="tab-body">
+          <div class="dim-bar">
+            <el-select v-model="moveFilter.warehouse_id" size="small" clearable placeholder="全部仓库" style="width: 160px" @change="loadMove(1)">
+              <el-option v-for="w in warehouses" :key="w.id" :label="w.warehouse_name" :value="w.id" />
+            </el-select>
+            <el-input
+              v-model="moveFilter.keyword"
+              size="small"
+              clearable
+              placeholder="商品名称/编码"
+              style="width: 200px"
+              :prefix-icon="Search"
+              @keyup.enter="loadMove(1)"
+            />
+            <el-button size="small" type="primary" :icon="Search" @click="loadMove(1)">查询</el-button>
+          </div>
+          <div class="mini-summary">
+            <span>本期入库 <b>{{ money(moveSummary.in_amount) }}</b>（{{ qty(moveSummary.in_qty) }}）</span>
+            <span>本期出库 <b>{{ money(moveSummary.out_amount) }}</b>（{{ qty(moveSummary.out_qty) }}）</span>
+            <span>期末库存金额 <b>{{ money(moveSummary.end_amount) }}</b></span>
+          </div>
+          <el-table :data="moveList" stripe border size="small">
+            <el-table-column prop="product_code" label="编码" width="130" fixed="left" />
+            <el-table-column prop="product_name" label="商品" min-width="150" fixed="left" show-overflow-tooltip />
+            <el-table-column prop="warehouse_name" label="仓库" width="110" />
+            <el-table-column prop="category_name" label="分类" width="110" show-overflow-tooltip />
+            <el-table-column label="期初" align="right">
+              <el-table-column prop="open_qty" label="数量" width="95" align="right">
+                <template #default="{ row }">{{ qty(row.open_qty) }}</template>
+              </el-table-column>
+              <el-table-column prop="open_amount" label="金额" width="110" align="right">
+                <template #default="{ row }">{{ money(row.open_amount) }}</template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="本期收入" align="right">
+              <el-table-column prop="in_qty" label="数量" width="95" align="right">
+                <template #default="{ row }"><span class="in">{{ qty(row.in_qty) }}</span></template>
+              </el-table-column>
+              <el-table-column prop="in_amount" label="金额" width="110" align="right">
+                <template #default="{ row }"><span class="in">{{ money(row.in_amount) }}</span></template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="本期发出" align="right">
+              <el-table-column prop="out_qty" label="数量" width="95" align="right">
+                <template #default="{ row }"><span class="out">{{ qty(row.out_qty) }}</span></template>
+              </el-table-column>
+              <el-table-column prop="out_amount" label="金额" width="110" align="right">
+                <template #default="{ row }"><span class="out">{{ money(row.out_amount) }}</span></template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="期末结存" align="right">
+              <el-table-column prop="end_qty" label="数量" width="95" align="right">
+                <template #default="{ row }"><b>{{ qty(row.end_qty) }}</b></template>
+              </el-table-column>
+              <el-table-column prop="end_cost" label="加权成本" width="100" align="right">
+                <template #default="{ row }">{{ money(row.end_cost) }}</template>
+              </el-table-column>
+              <el-table-column prop="end_amount" label="金额" width="120" align="right">
+                <template #default="{ row }"><b>{{ money(row.end_amount) }}</b></template>
+              </el-table-column>
+            </el-table-column>
+          </el-table>
+          <div class="pagination">
+            <el-pagination
+              v-model:current-page="movePage.page"
+              v-model:page-size="movePage.pageSize"
+              :total="movePage.total"
+              :page-sizes="[20, 50, 100]"
+              layout="total, sizes, prev, pager, next"
+              @size-change="loadMove()"
+              @current-change="loadMove()"
+            />
+          </div>
+        </div>
+      </el-tab-pane>
+
+      <!-- 毛利分析 -->
+      <el-tab-pane label="毛利分析" name="profit">
+        <div v-loading="profitLoading" class="tab-body">
+          <div class="kpi-grid compact">
+            <div class="kpi-card"><span class="kpi-label">销售收入</span><b>{{ money(profitSummary.revenue) }}</b><span class="kpi-sub">已扣退货</span></div>
+            <div class="kpi-card"><span class="kpi-label">销售成本</span><b>{{ money(profitSummary.cost) }}</b><span class="kpi-sub">出库流水实际成本</span></div>
+            <div class="kpi-card"><span class="kpi-label">毛利额</span><b :class="profitSummary.profit >= 0 ? 'in' : 'out'">{{ money(profitSummary.profit) }}</b><span class="kpi-sub">收入 − 成本</span></div>
+            <div class="kpi-card"><span class="kpi-label">毛利率</span><b>{{ Number(profitSummary.profit_rate || 0).toFixed(2) }}%</b><span class="kpi-sub">毛利额 / 收入</span></div>
+          </div>
+          <el-table :data="profitList" stripe border size="small">
+            <el-table-column type="index" label="#" width="55" align="center" />
+            <el-table-column prop="product_code" label="编码" width="130" />
+            <el-table-column prop="product_name" label="商品" min-width="150" show-overflow-tooltip />
+            <el-table-column prop="spec" label="规格" width="110" show-overflow-tooltip />
+            <el-table-column prop="unit" label="单位" width="70" align="center" />
+            <el-table-column label="销量" width="100" align="right">
+              <template #default="{ row }">{{ qty(row.qty) }}</template>
+            </el-table-column>
+            <el-table-column label="收入" width="120" align="right">
+              <template #default="{ row }">{{ money(row.revenue) }}</template>
+            </el-table-column>
+            <el-table-column label="成本" width="120" align="right">
+              <template #default="{ row }">{{ money(row.cost) }}</template>
+            </el-table-column>
+            <el-table-column label="毛利" width="120" align="right">
+              <template #default="{ row }"><b :class="row.profit >= 0 ? 'in' : 'out'">{{ money(row.profit) }}</b></template>
+            </el-table-column>
+            <el-table-column label="毛利率" min-width="170">
+              <template #default="{ row }">
+                <div class="rate-cell">
+                  <el-progress
+                    :percentage="Math.min(100, Math.max(0, Number(row.profit_rate) || 0))"
+                    :stroke-width="10"
+                    :color="row.profit_rate < 0 ? 'var(--el-color-danger)' : 'var(--el-color-success)'"
+                  />
+                  <span :class="row.profit_rate < 0 ? 'out' : ''">{{ Number(row.profit_rate || 0).toFixed(2) }}%</span>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div v-if="profitNegativeCount" class="neg-tip">
+            有 {{ profitNegativeCount }} 个商品毛利为负，通常是售价低于移动加权成本或退货冲减，建议核查售价与采购成本。
+          </div>
+        </div>
+      </el-tab-pane>
+
+      <!-- 客户价值 RFM -->
+      <el-tab-pane label="客户价值" name="rfm">
+        <div v-loading="rfmLoading" class="tab-body">
+          <div class="seg-bar">
+            <el-tag v-for="(n, seg) in rfmSegments" :key="seg" :type="segTag(seg)" effect="light">
+              {{ seg }} {{ n }}
+            </el-tag>
+            <span class="sum-tip">R={{ rfmMedian.r ?? '-' }}天 / F={{ rfmMedian.f ?? '-' }}次 / M={{ money(rfmMedian.m) }}（中位数切分，取全部已生效销售出库）</span>
+          </div>
+          <el-table :data="rfmList" stripe border size="small">
+            <el-table-column type="index" label="#" width="55" align="center" />
+            <el-table-column prop="customer_name" label="客户" min-width="160" show-overflow-tooltip />
+            <el-table-column label="最近购买" width="120" align="center">
+              <template #default="{ row }">{{ row.last_date || '-' }}</template>
+            </el-table-column>
+            <el-table-column label="R(天)" width="90" align="right">
+              <template #default="{ row }">{{ row.r_days >= 99999 ? '-' : row.r_days }}</template>
+            </el-table-column>
+            <el-table-column prop="f_count" label="F(次)" width="80" align="right" />
+            <el-table-column label="M(金额)" width="130" align="right">
+              <template #default="{ row }"><b>{{ money(row.m_amount) }}</b></template>
+            </el-table-column>
+            <el-table-column label="得分" width="110" align="center">
+              <template #default="{ row }">{{ row.r_score }} / {{ row.f_score }} / {{ row.m_score }}</template>
+            </el-table-column>
+            <el-table-column label="分层" width="130" align="center">
+              <template #default="{ row }">
+                <el-tag :type="segTag(row.segment)" size="small">{{ row.segment }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额贡献" min-width="160">
+              <template #default="{ row }">
+                <el-progress :percentage="pct(row.m_amount, rfmTotal)" :stroke-width="10" :show-text="false" />
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-empty v-if="!rfmLoading && !rfmList.length" description="还没有已生效的销售出库单" />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup>
+import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, shallowRef } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import { Refresh, Search } from '@element-plus/icons-vue'
+import * as echarts from 'echarts'
+import {
+  getErpDashboard,
+  getProfitReport,
+  getPurchaseSummary,
+  getRfmReport,
+  getSalesRank,
+  getSalesSummary,
+  getStockMoveReport
+} from '@/api/erpReport'
+import { getWarehouseList } from '@/api/erpWarehouse'
+import { money, qty } from '../document/dict'
+import SummaryTable from './SummaryTable.vue'
+
+const route = useRoute()
+const router = useRouter()
+const tab = ref(route.query.tab || 'dashboard')
+const dates = ref([])
+
+const loaded = reactive({})
+const dashLoading = ref(false)
+const sumLoading = reactive({ purchase: false, sales: false })
+const rankLoading = ref(false)
+const moveLoading = ref(false)
+const profitLoading = ref(false)
+const rfmLoading = ref(false)
+
+const dash = ref({})
+const trendRef = ref(null)
+const trendChart = shallowRef(null)
+
+const sumDim = reactive({ purchase: 'product', sales: 'product' })
+const sumData = reactive({
+  purchase: { list: [], summary: {} },
+  sales: { list: [], summary: {} }
+})
+
+const rankOrder = ref('desc')
+const rankTop = ref(10)
+const rankList = ref([])
+const rankTotal = computed(() => rankList.value.reduce((s, r) => s + Math.abs(r.amount || 0), 0))
+
+const warehouses = ref([])
+const moveFilter = reactive({ warehouse_id: '', keyword: '' })
+const moveList = ref([])
+const moveSummary = ref({})
+const movePage = reactive({ page: 1, pageSize: 20, total: 0 })
+
+const profitList = ref([])
+const profitSummary = ref({})
+const profitNegativeCount = computed(() => profitList.value.filter((r) => Number(r.profit) < 0).length)
+
+const rfmList = ref([])
+const rfmSegments = ref({})
+const rfmMedian = ref({})
+const rfmTotal = computed(() => rfmList.value.reduce((s, r) => s + Math.max(0, r.m_amount || 0), 0))
+
+const kpiCards = computed(() => {
+  const m = dash.value.month || {}
+  const s = dash.value.stock || {}
+  const b = dash.value.partner_bill || {}
+  return [
+    { label: '本月采购额', text: money(m.purchase_amount), sub: `${m.purchase_count || 0} 张入库单`, cls: '' },
+    { label: '本月销售额', text: money(m.sales_amount), sub: `退货 ${money(m.return_amount)}`, cls: 'in' },
+    { label: '本月毛利', text: money(m.profit), sub: `成本 ${money(m.cost)}`, cls: Number(m.profit) >= 0 ? 'in' : 'out' },
+    { label: '毛利率', text: `${Number(m.profit_rate || 0).toFixed(2)}%`, sub: '毛利 / 净收入', cls: '' },
+    { label: '库存金额', text: money(s.value), sub: `结存数量 ${qty(s.qty)}`, cls: '' },
+    { label: '未结应收', text: money(b.receivable), sub: `未结应付 ${money(b.payable)}`, cls: 'out' }
+  ]
+})
+
+const warnCards = computed(() => {
+  const w = dash.value.warning || {}
+  return [
+    { label: '低于安全库存', value: w.low || 0, cls: 'warn', to: '/apps/erp/stock/warning' },
+    { label: '缺货', value: w.out || 0, cls: 'danger', to: '/apps/erp/stock/warning' },
+    { label: '超储', value: w.over || 0, cls: 'muted', to: '/apps/erp/stock/warning' },
+    { label: '30 天内到期批次', value: w.expiring || 0, cls: 'warn', to: '/apps/erp/stock/query' }
+  ]
+})
+
+function pct(v, total) {
+  if (!total) return 0
+  return Math.round((Math.abs(Number(v) || 0) / total) * 1000) / 10
+}
+
+const dimLabels = { product: '商品', supplier: '供应商', customer: '客户', month: '月份' }
+const dimLabel = (d) => dimLabels[d] || '名称'
+
+function segTag(seg) {
+  return {
+    重要价值客户: 'success',
+    重要发展客户: 'warning',
+    重要保持客户: '',
+    重要挽留客户: 'danger',
+    一般客户: 'info'
+  }[seg] || 'info'
+}
+
+function rangeParams() {
+  const p = {}
+  if (dates.value && dates.value.length === 2) {
+    p.date_from = dates.value[0]
+    p.date_to = dates.value[1]
+  }
+  return p
+}
+
+async function loadDashboard() {
+  dashLoading.value = true
+  try {
+    const res = await getErpDashboard({})
+    if (res.code === 200) {
+      dash.value = res.data || {}
+      nextTick(renderTrend)
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '看板加载失败')
+  } finally {
+    dashLoading.value = false
+  }
+}
+
+function renderTrend() {
+  const el = trendRef.value
+  if (!el) return
+  if (!trendChart.value) {
+    trendChart.value = echarts.getInstanceByDom(el) || echarts.init(el)
+  }
+  const list = dash.value.trend || []
+  trendChart.value.setOption({
+    tooltip: { trigger: 'axis', valueFormatter: (v) => money(v) },
+    legend: { data: ['采购', '销售'], right: 0, top: 0 },
+    grid: { left: 8, right: 8, top: 34, bottom: 4, containLabel: true },
+    xAxis: { type: 'category', data: list.map((t) => t.month) },
+    yAxis: { type: 'value', axisLabel: { formatter: (v) => (v >= 10000 ? `${v / 10000}万` : v) } },
+    series: [
+      { name: '采购', type: 'bar', data: list.map((t) => t.buy), itemStyle: { color: '#e6a23c', borderRadius: [3, 3, 0, 0] } },
+      { name: '销售', type: 'bar', data: list.map((t) => t.sale), itemStyle: { color: '#409eff', borderRadius: [3, 3, 0, 0] } }
+    ]
+  })
+  trendChart.value.resize()
+}
+
+async function loadSummary(kind) {
+  sumLoading[kind] = true
+  try {
+    const fn = kind === 'purchase' ? getPurchaseSummary : getSalesSummary
+    const res = await fn({ dimension: sumDim[kind], ...rangeParams() })
+    if (res.code === 200) {
+      sumData[kind] = { list: res.data.list || [], summary: res.data.summary || {} }
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '汇总加载失败')
+  } finally {
+    sumLoading[kind] = false
+  }
+}
+
+async function loadRank() {
+  rankLoading.value = true
+  try {
+    const res = await getSalesRank({ order: rankOrder.value, top: rankTop.value, ...rangeParams() })
+    if (res.code === 200) rankList.value = res.data.list || []
+  } catch (e) {
+    ElMessage.error(e.message || '排行加载失败')
+  } finally {
+    rankLoading.value = false
+  }
+}
+
+async function loadMove(page) {
+  if (page) movePage.page = page
+  moveLoading.value = true
+  try {
+    const params = { page: movePage.page, pageSize: movePage.pageSize, ...rangeParams() }
+    if (moveFilter.warehouse_id) params.warehouse_id = moveFilter.warehouse_id
+    if (moveFilter.keyword) params.keyword = moveFilter.keyword
+    const res = await getStockMoveReport(params)
+    if (res.code === 200) {
+      moveList.value = res.data.list || []
+      moveSummary.value = res.data.summary || {}
+      movePage.total = Number(res.data.total) || 0
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '收发存加载失败')
+  } finally {
+    moveLoading.value = false
+  }
+}
+
+async function loadProfit() {
+  profitLoading.value = true
+  try {
+    const res = await getProfitReport(rangeParams())
+    if (res.code === 200) {
+      profitList.value = res.data.list || []
+      profitSummary.value = res.data.summary || {}
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '毛利加载失败')
+  } finally {
+    profitLoading.value = false
+  }
+}
+
+async function loadRfm() {
+  rfmLoading.value = true
+  try {
+    const res = await getRfmReport({})
+    if (res.code === 200) {
+      rfmList.value = res.data.list || []
+      rfmSegments.value = res.data.segment_counts || {}
+      rfmMedian.value = res.data.median || {}
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '客户价值加载失败')
+  } finally {
+    rfmLoading.value = false
+  }
+}
+
+const loaders = {
+  dashboard: loadDashboard,
+  purchase: () => loadSummary('purchase'),
+  sales: () => loadSummary('sales'),
+  rank: loadRank,
+  stockmove: () => loadMove(1),
+  profit: loadProfit,
+  rfm: loadRfm
+}
+
+function reloadCurrent() {
+  loaded[tab.value] = false
+  runTab(tab.value)
+}
+
+function runTab(name) {
+  if (loaded[name]) return
+  loaded[name] = true
+  loaders[name]()
+}
+
+function onTabChange(name) {
+  runTab(name)
+  if (name === 'dashboard') nextTick(renderTrend)
+}
+
+function onResize() {
+  trendChart.value?.resize()
+}
+
+onMounted(async () => {
+  try {
+    const res = await getWarehouseList({ pageSize: 100 })
+    if (res.code === 200) warehouses.value = res.data.list || []
+  } catch (e) {
+    warehouses.value = []
+  }
+  runTab(tab.value)
+  window.addEventListener('resize', onResize)
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', onResize)
+  trendChart.value?.dispose()
+  trendChart.value = null
+})
+</script>
+
+<style lang="less" scoped>
+.erp-report {
+  padding: 20px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  flex-wrap: wrap;
+  gap: 12px;
+  margin-bottom: 8px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+
+  .range-form {
+    :deep(.el-form-item) {
+      margin-bottom: 0;
+    }
+  }
+}
+
+.tab-body {
+  min-height: 240px;
+}
+
+.kpi-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+  gap: 12px;
+  margin-bottom: 16px;
+
+  &.compact {
+    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  }
+}
+
+.kpi-card {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  padding: 14px 16px;
+  background: var(--el-bg-color);
+  border: 1px solid var(--el-border-color-lighter);
+  border-radius: 8px;
+
+  .kpi-label {
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
+
+  b {
+    font-size: 21px;
+    line-height: 1.2;
+  }
+
+  .kpi-sub {
+    font-size: 12px;
+    color: var(--el-text-color-placeholder);
+  }
+}
+
+.panel-row {
+  display: grid;
+  grid-template-columns: 2fr 1fr;
+  gap: 12px;
+
+  @media (max-width: 1100px) {
+    grid-template-columns: 1fr;
+  }
+}
+
+.panel {
+  padding: 14px 16px;
+  background: var(--el-bg-color);
+  border: 1px solid var(--el-border-color-lighter);
+  border-radius: 8px;
+
+  .panel-title {
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 10px;
+  }
+
+  .chart {
+    height: 260px;
+  }
+}
+
+.warn-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 10px;
+
+  .warn-item {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 4px;
+    padding: 10px 12px;
+    border: 1px solid var(--el-border-color-lighter);
+    border-radius: 6px;
+    cursor: pointer;
+    transition: border-color 0.2s;
+
+    &:hover {
+      border-color: var(--el-color-primary);
+    }
+
+    b {
+      font-size: 18px;
+    }
+
+    span {
+      font-size: 12px;
+      color: var(--el-text-color-secondary);
+    }
+  }
+}
+
+.todo-line {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 14px;
+  margin-top: 12px;
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+
+  b {
+    color: var(--el-text-color-primary);
+  }
+}
+
+.dim-bar {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex-wrap: wrap;
+  margin-bottom: 12px;
+}
+
+.sum-tip {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
+.mini-summary {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 18px;
+  margin-bottom: 12px;
+  font-size: 13px;
+  color: var(--el-text-color-secondary);
+
+  b {
+    color: var(--el-text-color-primary);
+  }
+}
+
+.seg-bar {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+  margin-bottom: 12px;
+}
+
+.rate-cell {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+
+  :deep(.el-progress) {
+    flex: 1;
+  }
+
+  span {
+    width: 66px;
+    text-align: right;
+    font-size: 12px;
+  }
+}
+
+.neg-tip {
+  margin-top: 12px;
+  padding: 10px 12px;
+  font-size: 13px;
+  color: var(--el-color-warning);
+  background: var(--el-color-warning-light-9);
+  border-radius: 6px;
+}
+
+.pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16px;
+}
+
+.in {
+  color: var(--el-color-success);
+}
+
+.out {
+  color: var(--el-color-danger);
+}
+
+.warn {
+  color: var(--el-color-warning);
+}
+
+.danger {
+  color: var(--el-color-danger);
+}
+
+.muted {
+  color: var(--el-text-color-secondary);
+}
+</style>
diff --git a/backend/src/views/apps/erp/sales/order.vue b/backend/src/views/apps/erp/sales/order.vue
new file mode 100644
index 0000000..8a7169b
--- /dev/null
+++ b/backend/src/views/apps/erp/sales/order.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['sales_order']" title="销售订单" subtitle="接单不占库存，出库时按行带出剩余可发货量" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/sales/outbound.vue b/backend/src/views/apps/erp/sales/outbound.vue
new file mode 100644
index 0000000..5419590
--- /dev/null
+++ b/backend/src/views/apps/erp/sales/outbound.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['sales_out']" title="销售出库单" subtitle="审核生效即扣减库存、按移动加权成本结转毛利并生成应收账款" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/sales/return.vue b/backend/src/views/apps/erp/sales/return.vue
new file mode 100644
index 0000000..2db614e
--- /dev/null
+++ b/backend/src/views/apps/erp/sales/return.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['sales_return']" title="销售退货单" subtitle="红字冲减库存与应收，退货数量按原出库单剩余可退量校验" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/stock/inbound.vue b/backend/src/views/apps/erp/stock/inbound.vue
new file mode 100644
index 0000000..102a80e
--- /dev/null
+++ b/backend/src/views/apps/erp/stock/inbound.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['other_in']" title="其他入库单" subtitle="盘盈、赠品、期初建账等非采购入库，可按成本价登记" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/stock/outbound.vue b/backend/src/views/apps/erp/stock/outbound.vue
new file mode 100644
index 0000000..d54bdeb
--- /dev/null
+++ b/backend/src/views/apps/erp/stock/outbound.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['other_out']" title="其他出库单" subtitle="领用、报损、样品等非销售出库，按移动加权成本结转减少库存" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/stock/query.vue b/backend/src/views/apps/erp/stock/query.vue
new file mode 100644
index 0000000..cf68fd6
--- /dev/null
+++ b/backend/src/views/apps/erp/stock/query.vue
@@ -0,0 +1,484 @@
+<template>
+  <div class="stock-page">
+    <div class="page-header">
+      <div>
+        <h2>库存查询</h2>
+        <p>结存由出入库流水驱动，可按商品汇总或展开到仓库批次，并可追溯到每一笔流水</p>
+      </div>
+    </div>
+
+    <el-tabs v-model="tab" class="tabs">
+      <el-tab-pane label="库存结存" name="stock">
+        <div class="filter-bar">
+          <el-form :inline="true" @submit.prevent>
+            <el-form-item>
+              <el-input v-model="stockFilters.keyword" clearable placeholder="搜索商品/编码/规格/批次" :prefix-icon="Search" style="width: 230px" @keyup.enter="loadStock" />
+            </el-form-item>
+            <el-form-item label="仓库">
+              <el-select v-model="stockFilters.warehouse_id" clearable placeholder="全部" style="width: 140px" @change="loadStock">
+                <el-option v-for="w in warehouses" :key="w.id" :label="w.warehouse_name" :value="w.id" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-select v-model="stockFilters.safety_state" clearable placeholder="全部" style="width: 120px" @change="loadStock">
+                <el-option label="低于安全库存" value="low" />
+                <el-option label="超储" value="over" />
+                <el-option label="正常" value="normal" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="视角">
+              <el-radio-group v-model="stockGroupBy" @change="loadStock">
+                <el-radio-button value="product">按商品</el-radio-button>
+                <el-radio-button value="batch">按仓库批次</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :icon="Search" @click="loadStock">查询</el-button>
+              <el-button :icon="Refresh" @click="resetStock">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <div v-loading="stockLoading" class="table-container">
+          <div class="sum-bar">
+            <span>结存金额合计：<b>{{ money(stockSum) }}</b></span>
+            <span class="text-muted">按移动加权成本计价</span>
+          </div>
+          <el-table :data="stockRows" stripe border size="small">
+            <el-table-column prop="product_code" label="编码" width="120" />
+            <el-table-column prop="product_name" label="商品名称" min-width="160" show-overflow-tooltip />
+            <el-table-column prop="spec" label="规格" width="110" show-overflow-tooltip />
+            <el-table-column prop="category_name" label="分类" width="110" show-overflow-tooltip />
+            <el-table-column v-if="stockGroupBy === 'batch'" prop="warehouse_name" label="仓库" width="120" show-overflow-tooltip />
+            <el-table-column v-if="stockGroupBy === 'batch'" label="批次" width="120">
+              <template #default="{ row }">{{ row.batch_no || '-' }}</template>
+            </el-table-column>
+            <el-table-column prop="unit" label="单位" width="64" align="center" />
+            <el-table-column label="数量" width="100" align="right">
+              <template #default="{ row }">{{ qty(row.quantity) }}</template>
+            </el-table-column>
+            <el-table-column label="加权成本" width="110" align="right">
+              <template #default="{ row }">{{ money(row.cost_price) }}</template>
+            </el-table-column>
+            <el-table-column label="库存金额" width="120" align="right">
+              <template #default="{ row }">{{ money(row.amount) }}</template>
+            </el-table-column>
+            <el-table-column label="安全/最高" width="120" align="right">
+              <template #default="{ row }">
+                <span class="text-muted">{{ qty(row.safety_qty) }} / {{ qty(row.max_qty) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" width="90" align="center">
+              <template #default="{ row }">
+                <el-tag :type="stateTag(row.safety_state)" size="small">{{ stateText(row.safety_state) }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="90" align="center" fixed="right">
+              <template #default="{ row }">
+                <el-button link type="primary" size="small" @click="traceLedger(row)">流水</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="pagination">
+            <el-pagination
+              v-model:current-page="stockPage.page"
+              v-model:page-size="stockPage.pageSize"
+              :total="stockPage.total"
+              :page-sizes="[20, 50, 100]"
+              layout="total, sizes, prev, pager, next"
+              @size-change="loadStock"
+              @current-change="loadStock"
+            />
+          </div>
+        </div>
+      </el-tab-pane>
+
+      <el-tab-pane label="出入库流水" name="ledger">
+        <div class="filter-bar">
+          <el-form :inline="true" @submit.prevent>
+            <el-form-item label="仓库">
+              <el-select v-model="ledgerFilters.warehouse_id" clearable placeholder="全部" style="width: 140px" @change="loadLedger">
+                <el-option v-for="w in warehouses" :key="w.id" :label="w.warehouse_name" :value="w.id" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="单据类型">
+              <el-select v-model="ledgerFilters.doc_type" clearable placeholder="全部" style="width: 140px" @change="loadLedger">
+                <el-option v-for="t in docTypeOptions" :key="t.value" :label="t.label" :value="t.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-input v-model="ledgerFilters.doc_no" clearable placeholder="搜索单据编号" style="width: 180px" @keyup.enter="loadLedger" />
+            </el-form-item>
+            <el-form-item>
+              <el-input v-model="ledgerProductText" clearable placeholder="商品ID" style="width: 110px" @keyup.enter="applyLedgerProduct" />
+            </el-form-item>
+            <el-form-item label="日期">
+              <el-date-picker v-model="ledgerDates" type="daterange" value-format="YYYY-MM-DD" start-placeholder="开始" end-placeholder="结束" style="width: 240px" @change="loadLedger" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :icon="Search" @click="loadLedger">查询</el-button>
+              <el-button :icon="Refresh" @click="resetLedger">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <div v-loading="ledgerLoading" class="table-container">
+          <el-table :data="ledgerRows" stripe border size="small">
+            <el-table-column label="发生时间" width="160" align="center">
+              <template #default="{ row }">{{ dateTime(row.create_time) }}</template>
+            </el-table-column>
+            <el-table-column prop="doc_no" label="单据编号" min-width="150" show-overflow-tooltip />
+            <el-table-column label="类型" width="116" align="center">
+              <template #default="{ row }">{{ docTypeLabel(row.doc_type) }}</template>
+            </el-table-column>
+            <el-table-column prop="product_code" label="编码" width="110" />
+            <el-table-column prop="product_name" label="商品" min-width="150" show-overflow-tooltip />
+            <el-table-column prop="warehouse_name" label="仓库" width="110" show-overflow-tooltip />
+            <el-table-column label="批次" width="100">
+              <template #default="{ row }">{{ row.batch_no || '-' }}</template>
+            </el-table-column>
+            <el-table-column label="入/出" width="96" align="right">
+              <template #default="{ row }">
+                <span :class="row.direction === 1 ? 'in' : 'out'">
+                  {{ row.direction === 1 ? '+' : '-' }}{{ qty(Math.abs(row.change_qty)) }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结存" width="96" align="right">
+              <template #default="{ row }">{{ qty(row.after_qty) }}</template>
+            </el-table-column>
+            <el-table-column label="单价" width="100" align="right">
+              <template #default="{ row }">{{ money(row.cost_price) }}</template>
+            </el-table-column>
+            <el-table-column label="金额" width="110" align="right">
+              <template #default="{ row }">{{ money(row.amount) }}</template>
+            </el-table-column>
+          </el-table>
+          <div class="pagination">
+            <el-pagination
+              v-model:current-page="ledgerPage.page"
+              v-model:page-size="ledgerPage.pageSize"
+              :total="ledgerPage.total"
+              :page-sizes="[20, 50, 100]"
+              layout="total, sizes, prev, pager, next"
+              @size-change="loadLedger"
+              @current-change="loadLedger"
+            />
+          </div>
+        </div>
+      </el-tab-pane>
+
+      <el-tab-pane label="批次与效期" name="batch">
+        <div class="filter-bar">
+          <el-form :inline="true" @submit.prevent>
+            <el-form-item label="仓库">
+              <el-select v-model="batchFilters.warehouse_id" clearable placeholder="全部" style="width: 140px" @change="loadBatch">
+                <el-option v-for="w in warehouses" :key="w.id" :label="w.warehouse_name" :value="w.id" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-input v-model="batchFilters.keyword" clearable placeholder="搜索商品/批次" style="width: 200px" @keyup.enter="loadBatch" />
+            </el-form-item>
+            <el-form-item label="效期">
+              <el-select v-model="batchFilters.expire_state" clearable placeholder="全部" style="width: 130px" @change="loadBatch">
+                <el-option label="已过期" value="expired" />
+                <el-option label="临近到期" value="expiring" />
+                <el-option label="正常" value="normal" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :icon="Search" @click="loadBatch">查询</el-button>
+              <el-button :icon="Refresh" @click="resetBatch">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <div v-loading="batchLoading" class="table-container">
+          <el-table :data="batchRows" stripe border size="small">
+            <el-table-column prop="product_code" label="编码" width="120" />
+            <el-table-column prop="product_name" label="商品" min-width="150" show-overflow-tooltip />
+            <el-table-column prop="spec" label="规格" width="110" show-overflow-tooltip />
+            <el-table-column prop="warehouse_name" label="仓库" width="120" show-overflow-tooltip />
+            <el-table-column prop="batch_no" label="批次" width="130" />
+            <el-table-column prop="unit" label="单位" width="64" align="center" />
+            <el-table-column label="数量" width="100" align="right">
+              <template #default="{ row }">{{ qty(row.quantity) }}</template>
+            </el-table-column>
+            <el-table-column label="成本" width="100" align="right">
+              <template #default="{ row }">{{ money(row.cost_price) }}</template>
+            </el-table-column>
+            <el-table-column label="金额" width="110" align="right">
+              <template #default="{ row }">{{ money(row.amount) }}</template>
+            </el-table-column>
+            <el-table-column label="到期日" width="110" align="center">
+              <template #default="{ row }">{{ row.expire_date ? dateOnly(row.expire_date) : '-' }}</template>
+            </el-table-column>
+            <el-table-column label="剩余" width="110" align="center">
+              <template #default="{ row }">
+                <el-tag v-if="row.expired" type="danger" size="small">已过期</el-tag>
+                <el-tag v-else-if="row.expire_in_days !== null && row.expire_in_days <= 30" type="warning" size="small">{{ row.expire_in_days }} 天</el-tag>
+                <span v-else-if="row.expire_in_days !== null" class="text-muted">{{ row.expire_in_days }} 天</span>
+                <span v-else class="text-muted">未登记</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="pagination">
+            <el-pagination
+              v-model:current-page="batchPage.page"
+              v-model:page-size="batchPage.pageSize"
+              :total="batchPage.total"
+              :page-sizes="[20, 50, 100]"
+              layout="total, sizes, prev, pager, next"
+              @size-change="loadBatch"
+              @current-change="loadBatch"
+            />
+          </div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, reactive, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { Search, Refresh } from '@element-plus/icons-vue'
+import { getBatchList, getStockLedger, getStockList } from '@/api/erpStock'
+import { getWarehouseList } from '@/api/erpWarehouse'
+import { DOC_TYPE_ORDER, dateOnly, docTypeLabel, money, qty } from '../document/dict'
+
+const tab = ref('stock')
+const warehouses = ref([])
+const docTypeOptions = DOC_TYPE_ORDER.map((t) => ({ value: t, label: docTypeLabel(t) }))
+
+const stockGroupBy = ref('product')
+const stockRows = ref([])
+const stockSum = ref(0)
+const stockLoading = ref(false)
+const stockFilters = reactive({ keyword: '', warehouse_id: '', safety_state: '' })
+const stockPage = reactive({ page: 1, pageSize: 20, total: 0 })
+
+const ledgerRows = ref([])
+const ledgerLoading = ref(false)
+const ledgerFilters = reactive({ warehouse_id: '', doc_type: '', doc_no: '', product_id: '' })
+const ledgerProductText = ref('')
+const ledgerDates = ref([])
+const ledgerPage = reactive({ page: 1, pageSize: 20, total: 0 })
+
+const batchRows = ref([])
+const batchLoading = ref(false)
+const batchFilters = reactive({ warehouse_id: '', keyword: '', expire_state: '' })
+const batchPage = reactive({ page: 1, pageSize: 20, total: 0 })
+
+const stateMap = { low: { text: '偏低', tag: 'danger' }, over: { text: '超储', tag: 'warning' }, normal: { text: '正常', tag: 'success' } }
+const stateText = (s) => stateMap[s]?.text || '正常'
+const stateTag = (s) => stateMap[s]?.tag || 'success'
+
+function dateTime(v) {
+  if (!v) return '-'
+  const d = new Date(v)
+  if (isNaN(d.getTime())) return String(v).replace('T', ' ').slice(0, 19)
+  const p = (n) => String(n).padStart(2, '0')
+  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`
+}
+
+async function loadStock() {
+  stockLoading.value = true
+  try {
+    const params = {
+      page: stockPage.page,
+      pageSize: stockPage.pageSize,
+      group_by: stockGroupBy.value
+    }
+    if (stockFilters.keyword) params.keyword = stockFilters.keyword
+    if (stockFilters.warehouse_id) params.warehouse_id = stockFilters.warehouse_id
+    if (stockFilters.safety_state) params.safety_state = stockFilters.safety_state
+    const res = await getStockList(params)
+    if (res.code === 200) {
+      stockRows.value = res.data.list || []
+      stockPage.total = Number(res.data.total) || 0
+      stockSum.value = Number(res.data.sum_amount) || 0
+    } else {
+      ElMessage.error(res.msg || '库存加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '库存加载失败')
+  } finally {
+    stockLoading.value = false
+  }
+}
+
+function resetStock() {
+  stockFilters.keyword = ''
+  stockFilters.warehouse_id = ''
+  stockFilters.safety_state = ''
+  stockPage.page = 1
+  loadStock()
+}
+
+/** 从结存行跳到流水页签，只保留同一商品+仓库的记录 */
+function traceLedger(row) {
+  ledgerFilters.product_id = row.product_id
+  ledgerProductText.value = String(row.product_id)
+  ledgerFilters.warehouse_id = stockGroupBy.value === 'batch' ? row.warehouse_id : ''
+  ledgerFilters.doc_no = ''
+  ledgerDates.value = []
+  ledgerPage.page = 1
+  tab.value = 'ledger'
+  loadLedger()
+}
+
+function applyLedgerProduct() {
+  const n = Number(ledgerProductText.value)
+  ledgerFilters.product_id = n > 0 ? n : ''
+  loadLedger()
+}
+
+async function loadLedger() {
+  ledgerLoading.value = true
+  try {
+    const params = { page: ledgerPage.page, pageSize: ledgerPage.pageSize }
+    if (ledgerFilters.warehouse_id) params.warehouse_id = ledgerFilters.warehouse_id
+    if (ledgerFilters.doc_type) params.doc_type = ledgerFilters.doc_type
+    if (ledgerFilters.product_id) params.product_id = ledgerFilters.product_id
+    if (ledgerFilters.doc_no) params.doc_no = ledgerFilters.doc_no
+    if (ledgerDates.value && ledgerDates.value.length === 2) {
+      params.date_from = ledgerDates.value[0]
+      params.date_to = ledgerDates.value[1]
+    }
+    const res = await getStockLedger(params)
+    if (res.code === 200) {
+      ledgerRows.value = res.data.list || []
+      ledgerPage.total = Number(res.data.total) || 0
+    } else {
+      ElMessage.error(res.msg || '流水加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '流水加载失败')
+  } finally {
+    ledgerLoading.value = false
+  }
+}
+
+function resetLedger() {
+  ledgerFilters.warehouse_id = ''
+  ledgerFilters.doc_type = ''
+  ledgerFilters.doc_no = ''
+  ledgerFilters.product_id = ''
+  ledgerProductText.value = ''
+  ledgerDates.value = []
+  ledgerPage.page = 1
+  loadLedger()
+}
+
+async function loadBatch() {
+  batchLoading.value = true
+  try {
+    const params = { page: batchPage.page, pageSize: batchPage.pageSize }
+    if (batchFilters.warehouse_id) params.warehouse_id = batchFilters.warehouse_id
+    if (batchFilters.keyword) params.keyword = batchFilters.keyword
+    if (batchFilters.expire_state) params.expire_state = batchFilters.expire_state
+    const res = await getBatchList(params)
+    if (res.code === 200) {
+      batchRows.value = res.data.list || []
+      batchPage.total = Number(res.data.total) || 0
+    } else {
+      ElMessage.error(res.msg || '批次加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '批次加载失败')
+  } finally {
+    batchLoading.value = false
+  }
+}
+
+function resetBatch() {
+  batchFilters.warehouse_id = ''
+  batchFilters.keyword = ''
+  batchFilters.expire_state = ''
+  batchPage.page = 1
+  loadBatch()
+}
+
+watch(tab, (v) => {
+  if (v === 'ledger' && !ledgerRows.value.length) loadLedger()
+  if (v === 'batch' && !batchRows.value.length) loadBatch()
+})
+
+onMounted(async () => {
+  try {
+    const res = await getWarehouseList({ pageSize: 100 })
+    if (res.code === 200) warehouses.value = res.data.list || []
+  } catch (e) {
+    warehouses.value = []
+  }
+  loadStock()
+})
+</script>
+
+<style lang="less" scoped>
+.stock-page {
+  padding: 20px;
+}
+
+.page-header {
+  margin-bottom: 16px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.filter-bar {
+  background: var(--el-bg-color);
+  padding: 16px 16px 0;
+  border-radius: 4px;
+  margin-bottom: 16px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.table-container {
+  background: var(--el-bg-color);
+  padding: 16px;
+  border-radius: 4px;
+  border: 1px solid var(--el-border-color-lighter);
+}
+
+.sum-bar {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  margin-bottom: 10px;
+  font-size: 13px;
+}
+
+.text-muted {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.in {
+  color: var(--el-color-success);
+  font-weight: 600;
+}
+
+.out {
+  color: var(--el-color-danger);
+  font-weight: 600;
+}
+
+.pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16px;
+}
+</style>
diff --git a/backend/src/views/apps/erp/stock/taking.vue b/backend/src/views/apps/erp/stock/taking.vue
new file mode 100644
index 0000000..5c6e6c0
--- /dev/null
+++ b/backend/src/views/apps/erp/stock/taking.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['stock_take']" title="库存盘点" subtitle="选择仓库载入账面数，只改实盘数；生效时差额自动生成盘盈盘亏流水" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/stock/transfer.vue b/backend/src/views/apps/erp/stock/transfer.vue
new file mode 100644
index 0000000..c76d813
--- /dev/null
+++ b/backend/src/views/apps/erp/stock/transfer.vue
@@ -0,0 +1,7 @@
+<template>
+  <DocListPage :types="['transfer']" title="库存调拨" subtitle="两仓之间按加权成本平移库存，不产生损益与往来账" />
+</template>
+
+<script setup>
+import DocListPage from '../document/DocListPage.vue'
+</script>
diff --git a/backend/src/views/apps/erp/stock/warning.vue b/backend/src/views/apps/erp/stock/warning.vue
new file mode 100644
index 0000000..ad4a446
--- /dev/null
+++ b/backend/src/views/apps/erp/stock/warning.vue
@@ -0,0 +1,368 @@
+<template>
+  <div class="warning-page">
+    <div class="page-header">
+      <div>
+        <h2>库存预警与补货</h2>
+        <p>安全库存、积压、缺货与批次效期集中提示，补货建议可一键转采购订单</p>
+      </div>
+      <div class="header-actions">
+        <el-button :icon="Refresh" @click="loadAll">刷新</el-button>
+      </div>
+    </div>
+
+    <div class="kpi-row">
+      <div v-for="k in kpis" :key="k.key" class="kpi" :class="{ active: tab === k.key }" @click="tab = k.key">
+        <span class="kpi-label">{{ k.label }}</span>
+        <b :class="k.cls">{{ counts[k.key] || 0 }}</b>
+      </div>
+    </div>
+
+    <el-tabs v-model="tab" class="tabs">
+      <el-tab-pane label="低于安全库存" name="low">
+        <el-table v-loading="warnLoading" :data="warn.low" stripe border size="small">
+          <template #empty>
+            <el-empty v-if="!warnLoading" description="没有低于安全库存的商品" />
+          </template>
+          <el-table-column prop="product_code" label="编码" width="120" />
+          <el-table-column prop="product_name" label="商品" min-width="160" show-overflow-tooltip />
+          <el-table-column prop="spec" label="规格" width="110" show-overflow-tooltip />
+          <el-table-column prop="category_name" label="分类" width="110" show-overflow-tooltip />
+          <el-table-column prop="unit" label="单位" width="64" align="center" />
+          <el-table-column label="当前库存" width="110" align="right">
+            <template #default="{ row }">
+              <span class="danger">{{ qty(row.quantity) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="安全库存" width="110" align="right">
+            <template #default="{ row }">{{ qty(row.safety_qty) }}</template>
+          </el-table-column>
+          <el-table-column label="采购在途" width="110" align="right">
+            <template #default="{ row }">
+              <span :class="{ 'text-muted': !row.in_transit }">{{ qty(row.in_transit) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="建议补货" width="110" align="right">
+            <template #default="{ row }">
+              <span class="primary">{{ qty(row.suggest_qty) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+
+      <el-tab-pane label="缺货" name="out">
+        <el-table v-loading="warnLoading" :data="warn.out" stripe border size="small">
+          <template #empty>
+            <el-empty v-if="!warnLoading" description="暂无零库存商品" />
+          </template>
+          <el-table-column prop="product_code" label="编码" width="120" />
+          <el-table-column prop="product_name" label="商品" min-width="180" show-overflow-tooltip />
+          <el-table-column prop="spec" label="规格" width="120" show-overflow-tooltip />
+          <el-table-column prop="unit" label="单位" width="70" align="center" />
+          <el-table-column label="安全库存" width="110" align="right">
+            <template #default="{ row }">{{ qty(row.safety_qty) }}</template>
+          </el-table-column>
+          <el-table-column label="采购在途" width="110" align="right">
+            <template #default="{ row }">{{ qty(row.in_transit) }}</template>
+          </el-table-column>
+          <el-table-column label="建议补货" width="110" align="right">
+            <template #default="{ row }">
+              <span class="primary">{{ qty(row.suggest_qty) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+
+      <el-tab-pane label="库存积压" name="over">
+        <el-table v-loading="warnLoading" :data="warn.over" stripe border size="small">
+          <template #empty>
+            <el-empty v-if="!warnLoading" description="没有超过最高库存的商品" />
+          </template>
+          <el-table-column prop="product_code" label="编码" width="120" />
+          <el-table-column prop="product_name" label="商品" min-width="180" show-overflow-tooltip />
+          <el-table-column prop="spec" label="规格" width="120" show-overflow-tooltip />
+          <el-table-column prop="unit" label="单位" width="70" align="center" />
+          <el-table-column label="当前库存" width="110" align="right">
+            <template #default="{ row }">
+              <span class="warning">{{ qty(row.quantity) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="最高库存" width="110" align="right">
+            <template #default="{ row }">{{ qty(row.max_qty) }}</template>
+          </el-table-column>
+          <el-table-column label="建议处理" width="120" align="right">
+            <template #default="{ row }">促销或退供 {{ qty(row.suggest_qty) }}</template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+
+      <el-tab-pane label="效期临近" name="expiring">
+        <el-table v-loading="warnLoading" :data="warn.expiring" stripe border size="small">
+          <template #empty>
+            <el-empty v-if="!warnLoading" description="30 天内没有到期或过期的批次" />
+          </template>
+          <el-table-column prop="product_code" label="编码" width="120" />
+          <el-table-column prop="product_name" label="商品" min-width="160" show-overflow-tooltip />
+          <el-table-column prop="warehouse_name" label="仓库" width="120" show-overflow-tooltip />
+          <el-table-column prop="batch_no" label="批次" width="130" />
+          <el-table-column prop="unit" label="单位" width="64" align="center" />
+          <el-table-column label="库存" width="100" align="right">
+            <template #default="{ row }">{{ qty(row.quantity) }}</template>
+          </el-table-column>
+          <el-table-column label="到期日" width="110" align="center">
+            <template #default="{ row }">{{ row.expire_date || '-' }}</template>
+          </el-table-column>
+          <el-table-column label="剩余" width="100" align="center">
+            <template #default="{ row }">
+              <el-tag :type="row.expire_in_days < 0 ? 'danger' : 'warning'" size="small">
+                {{ row.expire_in_days < 0 ? `过期 ${-row.expire_in_days} 天` : `${row.expire_in_days} 天` }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="提示" min-width="150">
+            <template #default="{ row }">
+              <span class="text-muted">{{ row.type_label }}，建议先出或报损</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+
+      <el-tab-pane label="补货建议" name="replenish">
+        <div class="toolbar">
+          <el-button type="primary" :icon="ShoppingCart" :disabled="!replenish.length" @click="toPurchaseOrder">
+            生成采购订单
+          </el-button>
+          <span class="text-muted">
+            建议合计 {{ money(replenishAmount) }}，勾选行仅对补货建议生效（目标量取「月销 + 安全库存」与最高库存的较大值，已扣除在途）
+          </span>
+        </div>
+        <el-table
+          v-loading="repLoading"
+          :data="replenish"
+          stripe
+          border
+          size="small"
+          @selection-change="onRepSelect"
+        >
+          <el-table-column type="selection" width="46" />
+          <el-table-column prop="product_code" label="编码" width="120" />
+          <el-table-column prop="product_name" label="商品" min-width="160" show-overflow-tooltip />
+          <el-table-column prop="spec" label="规格" width="110" show-overflow-tooltip />
+          <el-table-column prop="unit" label="单位" width="64" align="center" />
+          <el-table-column label="现有" width="90" align="right">
+            <template #default="{ row }">{{ qty(row.quantity) }}</template>
+          </el-table-column>
+          <el-table-column label="安全" width="90" align="right">
+            <template #default="{ row }">{{ qty(row.safety_qty) }}</template>
+          </el-table-column>
+          <el-table-column label="在途" width="90" align="right">
+            <template #default="{ row }">
+              <span :class="{ 'text-muted': !row.in_transit }">{{ qty(row.in_transit) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="30天销量" width="100" align="right">
+            <template #default="{ row }">{{ qty(row.sold_30) }}</template>
+          </el-table-column>
+          <el-table-column label="建议数量" width="100" align="right">
+            <template #default="{ row }">
+              <span class="primary">{{ qty(row.suggest_qty) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="采购单价" width="100" align="right">
+            <template #default="{ row }">{{ money(row.unit_price) }}</template>
+          </el-table-column>
+          <el-table-column label="金额" width="110" align="right">
+            <template #default="{ row }">{{ money(row.amount) }}</template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+    <DocEditor
+      v-model:visible="editorVisible"
+      doc-type="purchase_order"
+      :preset-items="presetItems"
+      @success="loadAll"
+    />
+  </div>
+</template>
+
+<script setup>
+import { computed, onMounted, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { Refresh, ShoppingCart } from '@element-plus/icons-vue'
+import DocEditor from '../document/DocEditor.vue'
+import { getReplenishList, getStockWarning } from '@/api/erpStock'
+import { money, qty } from '../document/dict'
+
+const tab = ref('low')
+const warn = ref({ low: [], over: [], out: [], expiring: [] })
+const counts = ref({})
+const warnLoading = ref(false)
+const replenish = ref([])
+const repLoading = ref(false)
+const repSelected = ref([])
+const editorVisible = ref(false)
+const presetItems = ref([])
+
+const kpis = [
+  { key: 'low', label: '低于安全库存', cls: 'danger' },
+  { key: 'out', label: '缺货', cls: 'danger' },
+  { key: 'over', label: '库存积压', cls: 'warning' },
+  { key: 'expiring', label: '效期临近', cls: 'warning' },
+  { key: 'replenish', label: '待补货', cls: 'primary' }
+]
+
+const replenishAmount = computed(() =>
+  (repSelected.value.length ? repSelected.value : replenish.value).reduce((s, r) => s + (Number(r.amount) || 0), 0)
+)
+
+async function loadWarning() {
+  warnLoading.value = true
+  try {
+    const res = await getStockWarning({})
+    if (res.code === 200) {
+      warn.value = {
+        low: res.data.low || [],
+        over: res.data.over || [],
+        out: res.data.out || [],
+        expiring: res.data.expiring || []
+      }
+      counts.value = { ...(res.data.counts || {}), replenish: counts.value.replenish || 0 }
+    } else {
+      ElMessage.error(res.msg || '预警加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '预警加载失败')
+  } finally {
+    warnLoading.value = false
+  }
+}
+
+async function loadReplenish() {
+  repLoading.value = true
+  try {
+    const res = await getReplenishList({})
+    if (res.code === 200) {
+      replenish.value = res.data.list || []
+      counts.value = { ...counts.value, replenish: Number(res.data.total) || 0 }
+    } else {
+      ElMessage.error(res.msg || '补货建议加载失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '补货建议加载失败')
+  } finally {
+    repLoading.value = false
+  }
+}
+
+function loadAll() {
+  loadWarning()
+  loadReplenish()
+}
+
+function onRepSelect(rows) {
+  repSelected.value = rows
+}
+
+function toPurchaseOrder() {
+  const rows = repSelected.value.length ? repSelected.value : replenish.value
+  if (!rows.length) {
+    ElMessage.warning('暂无可转的补货建议')
+    return
+  }
+  presetItems.value = rows.map((r) => ({
+    product_id: r.product_id,
+    product_name: r.product_name,
+    spec: r.spec,
+    unit: r.unit,
+    quantity: r.suggest_qty,
+    unit_price: r.unit_price
+  }))
+  editorVisible.value = true
+}
+
+onMounted(loadAll)
+</script>
+
+<style lang="less" scoped>
+.warning-page {
+  padding: 20px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 16px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.kpi-row {
+  display: flex;
+  gap: 12px;
+  margin-bottom: 16px;
+  flex-wrap: wrap;
+}
+
+.kpi {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  min-width: 140px;
+  padding: 12px 16px;
+  border: 1px solid var(--el-border-color-lighter);
+  border-radius: 6px;
+  background: var(--el-bg-color);
+  cursor: pointer;
+
+  &.active {
+    border-color: var(--el-color-primary);
+    box-shadow: 0 0 0 1px var(--el-color-primary-light-7) inset;
+  }
+
+  .kpi-label {
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
+
+  b {
+    font-size: 20px;
+  }
+}
+
+.danger {
+  color: var(--el-color-danger);
+}
+
+.warning {
+  color: var(--el-color-warning);
+}
+
+.primary {
+  color: var(--el-color-primary);
+}
+
+.text-muted {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.toolbar {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  margin-bottom: 12px;
+}
+</style>
diff --git a/backend/src/views/apps/erp/supplier/components/edit.vue b/backend/src/views/apps/erp/supplier/components/edit.vue
index 884ecd0..4b68e4e 100644
--- a/backend/src/views/apps/erp/supplier/components/edit.vue
+++ b/backend/src/views/apps/erp/supplier/components/edit.vue
@@ -121,6 +121,22 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="账期(天)">
+              <el-input-number
+                v-model="form.payment_days"
+                :min="0"
+                :precision="0"
+                :step="10"
+                controls-position="right"
+                placeholder="0 表示现结"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <div class="credit-tip">账期决定应付单的到期日与逾期起算。</div>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="经营范围" prop="business_scope">
               <el-input
@@ -283,6 +299,7 @@ const defaultForm = () => ({
   address: '',
   status: '1',
   is_draft: 0,
+  payment_days: 0,
   remark: '',
   invoice_title: '',
   tax_number: '',
@@ -426,6 +443,12 @@ function handleSaveDraft() {
   padding: 0 20px;
 }
 
+.credit-tip {
+  margin: -8px 0 12px;
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
 .dialog-footer {
   display: flex;
   justify-content: space-between;
diff --git a/backend/src/views/apps/erp/system/index.vue b/backend/src/views/apps/erp/system/index.vue
new file mode 100644
index 0000000..2bbb093
--- /dev/null
+++ b/backend/src/views/apps/erp/system/index.vue
@@ -0,0 +1,489 @@
+<template>
+  <div class="erp-system">
+    <div class="page-header">
+      <div>
+        <h2>系统参数</h2>
+        <p>进销存的取价口径、库存开关、单号规则与单据审批流绑定</p>
+      </div>
+      <div class="header-actions">
+        <el-button :icon="Refresh" @click="loadAll">刷新</el-button>
+        <el-button type="primary" :icon="Check" :loading="saving" @click="doSave">保存参数</el-button>
+      </div>
+    </div>
+
+    <el-row :gutter="16">
+      <el-col :span="12" :xs="24">
+        <div v-loading="loading" class="panel">
+          <div class="panel-title">交易口径</div>
+
+          <div class="field">
+            <div class="field-label">
+              销售单据默认售价
+              <el-tooltip content="决定单据编辑器取价用零售价、批发价还是会员价；最低价始终作为折扣下限校验" placement="top">
+                <el-icon><QuestionFilled /></el-icon>
+              </el-tooltip>
+            </div>
+            <el-radio-group v-model="form.sales_price_type">
+              <el-radio-button value="sale">零售价</el-radio-button>
+              <el-radio-button value="wholesale">批发价</el-radio-button>
+              <el-radio-button value="member">会员价</el-radio-button>
+            </el-radio-group>
+          </div>
+
+          <div class="field">
+            <div class="field-label">
+              允许负库存出库
+              <el-tooltip content="关闭时出库单据在库存不足会被直接拒绝；开启后允许先出库后补入库，结存可能为负" placement="top">
+                <el-icon><QuestionFilled /></el-icon>
+              </el-tooltip>
+            </div>
+            <el-switch v-model="form.negative_stock_allowed" active-text="允许" inactive-text="禁止" />
+          </div>
+
+          <div class="field">
+            <div class="field-label">自动生成单据号</div>
+            <el-switch v-model="form.auto_generate_doc_no" active-text="自动" inactive-text="手工" />
+          </div>
+
+          <div class="field">
+            <div class="field-label">库存预警阈值</div>
+            <el-input-number v-model="form.stock_warning_threshold" :min="0" :max="99999" controls-position="right" style="width: 160px" />
+            <span class="field-tip">商品未单独设置安全库存时按该值预警</span>
+          </div>
+        </div>
+      </el-col>
+
+      <el-col :span="12" :xs="24">
+        <div v-loading="loading" class="panel">
+          <div class="panel-title">单据号前缀</div>
+          <div class="prefix-grid">
+            <div v-for="p in prefixFields" :key="p.key" class="field inline">
+              <span class="field-label">{{ p.label }}</span>
+              <el-input v-model="form[p.key]" maxlength="8" :placeholder="p.hint" style="width: 120px" />
+            </div>
+          </div>
+          <div class="panel-note">
+            完整单号为「前缀 + 年月日 + 流水号」。每类单据独立前缀，留空则使用括号中的默认值；
+            前缀只影响单号展示，不参与业务判断。
+          </div>
+
+          <div class="panel-title sub">快捷入口</div>
+          <div class="link-row">
+            <el-button v-for="l in links" :key="l.to" text bg :icon="l.icon" @click="router.push(l.to)">{{ l.label }}</el-button>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+    <div class="panel">
+      <div class="panel-title">
+        单据审批流
+        <el-button size="small" text type="primary" :icon="Refresh" @click="loadFlows">重新检测</el-button>
+      </div>
+      <div class="panel-note">
+        提交单据时优先取该类型专属流程（biz_type = erp_单据类型），没有则回落到模块级流程（biz_type = erp）；
+        两者都没有时无法提交，只能由有权限的账号直接审核生效。
+      </div>
+      <el-table v-loading="flowLoading" :data="flowRows" border size="small">
+        <el-table-column label="单据类型" min-width="140">
+          <template #default="{ row }">{{ docTypeLabel(row.doc_type) }}</template>
+        </el-table-column>
+        <el-table-column label="biz_type" width="190">
+          <template #default="{ row }"><code>erp_{{ row.doc_type }}</code></template>
+        </el-table-column>
+        <el-table-column label="匹配级别" width="120" align="center">
+          <template #default="{ row }">
+            <el-tag v-if="row.biz_type === 'erp_' + row.doc_type" type="success" size="small">专属流程</el-tag>
+            <el-tag v-else-if="row.biz_type === 'erp'" type="warning" size="small">模块级流程</el-tag>
+            <el-tag v-else type="danger" size="small">未配置</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="可用流程" min-width="260">
+          <template #default="{ row }">
+            <span v-if="!row.flows.length" class="text-muted">暂无可用流程，请先到审批流配置新增</span>
+            <el-tag v-for="f in row.flows" :key="f.flow_id" size="small" effect="plain" class="flow-tag">
+              {{ f.flow_name }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="110" align="center">
+          <template #default="{ row }">
+            <el-button link type="primary" size="small" @click="goList(row.doc_type)">查看单据</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="panel">
+      <div class="panel-title">上线检查清单</div>
+      <div class="check-grid">
+        <div v-for="c in checks" :key="c.label" class="check-item" :class="{ done: c.done }">
+          <el-icon class="check-icon"><component :is="c.done ? Select : Minus" /></el-icon>
+          <div class="check-text">
+            <b>{{ c.label }}</b>
+            <span>{{ c.tip }}</span>
+          </div>
+          <el-button text size="small" @click="router.push(c.to)">前往</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed, onMounted, reactive, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import {
+  Check,
+  Goods,
+  House,
+  Minus,
+  QuestionFilled,
+  Refresh,
+  Select,
+  Setting,
+  Share
+} from '@element-plus/icons-vue'
+import { getNormalSettings, saveNormalSettings } from '@/api/normalSetting'
+import { getDocumentFlows } from '@/api/erpDocument'
+import { getProductList } from '@/api/erpProduct'
+import { getWarehouseList } from '@/api/erpWarehouse'
+import { getCustomerList } from '@/api/customer'
+import { getSupplierList } from '@/api/supplier'
+import { DOC_TYPE_ORDER, docTypeLabel } from '../document/dict'
+
+const router = useRouter()
+const loading = ref(false)
+const saving = ref(false)
+const flowLoading = ref(false)
+const flowRows = ref([])
+const counts = reactive({ product: 0, warehouse: 0, partner: 0 })
+
+// 单据前缀：一型一前缀，与后端 docNoPrefix 的缺省表一致（留空即回落到这里）
+const DOC_PREFIX_DEFAULTS = {
+  purchase_order: 'CGDD',
+  purchase_in: 'CGRK',
+  purchase_return: 'CGTH',
+  sales_order: 'XSDD',
+  sales_out: 'XSCK',
+  sales_return: 'XSTH',
+  other_in: 'QTRK',
+  other_out: 'QTCK',
+  transfer: 'DB',
+  stock_take: 'PD'
+}
+
+const form = reactive({
+  sales_price_type: 'sale',
+  negative_stock_allowed: false,
+  auto_generate_doc_no: true,
+  stock_warning_threshold: 10
+})
+
+const prefixFields = DOC_TYPE_ORDER.map((t) => ({
+  key: `doc_prefix_${t}`,
+  label: docTypeLabel(t),
+  hint: DOC_PREFIX_DEFAULTS[t]
+}))
+
+prefixFields.forEach((p) => {
+  form[p.key] = ''
+})
+
+const links = [
+  { label: '基础资料设置', to: '/apps/erp/ProgramManagement', icon: Setting },
+  { label: '商品档案', to: '/apps/erp/basic/product', icon: Goods },
+  { label: '仓库档案', to: '/apps/erp/basic/warehouse', icon: House },
+  { label: '审批流配置', to: '/apps/oa/approvalcenter/settings', icon: Share }
+]
+
+const checks = computed(() => [
+  {
+    label: '商品与分类',
+    tip: counts.product ? `已建档 ${counts.product} 个商品` : '还没有商品，单据无法选货',
+    done: !!counts.product,
+    to: '/apps/erp/basic/product'
+  },
+  {
+    label: '仓库',
+    tip: counts.warehouse ? `已建 ${counts.warehouse} 个仓库` : '至少需要一个仓库作为出入库目的地',
+    done: !!counts.warehouse,
+    to: '/apps/erp/basic/warehouse'
+  },
+  {
+    label: '客户与供应商',
+    tip: counts.partner ? `共 ${counts.partner} 家往来单位` : '购销单据需要往来单位，含信用额度与账期',
+    done: !!counts.partner,
+    to: '/apps/erp/customers'
+  },
+  {
+    label: '单据审批流',
+    tip: flowRows.value.some((r) => r.flows.length) ? '已可用，提交单据会走审批' : '尚未配置，单据只能直接审核',
+    done: flowRows.value.some((r) => r.flows.length),
+    to: '/apps/oa/approvalcenter/settings'
+  }
+])
+
+async function loadSettings() {
+  loading.value = true
+  try {
+    const res = await getNormalSettings()
+    if (res.code !== 200) {
+      ElMessage.error(res.msg || '参数加载失败')
+      return
+    }
+    const map = {}
+    ;(res.data || []).forEach((g) => (g.items || []).forEach((it) => { map[it.config_key] = it.config_value }))
+    const boolOf = (k, def) => (map[k] === undefined ? def : String(map[k]) === '1')
+    form.sales_price_type = map.sales_price_type || 'sale'
+    form.negative_stock_allowed = boolOf('negative_stock_allowed', false)
+    form.auto_generate_doc_no = boolOf('auto_generate_doc_no', true)
+    form.stock_warning_threshold = Number(map.stock_warning_threshold ?? 10)
+    prefixFields.forEach((p) => { if (map[p.key]) form[p.key] = map[p.key] })
+  } catch (e) {
+    ElMessage.error(e.message || '参数加载失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+async function doSave() {
+  const bad = prefixFields.find((p) => /[^0-9A-Za-z\u4e00-\u9fa5_-]/.test(form[p.key] || ''))
+  if (bad) {
+    ElMessage.warning(`${bad.label}前缀只能使用字母、数字、汉字、下划线或短横线`)
+    return
+  }
+  saving.value = true
+  try {
+    const payload = {
+      sales_price_type: form.sales_price_type,
+      negative_stock_allowed: form.negative_stock_allowed ? '1' : '0',
+      auto_generate_doc_no: form.auto_generate_doc_no ? '1' : '0',
+      stock_warning_threshold: String(form.stock_warning_threshold ?? 0)
+    }
+    prefixFields.forEach((p) => { payload[p.key] = form[p.key] || '' })
+    const res = await saveNormalSettings(payload)
+    if (res.code === 200) {
+      ElMessage.success('参数已保存，单据取价与库存校验立即生效')
+      loadCounts()
+    } else {
+      ElMessage.error(res.msg || '保存失败')
+    }
+  } catch (e) {
+    ElMessage.error(e.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+async function loadFlows() {
+  flowLoading.value = true
+  try {
+    flowRows.value = await Promise.all(
+      DOC_TYPE_ORDER.map(async (t) => {
+        try {
+          const res = await getDocumentFlows(t)
+          return { doc_type: t, flows: res.code === 200 ? res.data.list || [] : [], biz_type: res.data?.biz_type || '' }
+        } catch (e) {
+          return { doc_type: t, flows: [], biz_type: '' }
+        }
+      })
+    )
+  } finally {
+    flowLoading.value = false
+  }
+}
+
+async function totalOf(fn, params) {
+  try {
+    const res = await fn(params)
+    return res.code === 200 ? Number(res.data?.total) || 0 : 0
+  } catch (e) {
+    return 0
+  }
+}
+
+async function loadCounts() {
+  const [p, w, c, s] = await Promise.all([
+    totalOf(getProductList, { page: 1, pageSize: 1 }),
+    totalOf(getWarehouseList, { page: 1, pageSize: 1 }),
+    totalOf(getCustomerList, { page: 1, pageSize: 1 }),
+    totalOf(getSupplierList, { page: 1, pageSize: 1 })
+  ])
+  counts.product = p
+  counts.warehouse = w
+  counts.partner = c + s
+}
+
+function goList(docType) {
+  const group = docType.startsWith('purchase') ? 'purchase' : docType.startsWith('sales') ? 'sales' : 'stock'
+  const file = {
+    purchase_order: 'order', purchase_in: 'inbound', purchase_return: 'return',
+    sales_order: 'order', sales_out: 'outbound', sales_return: 'return',
+    other_in: 'inbound', other_out: 'outbound', transfer: 'transfer', stock_take: 'taking'
+  }[docType]
+  router.push(`/apps/erp/${group}/${file}`)
+}
+
+async function loadAll() {
+  await Promise.all([loadSettings(), loadFlows(), loadCounts()])
+}
+
+onMounted(loadAll)
+</script>
+
+<style lang="less" scoped>
+.erp-system {
+  padding: 20px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  flex-wrap: wrap;
+  gap: 12px;
+  margin-bottom: 16px;
+
+  h2 {
+    margin: 0 0 6px 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
+.panel {
+  background: var(--el-bg-color);
+  border: 1px solid var(--el-border-color-lighter);
+  border-radius: 8px;
+  padding: 16px;
+  margin-bottom: 16px;
+}
+
+.panel-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  font-size: 15px;
+  font-weight: 600;
+  margin-bottom: 14px;
+
+  &.sub {
+    margin-top: 18px;
+  }
+}
+
+.panel-note {
+  font-size: 12px;
+  line-height: 1.7;
+  color: var(--el-text-color-secondary);
+  margin: 6px 0 12px;
+}
+
+.field {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin-bottom: 16px;
+
+  &.inline {
+    margin-bottom: 10px;
+  }
+
+  .field-label {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    font-size: 13px;
+    color: var(--el-text-color-regular);
+    min-width: 120px;
+  }
+
+  .field-tip {
+    font-size: 12px;
+    color: var(--el-text-color-placeholder);
+  }
+}
+
+.prefix-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
+  gap: 4px 16px;
+}
+
+.link-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+
+.flow-tag {
+  margin: 2px 6px 2px 0;
+}
+
+.text-muted {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+
+.check-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+  gap: 12px;
+}
+
+.check-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 12px 14px;
+  border: 1px solid var(--el-border-color-lighter);
+  border-radius: 6px;
+
+  .check-icon {
+    font-size: 16px;
+    color: var(--el-text-color-placeholder);
+  }
+
+  .check-text {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 3px;
+
+    b {
+      font-size: 13px;
+    }
+
+    span {
+      font-size: 12px;
+      color: var(--el-text-color-secondary);
+    }
+  }
+
+  &.done {
+    border-color: var(--el-color-success-light-5);
+    background: var(--el-color-success-light-9);
+
+    .check-icon {
+      color: var(--el-color-success);
+    }
+  }
+}
+
+code {
+  font-family: var(--el-font-family-mono, monospace);
+  font-size: 12px;
+  color: var(--el-color-primary);
+}
+</style>
diff --git a/backend/src/views/apps/oa/approvalcenter/components/ProgressTimeline.vue b/backend/src/views/apps/oa/approvalcenter/components/ProgressTimeline.vue
index d7d7926..fbffec0 100644
--- a/backend/src/views/apps/oa/approvalcenter/components/ProgressTimeline.vue
+++ b/backend/src/views/apps/oa/approvalcenter/components/ProgressTimeline.vue
@@ -51,7 +51,7 @@
 <script setup>
 import { computed, ref, watch } from "vue";
 import { ElMessage } from "element-plus";
-import { getCenterInstanceDetail } from "@/api/approval";
+import { getApprovalInstanceDetail } from "@/api/approval";
 
 const props = defineProps({
   modelValue: { type: Boolean, default: false },
@@ -91,7 +91,7 @@ const loadDetail = async (id) => {
   loading.value = true;
   detail.value = null;
   try {
-    const res = await getCenterInstanceDetail(id);
+    const res = await getApprovalInstanceDetail(id);
     detail.value = res?.data?.data ?? res?.data ?? null;
   } catch (error) {
     ElMessage.error(error?.message || "加载审批进度失败");
diff --git a/backend/src/views/basicSettings/roles/components/detail.vue b/backend/src/views/basicSettings/roles/components/detail.vue
index 42f2aa7..b374982 100644
--- a/backend/src/views/basicSettings/roles/components/detail.vue
+++ b/backend/src/views/basicSettings/roles/components/detail.vue
@@ -1,5 +1,13 @@
 <template>
   <el-dialog v-model="visible" title="角色详情" width="600px" @close="handleClose">
+    <el-alert
+      v-if="isPlatformRole"
+      style="margin-bottom: 12px"
+      type="info"
+      :closable="false"
+      show-icon
+      title="该角色由平台端统一下发，租户端只能查看和使用"
+    />
     <el-descriptions :column="1" border v-loading="loading">
       <el-descriptions-item label="角色ID">
         {{ roleDetail.id }}
@@ -14,6 +22,7 @@
       </el-descriptions-item>
       <el-descriptions-item label="分类">
         <el-tag v-if="roleDetail.cid === 1" type="danger" size="small">平台角色</el-tag>
+        <el-tag v-else-if="isPlatformRole" type="success" size="small">平台下发</el-tag>
         <el-tag v-else-if="Number(roleDetail.is_custom) === 1" type="warning" size="small">
           自定义角色
         </el-tag>
@@ -75,6 +84,13 @@ const loading = ref(false);
 const roleDetail = ref<any>({});
 const allMenus = ref<any[]>([]);
 
+// 平台下发（只读）判定，口径同后端 tenantRoleReadOnly
+const isPlatformRole = computed(() => {
+  const r = roleDetail.value || {};
+  if (!r.id) return false;
+  return Number(r.is_locked || 0) === 1 || Number(r.tenant_id || 0) === 0;
+});
+
 // 监听 modelValue
 watch(
   () => props.modelValue,
diff --git a/backend/src/views/basicSettings/roles/index.vue b/backend/src/views/basicSettings/roles/index.vue
index 23bdb23..034c940 100644
--- a/backend/src/views/basicSettings/roles/index.vue
+++ b/backend/src/views/basicSettings/roles/index.vue
@@ -19,7 +19,7 @@
     <div class="filter-bar">
       <el-radio-group v-model="typeFilter">
         <el-radio-button :value="'all'">全部</el-radio-button>
-        <el-radio-button :value="'global'">全局角色</el-radio-button>
+        <el-radio-button :value="'platform'">平台下发</el-radio-button>
         <el-radio-button :value="'custom'">自定义角色</el-radio-button>
       </el-radio-group>
     </div>
@@ -41,9 +41,13 @@
         />
         <el-table-column prop="cid" label="类型" width="150" align="center">
           <template #default="{ row }">
-            <el-tag v-if="Number(row.tenant_id || 0) === 0" type="success" size="small">
-              全局角色
-            </el-tag>
+            <el-tooltip
+              v-if="isPlatformRole(row)"
+              content="由平台端统一下发，租户端只能查看和使用，不能改名、改权限或删除"
+              placement="top"
+            >
+              <el-tag type="success" size="small">平台下发</el-tag>
+            </el-tooltip>
             <el-tag v-else-if="Number(row.is_custom) === 1" type="warning" size="small">
               自定义角色
             </el-tag>
@@ -75,7 +79,7 @@
               详情
             </el-button>
             <el-button
-              v-if="Number(row.tenant_id || 0) > 0"
+              v-if="!isPlatformRole(row)"
               size="small"
               type="primary"
               link
@@ -85,7 +89,7 @@
               编辑
             </el-button>
             <el-button
-              v-if="Number(row.is_custom) === 1"
+              v-if="!isPlatformRole(row) && Number(row.is_custom) === 1"
               size="small"
               type="danger"
               link
@@ -126,11 +130,16 @@ const roles = ref<any[]>([]);
 const loading = ref(false);
 const error = ref("");
 const typeFilter = ref<string | number>("all");
+// 平台下发角色 = 租户端只读。与后端 tenantRoleReadOnly 同口径：
+// is_locked 是平台下发的显式锁定位，tenant_id=0 的全局角色不属于任何租户，两者取并集。
+const isPlatformRole = (row: any): boolean =>
+  Number(row.is_locked || 0) === 1 || Number(row.tenant_id || 0) === 0;
 const displayRoles = computed(() => {
-  // global = 全局角色（所有租户共用，平台端维护）；custom = 本租户自建的自定义角色
+  // platform = 平台下发的只读角色；custom = 本租户自建的自定义角色
   if (typeFilter.value === "all") return roles.value;
-  if (typeFilter.value === "global") return roles.value.filter((r) => Number(r.tenant_id || 0) === 0);
-  if (typeFilter.value === "custom") return roles.value.filter((r) => Number(r.is_custom) === 1);
+  if (typeFilter.value === "platform") return roles.value.filter(isPlatformRole);
+  if (typeFilter.value === "custom")
+    return roles.value.filter((r) => !isPlatformRole(r) && Number(r.is_custom) === 1);
   return roles.value.filter((r) => Number(r.cid) === Number(typeFilter.value));
 });
 
diff --git a/go/controllers/app_activity.go b/go/controllers/app_activity.go
index d75e34a..3153e53 100644
--- a/go/controllers/app_activity.go
+++ b/go/controllers/app_activity.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"strings"
 
@@ -15,31 +16,18 @@ type AppActivityController struct {
 	beego.Controller
 }
 
+// 只放行移动端与租户端令牌：/api/** 仅被 uniapp 调用，平台令牌不该能打移动端接口。
 func (c *AppActivityController) activityClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" && claims.UserType != "platform" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndApp, identity.EndBackend)
 }
 
 // GetList GET /app/activity/list
 func (c *AppActivityController) GetList() {
 	claims, err := c.activityClaims()
 	if err != nil {
-		c.Ctx.Output.SetStatus(401)
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "未登录"}
+		code := identity.Status(err)
+		c.Ctx.Output.SetStatus(code)
+		c.Data["json"] = map[string]interface{}{"code": code, "msg": err.Error()}
 		_ = c.ServeJSON()
 		return
 	}
diff --git a/go/controllers/app_aggregate.go b/go/controllers/app_aggregate.go
index 4ca3ef5..2eb724c 100644
--- a/go/controllers/app_aggregate.go
+++ b/go/controllers/app_aggregate.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -73,22 +74,7 @@ func (c *AppAggregateController) fail(msg string) {
 
 // appClaims 校验 Bearer 令牌，允许 backend / app 两种身份
 func (c *AppAggregateController) appClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, errNotLogin
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, errAuthFormat
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, errTokenInvalid
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" {
-		return nil, errNoPermission
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndApp, identity.EndBackend)
 }
 
 // appModuleItem 模块卡片：在模块基础信息上标注当前租户是否已开通
diff --git a/go/controllers/app_approval.go b/go/controllers/app_approval.go
index eed5c12..63cafd4 100644
--- a/go/controllers/app_approval.go
+++ b/go/controllers/app_approval.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 	approvalEngine "server/services/approval"
@@ -71,7 +72,8 @@ func oaApprovalIDParam(c *AppOaController) uint64 {
 func oaApprovalClaims(c *AppOaController) (*jwtutil.Claims, bool) {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return nil, false
 	}
 	return claims, true
diff --git a/go/controllers/app_auth.go b/go/controllers/app_auth.go
index 712ed75..18520e1 100644
--- a/go/controllers/app_auth.go
+++ b/go/controllers/app_auth.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"server/models"
-	"server/pkg/jwtutil"
+	"server/pkg/identity"
 	"server/services"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -83,23 +83,10 @@ func (c *AppAuthController) LoginBackend() {
 
 // GetCurrentUser App端当前登录用户信息，需 Bearer Token
 func (c *AppAuthController) GetCurrentUser() {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "未登录"})
-		return
-	}
-	authParts := strings.SplitN(authHeader, " ", 2)
-	if len(authParts) != 2 || authParts[0] != "Bearer" {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "认证信息格式错误"})
-		return
-	}
-	claims, err := jwtutil.ParseToken(authParts[1])
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend, identity.EndApp)
 	if err != nil {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "无效的token"})
-		return
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" {
-		c.serveJSON(map[string]interface{}{"code": 403, "msg": "无权访问"})
+		code := identity.Status(err)
+		c.serveJSON(map[string]interface{}{"code": code, "msg": err.Error()})
 		return
 	}
 
diff --git a/go/controllers/app_contact.go b/go/controllers/app_contact.go
index 71b563f..437d6f2 100644
--- a/go/controllers/app_contact.go
+++ b/go/controllers/app_contact.go
@@ -7,6 +7,7 @@ import (
 	"server/models"
 
 	"github.com/beego/beego/v2/client/orm"
+	"server/pkg/identity"
 )
 
 // 移动端通讯录（企业内部通讯录）只读接口。
@@ -62,7 +63,8 @@ func appContactOrgNames(ids []uint64) map[uint64]string {
 func (c *AppOaController) ContactList() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -133,7 +135,8 @@ func (c *AppOaController) ContactList() {
 func (c *AppOaController) ContactOrgTree() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -172,7 +175,8 @@ func (c *AppOaController) ContactOrgTree() {
 func (c *AppOaController) ContactDetail() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/app_employee_file.go b/go/controllers/app_employee_file.go
index ce3b996..f122cc9 100644
--- a/go/controllers/app_employee_file.go
+++ b/go/controllers/app_employee_file.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -112,7 +113,7 @@ func canViewAllEmployeeFiles(claims *jwtutil.Claims) bool {
 		return true
 	}
 
-	allowed := parseRightsToSet(rights)
+	allowed := services.ParseMenuRights(rights)
 	if len(allowed) == 0 {
 		return true
 	}
@@ -134,7 +135,8 @@ func tenantUIDOf(claims *jwtutil.Claims) uint64 {
 func (c *AppOaController) EmployeeFileAccess() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 	c.oaOk(map[string]interface{}{"can_view_all": canViewAllEmployeeFiles(claims)})
@@ -145,7 +147,8 @@ func (c *AppOaController) EmployeeFileAccess() {
 func (c *AppOaController) EmployeeFileList() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 	if !canViewAllEmployeeFiles(claims) {
@@ -220,7 +223,8 @@ func (c *AppOaController) EmployeeFileList() {
 func (c *AppOaController) EmployeeFileDetail() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
diff --git a/go/controllers/app_erp.go b/go/controllers/app_erp.go
new file mode 100644
index 0000000..981abf9
--- /dev/null
+++ b/go/controllers/app_erp.go
@@ -0,0 +1,157 @@
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// AppErpBaseController 移动端进销存接口公共底座。
+//
+// 与 /backend/erp/** 的关系（接口隔离规范）：两端各有独立 handler 与路由，
+// 但单据校验、明细装配、库存/往来账联动与报表统计的口径只能有一份实现，
+// 全部在 erp_*_core.go 里；这里只负责「解移动端令牌 → 组装 erpActor → 调核心 → 输出响应」。
+//
+// 鉴权：/api/** 只被 uniapp 调用，放行 app 与 backend 两类令牌，平台令牌不允许打移动端接口。
+// 数据隔离：tenant_id 一律取自 JWT，前端无法指定租户。
+type AppErpBaseController struct {
+	beego.Controller
+}
+
+func (c *AppErpBaseController) erpClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndApp, identity.EndBackend)
+}
+
+// actor 组装核心逻辑需要的调用者身份
+func (c *AppErpBaseController) actor(cl *jwtutil.Claims) erpActor {
+	return erpNewActor(cl)
+}
+
+func (c *AppErpBaseController) erpOk(data interface{}) {
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+// erpListOK 分页出参形状与 Web 端保持一致：{list,total,page,pageSize,...extra}
+func (c *AppErpBaseController) erpListOK(list interface{}, total int64, page, pageSize int, extra map[string]interface{}) {
+	data := map[string]interface{}{"list": list, "total": total, "page": page, "pageSize": pageSize}
+	for k, v := range extra {
+		data[k] = v
+	}
+	c.erpOk(data)
+}
+
+func (c *AppErpBaseController) erpFail(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// erpDenied 鉴权失败统一出口（返回 true 表示已响应，调用方应 return）
+func (c *AppErpBaseController) erpDenied(err error) bool {
+	if err != nil {
+		code := identity.Status(err)
+		c.erpFail(code, code, err.Error())
+		return true
+	}
+	return false
+}
+
+func (c *AppErpBaseController) erpPathID() uint64 {
+	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	return id
+}
+
+// erpPage 分页参数：默认 20，上限 100（与 Web 端口径一致）
+func (c *AppErpBaseController) erpPage() (int, int) {
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 20)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 || pageSize > 100 {
+		pageSize = 20
+	}
+	return page, pageSize
+}
+
+// erpBody 解析 JSON 请求体；allowEmpty 为 true 时允许空 body（自动核销等场景）
+func (c *AppErpBaseController) erpBody(v interface{}, allowEmpty bool) bool {
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.erpFail(400, 400, "参数错误")
+		return false
+	}
+	if len(strings.TrimSpace(string(raw))) == 0 {
+		if allowEmpty {
+			return true
+		}
+		c.erpFail(400, 400, "请求体为空")
+		return false
+	}
+	if err := json.Unmarshal(raw, v); err != nil {
+		c.erpFail(400, 400, "参数错误: "+err.Error())
+		return false
+	}
+	return true
+}
+
+func (c *AppErpBaseController) erpQuery(name string) string {
+	return strings.TrimSpace(c.GetString(name))
+}
+
+func (c *AppErpBaseController) erpUint(name string) uint64 {
+	return erpUintParam(c.GetString(name))
+}
+
+func (c *AppErpBaseController) erpFlag(name string) bool {
+	return c.erpQuery(name) == "1"
+}
+
+// erpDateRange 报表/流水的日期区间：默认当月，date_to 含当天
+func (c *AppErpBaseController) erpDateRange(defMonths int) (time.Time, time.Time) {
+	from, to := erpMonthRange(defMonths)
+	if d := c.erpQuery("date_from"); d != "" {
+		if t, e := time.ParseInLocation("2006-01-02", d, time.Local); e == nil {
+			from = t
+		}
+	}
+	if d := c.erpQuery("date_to"); d != "" {
+		if t, e := time.ParseInLocation("2006-01-02", d, time.Local); e == nil {
+			to = t.AddDate(0, 0, 1)
+		}
+	}
+	return from, to
+}
+
+// ---- 经营看板 / 字典 ----
+
+// AppErpController 移动端进销存首页聚合与全局字典。
+type AppErpController struct {
+	AppErpBaseController
+}
+
+// Dashboard GET /api/erp/dashboard 经营看板（与 Web 端同一份统计口径）
+func (c *AppErpController) Dashboard() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	c.erpOk(erpDashboardCore(c.actor(cl)))
+}
+
+// Meta GET /api/erp/meta 单据类型、状态、收付款方式等下拉字典
+func (c *AppErpController) Meta() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	c.erpOk(erpDocMetaDict(c.actor(cl)))
+}
diff --git a/go/controllers/app_erp_archive.go b/go/controllers/app_erp_archive.go
new file mode 100644
index 0000000..3837cc5
--- /dev/null
+++ b/go/controllers/app_erp_archive.go
@@ -0,0 +1,115 @@
+package controllers
+
+// 移动端进销存档案接口：商品、分类、仓库、客商。
+//
+// 档案维护（新建/修改/删除）仍留在 Web 端，手机端只读——开单时需要选商品、
+// 选仓库、选客户/供应商，因此这里提供与 Web 端同一份过滤与补字段口径的列表/详情。
+
+// AppErpArchiveController 档案查询（移动端只读）
+type AppErpArchiveController struct {
+	AppErpBaseController
+}
+
+// ProductList GET /api/erp/product/list 商品列表（含分类名、全仓库存与预警状态）
+func (c *AppErpArchiveController) ProductList() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	page, pageSize := c.erpPage()
+	f := erpProductFilter{
+		Keyword:     c.erpQuery("keyword"),
+		CategoryID:  c.erpUint("category_id"),
+		Brand:       c.erpQuery("brand"),
+		Status:      c.erpQuery("status"),
+		IsDraft:     c.erpQuery("is_draft"),
+		OnlyEnabled: c.erpFlag("only_enabled"),
+	}
+	list, total, code, msg := erpProductListCore(c.actor(cl), f, page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, nil)
+}
+
+// ProductDetail GET /api/erp/product/detail/:id 商品详情（含分仓/分批次结存）
+func (c *AppErpArchiveController) ProductDetail() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	p, code, msg := erpProductDetailCore(c.actor(cl), c.erpPathID())
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(p)
+}
+
+// CategoryList GET /api/erp/product/category/list 商品分类（列表 + 树）
+func (c *AppErpArchiveController) CategoryList() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	rows, tree, code, msg := erpCategoryListCore(c.actor(cl))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"list": rows, "tree": tree})
+}
+
+// WarehouseList GET /api/erp/warehouse/list 仓库列表（含在库品种数与货值）
+func (c *AppErpArchiveController) WarehouseList() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	rows, code, msg := erpWarehouseListCore(c.actor(cl), c.erpQuery("keyword"), c.erpQuery("status"), c.erpFlag("only_enabled"))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"list": rows})
+}
+
+// PartnerList GET /api/erp/partner/list?partner_type=supplier|customer 客商列表
+// 供应商与客户统一出参（partner_type/partner_name/open_amount），手机端开单与对账只需对接一种结构。
+func (c *AppErpArchiveController) PartnerList() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	page, pageSize := c.erpPage()
+	partnerType := c.erpQuery("partner_type")
+	if partnerType != "supplier" {
+		partnerType = "customer"
+	}
+	list, total, code, msg := erpPartnerListCore(c.actor(cl), partnerType,
+		c.erpQuery("keyword"), c.erpFlag("only_enabled"), page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, nil)
+}
+
+// PartnerDetail GET /api/erp/partner/detail/:id?partner_type= 客商详情
+func (c *AppErpArchiveController) PartnerDetail() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	partnerType := c.erpQuery("partner_type")
+	if partnerType != "supplier" {
+		partnerType = "customer"
+	}
+	data, code, msg := erpPartnerDetailCore(c.actor(cl), partnerType, c.erpPathID())
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
diff --git a/go/controllers/app_erp_document.go b/go/controllers/app_erp_document.go
new file mode 100644
index 0000000..d107a35
--- /dev/null
+++ b/go/controllers/app_erp_document.go
@@ -0,0 +1,183 @@
+package controllers
+
+// 移动端进销存单据接口（采购/销售/库存十类单据共用一套路由）。
+//
+// 与 /backend/erp/document* 的关系：handler 与路由各自独立（接口隔离规范），
+// 单据校验、明细装配、落库事务、审批提交与生效联动全部复用 erp_document_core.go，
+// 因此手机端开的一张单和 Web 端开的完全等价——同一行记录、同一套库存流水。
+
+// AppErpDocumentController 单据中心（移动端）
+type AppErpDocumentController struct {
+	AppErpBaseController
+}
+
+// List GET /api/erp/document/list
+func (c *AppErpDocumentController) List() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	page, pageSize := c.erpPage()
+	f := erpDocFilter{
+		DocType:     c.erpQuery("doc_type"),
+		DocTypes:    c.erpQuery("doc_types"),
+		Status:      c.erpQuery("status"),
+		Keyword:     c.erpQuery("keyword"),
+		PartnerID:   c.erpUint("partner_id"),
+		WarehouseID: c.erpUint("warehouse_id"),
+		SourceDocID: c.erpUint("source_doc_id"),
+		DateFrom:    c.erpQuery("date_from"),
+		DateTo:      c.erpQuery("date_to"),
+	}
+	list, total, code, msg := erpDocListCore(c.actor(cl), f, page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, nil)
+}
+
+// Detail GET /api/erp/document/detail/:id
+func (c *AppErpDocumentController) Detail() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	id := c.erpPathID()
+	doc, code, msg := erpDocDetailCore(c.actor(cl), id)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(doc)
+}
+
+// Save POST /api/erp/document/save 新建或覆盖保存草稿（body 带 id 即为编辑）
+func (c *AppErpDocumentController) Save() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	var p erpDocPayload
+	if !c.erpBody(&p, false) {
+		return
+	}
+	id, docNo, code, msg := erpDocSaveCore(c.actor(cl), p)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"id": id, "doc_no": docNo})
+}
+
+// Delete DELETE /api/erp/document/delete/:id 仅草稿/驳回可删除（软删）
+func (c *AppErpDocumentController) Delete() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	id := c.erpPathID()
+	code, msg := erpDocDeleteCore(c.actor(cl), id)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(nil)
+}
+
+// Cancel POST /api/erp/document/cancel/:id 作废单据
+func (c *AppErpDocumentController) Cancel() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	id := c.erpPathID()
+	code, msg := erpDocCancelCore(c.actor(cl), id)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(nil)
+}
+
+// Approve POST /api/erp/document/approve/:id 直接审核生效（未走审批流时使用）
+func (c *AppErpDocumentController) Approve() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	id := c.erpPathID()
+	code, msg := erpDocApproveCore(c.actor(cl), id)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(nil)
+}
+
+// Submit POST /api/erp/document/submit/:id?flow_id= 提交审批流
+func (c *AppErpDocumentController) Submit() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	id := c.erpPathID()
+	instID, code, msg := erpDocSubmitCore(c.actor(cl), id, c.erpUint("flow_id"))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"instance_id": instID})
+}
+
+// Flows GET /api/erp/document/flows?doc_type= 该单据类型可用的审批流
+func (c *AppErpDocumentController) Flows() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	bizType, flows, code, msg := erpDocFlowsCore(c.actor(cl), c.erpQuery("doc_type"))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"list": flows, "biz_type": bizType})
+}
+
+// Executable GET /api/erp/document/executable/:id 来源订单中尚可执行的明细行
+func (c *AppErpDocumentController) Executable() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	id := c.erpPathID()
+	data, code, msg := erpDocExecutableCore(c.actor(cl), id)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
+
+// TakeSheet GET /api/erp/document/takeSheet?warehouse_id= 盘点表初始化
+func (c *AppErpDocumentController) TakeSheet() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	list, code, msg := erpTakeSheetCore(c.actor(cl), c.erpUint("warehouse_id"))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"list": list})
+}
+
+// Meta GET /api/erp/document/meta 开单页字典（单据类型/状态/默认仓库/价格口径）
+func (c *AppErpDocumentController) Meta() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	c.erpOk(erpDocMetaDict(c.actor(cl)))
+}
diff --git a/go/controllers/app_erp_finance.go b/go/controllers/app_erp_finance.go
new file mode 100644
index 0000000..05054eb
--- /dev/null
+++ b/go/controllers/app_erp_finance.go
@@ -0,0 +1,230 @@
+package controllers
+
+import (
+	"time"
+
+	erp "server/services/erp"
+)
+
+// 移动端往来账与收付款接口。
+//
+// 往来账由单据生效时自动生成，手机端同样不开放手工新增/修改；
+// 收付款单可以手工开草稿并确认核销，逻辑全部复用 erp_finance_core.go。
+
+// AppErpFinanceController 往来账 / 收付款（移动端）
+type AppErpFinanceController struct {
+	AppErpBaseController
+}
+
+// BillList GET /api/erp/finance/bill/list 往来账（应收/应付）
+func (c *AppErpFinanceController) BillList() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	page, pageSize := c.erpPage()
+	f := erpBillFilter{
+		BillType:    c.erpQuery("bill_type"),
+		PartnerID:   c.erpUint("partner_id"),
+		PartnerType: c.erpQuery("partner_type"),
+		SourceDocID: c.erpUint("source_doc_id"),
+		SettleState: c.erpQuery("settle_state"),
+		Keyword:     c.erpQuery("keyword"),
+		DateFrom:    c.erpQuery("date_from"),
+		DateTo:      c.erpQuery("date_to"),
+	}
+	list, total, summary, code, msg := erpBillListCore(c.actor(cl), f, page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, map[string]interface{}{"summary": summary})
+}
+
+// BillDetail GET /api/erp/finance/bill/detail/:id 往来账详情（含核销记录与原单据）
+func (c *AppErpFinanceController) BillDetail() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	data, code, msg := erpBillDetailCore(c.actor(cl), c.erpPathID())
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
+
+// Aging GET /api/erp/finance/aging 账龄分析（按未结余额分桶）
+func (c *AppErpFinanceController) Aging() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	data, code, msg := erpAgingCore(c.actor(cl))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
+
+// FundList GET /api/erp/finance/fund/list 收付款单列表
+func (c *AppErpFinanceController) FundList() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	page, pageSize := c.erpPage()
+	f := erpFundFilter{
+		FundType:  c.erpQuery("fund_type"),
+		Status:    c.erpQuery("status"),
+		PartnerID: c.erpUint("partner_id"),
+		Keyword:   c.erpQuery("keyword"),
+		DateFrom:  c.erpQuery("date_from"),
+		DateTo:    c.erpQuery("date_to"),
+	}
+	list, total, code, msg := erpFundListCore(c.actor(cl), f, page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, nil)
+}
+
+// FundDetail GET /api/erp/finance/fund/detail/:id 收付款单详情（含核销明细与原往来账）
+func (c *AppErpFinanceController) FundDetail() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	data, code, msg := erpFundDetailCore(c.actor(cl), c.erpPathID())
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
+
+// FundSave POST /api/erp/finance/fund/save 新建/修改收付款草稿
+func (c *AppErpFinanceController) FundSave() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	var p erpFundPayload
+	if !c.erpBody(&p, false) {
+		return
+	}
+	id, fundNo, code, msg := erpFundSaveCore(c.actor(cl), p)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"id": id, "fund_no": fundNo})
+}
+
+// FundConfirm POST /api/erp/finance/fund/confirm/:id
+// 确认收付款并核销；body 可选 settles=[{partner_bill_id,amount}]，不传则按到期日自动 FIFO。
+func (c *AppErpFinanceController) FundConfirm() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	var body struct {
+		Settles []erp.SettleItem `json:"settles"`
+	}
+	if !c.erpBody(&body, true) {
+		return
+	}
+	code, msg := erpFundConfirmCore(c.actor(cl), c.erpPathID(), body.Settles)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(nil)
+}
+
+// FundVoid POST /api/erp/finance/fund/void/:id 作废收付款单（回滚核销）
+func (c *AppErpFinanceController) FundVoid() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	code, msg := erpFundVoidCore(c.actor(cl), c.erpPathID())
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(nil)
+}
+
+// FundDelete DELETE /api/erp/finance/fund/delete/:id 仅草稿可删
+func (c *AppErpFinanceController) FundDelete() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	code, msg := erpFundDeleteCore(c.actor(cl), c.erpPathID())
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(nil)
+}
+
+// FundOpenBills GET /api/erp/finance/fund/openBills?fund_type=&partner_id=
+// 收款/付款时列出可核销的往来账，手机端据此勾选。
+func (c *AppErpFinanceController) FundOpenBills() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	ft, _ := erpInt8Query(c.erpQuery("fund_type"))
+	list, code, msg := erpFundOpenBillsCore(c.actor(cl), ft, c.erpUint("partner_id"))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"list": list})
+}
+
+// CashFlow GET /api/erp/finance/cashflow 资金流水（只统计实际收付）
+func (c *AppErpFinanceController) CashFlow() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	// 与 Web 端一致：默认统计近 30 天
+	from, to := time.Now().AddDate(0, 0, -30), time.Now()
+	if d := c.erpQuery("date_from"); d != "" {
+		if t, e := time.ParseInLocation("2006-01-02", d, time.Local); e == nil {
+			from = t
+		}
+	}
+	if d := c.erpQuery("date_to"); d != "" {
+		if t, e := time.ParseInLocation("2006-01-02", d, time.Local); e == nil {
+			to = t
+		}
+	}
+	data, code, msg := erpCashFlowCore(c.actor(cl), from, to)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
+
+// PartnerSummary GET /api/erp/finance/partner 往来单位对账汇总
+func (c *AppErpFinanceController) PartnerSummary() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	data, code, msg := erpPartnerSummaryCore(c.actor(cl), c.erpQuery("partner_type"))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
diff --git a/go/controllers/app_erp_report.go b/go/controllers/app_erp_report.go
new file mode 100644
index 0000000..23a9455
--- /dev/null
+++ b/go/controllers/app_erp_report.go
@@ -0,0 +1,89 @@
+package controllers
+
+import (
+	"server/models"
+)
+
+// 移动端进销存报表接口：购销汇总、热销排行、收发存、毛利。
+//
+// 统计口径全部来自「已生效」单据与库存流水，与 Web 端报表共用 erp_report_core.go，
+// 因此手机端看到的金额一定能和后台对得上；经营看板见 /api/erp/dashboard。
+
+// AppErpReportController 报表（移动端）
+type AppErpReportController struct {
+	AppErpBaseController
+}
+
+// PurchaseSummary GET /api/erp/report/purchase?dimension=product|supplier|month 采购汇总
+func (c *AppErpReportController) PurchaseSummary() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	from, to := c.erpDateRange(0)
+	group := erpReportDimension(c.erpQuery("dimension"))
+	items, docPartner, returnItems := erpSummaryDocs(c.actor(cl).Tid,
+		models.ErpDocPurchaseIn, models.ErpDocPurchaseReturn, from, to, c.erpUint("partner_id"))
+	c.erpOk(erpSummaryReportData(group, items, docPartner, returnItems))
+}
+
+// SalesSummary GET /api/erp/report/sales?dimension=product|customer|month 销售汇总
+func (c *AppErpReportController) SalesSummary() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	from, to := c.erpDateRange(0)
+	group := erpReportDimension(c.erpQuery("dimension"))
+	items, docPartner, returnItems := erpSummaryDocs(c.actor(cl).Tid,
+		models.ErpDocSalesOut, models.ErpDocSalesReturn, from, to, c.erpUint("partner_id"))
+	c.erpOk(erpSummaryReportData(group, items, docPartner, returnItems))
+}
+
+// Rank GET /api/erp/report/rank?order=desc|asc&top=10 热销/滞销排行
+func (c *AppErpReportController) Rank() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	from, to := c.erpDateRange(0)
+	top, _ := c.GetInt("top", 10)
+	data, code, msg := erpSalesRankCore(c.actor(cl), from, to, top, c.erpQuery("order") == "asc")
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
+
+// StockMove GET /api/erp/report/stockmove 收发存汇总表
+func (c *AppErpReportController) StockMove() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	from, to := c.erpDateRange(0)
+	page, pageSize := c.erpPage()
+	list, total, summary, code, msg := erpStockMoveCore(
+		c.actor(cl), from, to, c.erpUint("warehouse_id"), c.erpQuery("keyword"), page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, map[string]interface{}{"summary": summary})
+}
+
+// Profit GET /api/erp/report/profit 毛利分析
+func (c *AppErpReportController) Profit() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	from, to := c.erpDateRange(0)
+	data, code, msg := erpProfitCore(c.actor(cl), from, to)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
diff --git a/go/controllers/app_erp_stock.go b/go/controllers/app_erp_stock.go
new file mode 100644
index 0000000..31733fd
--- /dev/null
+++ b/go/controllers/app_erp_stock.go
@@ -0,0 +1,110 @@
+package controllers
+
+// 移动端进销存库存接口：结存查询、流水追溯、预警、补货建议、批次效期。
+//
+// 与 /backend/erp/stock* 共用 erp_stock_core.go：结存只能由流水驱动，
+// 因此这里全部是只读接口，手机端同样没有任何直接改库存的入口。
+
+// AppErpStockController 库存查询（移动端）
+type AppErpStockController struct {
+	AppErpBaseController
+}
+
+// List GET /api/erp/stock/list 库存结存（group_by=product 时按商品聚合）
+func (c *AppErpStockController) List() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	page, pageSize := c.erpPage()
+	f := erpStockFilter{
+		WarehouseID:    c.erpUint("warehouse_id"),
+		ProductID:      c.erpUint("product_id"),
+		BatchNo:        c.erpQuery("batch_no"),
+		OnlyStock:      c.erpFlag("only_stock"),
+		GroupByProduct: c.erpQuery("group_by") == "product",
+		Keyword:        c.erpQuery("keyword"),
+		CategoryID:     c.erpUint("category_id"),
+		SafetyState:    c.erpQuery("safety_state"),
+	}
+	list, total, sumAmount, code, msg := erpStockListCore(c.actor(cl), f, page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, map[string]interface{}{"sum_amount": sumAmount})
+}
+
+// Ledger GET /api/erp/stock/ledger 库存流水（收发存明细追溯）
+func (c *AppErpStockController) Ledger() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	page, pageSize := c.erpPage()
+	f := erpLedgerFilter{
+		ProductID:   c.erpUint("product_id"),
+		WarehouseID: c.erpUint("warehouse_id"),
+		DocType:     c.erpQuery("doc_type"),
+		BatchNo:     c.erpQuery("batch_no"),
+		DocNo:       c.erpQuery("doc_no"),
+		DateFrom:    c.erpQuery("date_from"),
+		DateTo:      c.erpQuery("date_to"),
+	}
+	list, total, code, msg := erpLedgerCore(c.actor(cl), f, page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, nil)
+}
+
+// Warning GET /api/erp/stock/warning 库存预警：低于安全库存 / 超储 / 缺货 / 效期临近
+func (c *AppErpStockController) Warning() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	data, code, msg := erpWarningCore(c.actor(cl))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(data)
+}
+
+// Replenish GET /api/erp/stock/replenish 智能补货建议
+func (c *AppErpStockController) Replenish() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	list, code, msg := erpReplenishCore(c.actor(cl))
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpOk(map[string]interface{}{"list": list, "total": len(list)})
+}
+
+// Batch GET /api/erp/stock/batch 批次与效期台账
+func (c *AppErpStockController) Batch() {
+	cl, err := c.erpClaims()
+	if c.erpDenied(err) {
+		return
+	}
+	page, pageSize := c.erpPage()
+	f := erpBatchFilter{
+		WarehouseID:  c.erpUint("warehouse_id"),
+		ProductID:    c.erpUint("product_id"),
+		OnlyPositive: c.erpFlag("only_positive"),
+		Keyword:      c.erpQuery("keyword"),
+		ExpireState:  c.erpQuery("expire_state"),
+	}
+	list, total, code, msg := erpBatchCore(c.actor(cl), f, page, pageSize)
+	if msg != "" {
+		c.erpFail(code, code, msg)
+		return
+	}
+	c.erpListOK(list, total, page, pageSize, nil)
+}
diff --git a/go/controllers/app_notebook.go b/go/controllers/app_notebook.go
index 8246223..47df563 100644
--- a/go/controllers/app_notebook.go
+++ b/go/controllers/app_notebook.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"server/middleware"
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"strconv"
 	"strings"
@@ -18,23 +19,9 @@ type AppNotebookController struct {
 	beego.Controller
 }
 
+// 只放行移动端与租户端令牌：/api/** 仅被 uniapp 调用，平台令牌不该能打移动端接口。
 func (c *AppNotebookController) appNotebookClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" && claims.UserType != "platform" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndApp, identity.EndBackend)
 }
 
 func (c *AppNotebookController) nbJsonErr(httpStatus, bizCode int, msg string) {
@@ -52,7 +39,7 @@ func (c *AppNotebookController) nbOk(data interface{}) {
 func (c *AppNotebookController) GetList() {
 	claims, err := c.appNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		c.nbJsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -112,7 +99,7 @@ func (c *AppNotebookController) GetList() {
 func (c *AppNotebookController) GetDetail() {
 	claims, err := c.appNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		c.nbJsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -153,7 +140,7 @@ func (c *AppNotebookController) GetDetail() {
 func (c *AppNotebookController) Create() {
 	claims, err := c.appNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		c.nbJsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -212,7 +199,7 @@ func (c *AppNotebookController) Create() {
 func (c *AppNotebookController) Update() {
 	claims, err := c.appNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		c.nbJsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -289,7 +276,7 @@ func (c *AppNotebookController) Update() {
 func (c *AppNotebookController) Delete() {
 	claims, err := c.appNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		c.nbJsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -330,7 +317,7 @@ func (c *AppNotebookController) Delete() {
 func (c *AppNotebookController) TogglePin() {
 	claims, err := c.appNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		c.nbJsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
diff --git a/go/controllers/app_oa.go b/go/controllers/app_oa.go
index d44ad8a..075a252 100644
--- a/go/controllers/app_oa.go
+++ b/go/controllers/app_oa.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -26,23 +27,9 @@ type AppOaController struct {
 	beego.Controller
 }
 
+// 只放行移动端与租户端令牌：/api/** 仅被 uniapp 调用，平台令牌不该能打移动端接口。
 func (c *AppOaController) oaClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" && claims.UserType != "platform" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndApp, identity.EndBackend)
 }
 
 func (c *AppOaController) oaErr(httpStatus, bizCode int, msg string) {
@@ -115,7 +102,7 @@ func oaTextSummary(content string, limit int) string {
 func (c *AppOaController) NoticeList() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -158,7 +145,7 @@ func (c *AppOaController) NoticeList() {
 func (c *AppOaController) NoticeDetail() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -227,7 +214,7 @@ func docItem(d models.OaDoc) map[string]interface{} {
 func (c *AppOaController) DocCategories() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 	tree, err := services.OaDocCategoryTree(c.oaDocActor(claims), strings.TrimSpace(c.GetString("scope")))
@@ -242,7 +229,7 @@ func (c *AppOaController) DocCategories() {
 func (c *AppOaController) DocList() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -290,7 +277,7 @@ func (c *AppOaController) DocList() {
 func (c *AppOaController) DocDetail() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -313,7 +300,7 @@ func (c *AppOaController) DocDetail() {
 func (c *AppOaController) DocDownload() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -339,7 +326,7 @@ func (c *AppOaController) DocDownload() {
 func (c *AppOaController) DocStar() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -361,7 +348,7 @@ func (c *AppOaController) DocStar() {
 func (c *AppOaController) PayrollList() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -408,7 +395,7 @@ func (c *AppOaController) PayrollList() {
 func (c *AppOaController) PayrollDetail() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -451,7 +438,7 @@ func (c *AppOaController) PayrollDetail() {
 func (c *AppOaController) MyEmployeeFile() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -499,7 +486,7 @@ func (c *AppOaController) MyEmployeeFile() {
 func (c *AppOaController) Dashboard() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		c.oaErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 	uid := uint64(claims.UserID)
diff --git a/go/controllers/app_oa_expense.go b/go/controllers/app_oa_expense.go
index 161ae85..10b2a23 100644
--- a/go/controllers/app_oa_expense.go
+++ b/go/controllers/app_oa_expense.go
@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"strings"
 
+	"server/pkg/identity"
 	"server/services"
 )
 
@@ -44,7 +45,8 @@ func (c *AppOaController) expenseReadItemPayload() (reimbursementItemPayload, bo
 func (c *AppOaController) ExpenseList() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -66,7 +68,8 @@ func (c *AppOaController) ExpenseList() {
 func (c *AppOaController) ExpenseDetail() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -88,7 +91,8 @@ func (c *AppOaController) ExpenseDetail() {
 func (c *AppOaController) ExpenseCreate() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -109,7 +113,8 @@ func (c *AppOaController) ExpenseCreate() {
 func (c *AppOaController) ExpenseUpdate() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -136,7 +141,8 @@ func (c *AppOaController) ExpenseUpdate() {
 func (c *AppOaController) ExpenseDelete() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -158,7 +164,8 @@ func (c *AppOaController) ExpenseDelete() {
 func (c *AppOaController) ExpenseAddItem() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -186,7 +193,8 @@ func (c *AppOaController) ExpenseAddItem() {
 func (c *AppOaController) ExpenseUpdateItem() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -215,7 +223,8 @@ func (c *AppOaController) ExpenseUpdateItem() {
 func (c *AppOaController) ExpenseDeleteItem() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -238,7 +247,8 @@ func (c *AppOaController) ExpenseDeleteItem() {
 func (c *AppOaController) ExpenseSubmit() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -261,7 +271,8 @@ func (c *AppOaController) ExpenseSubmit() {
 func (c *AppOaController) ExpenseStatus() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -290,7 +301,8 @@ func (c *AppOaController) ExpenseStatus() {
 func (c *AppOaController) ExpenseRecords() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -328,7 +340,8 @@ func (c *AppOaController) expenseReadActPayload() string {
 func (c *AppOaController) ExpenseApprove() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -350,7 +363,8 @@ func (c *AppOaController) ExpenseApprove() {
 func (c *AppOaController) ExpenseReject() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -374,7 +388,8 @@ func (c *AppOaController) ExpenseReject() {
 func (c *AppOaController) ExpenseMyApproveTask() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -403,7 +418,8 @@ func (c *AppOaController) ExpenseMyApproveTask() {
 func (c *AppOaController) ExpenseTypes() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/app_oa_schedule.go b/go/controllers/app_oa_schedule.go
index ac3d854..5a5c5bd 100644
--- a/go/controllers/app_oa_schedule.go
+++ b/go/controllers/app_oa_schedule.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/services"
 )
 
@@ -49,7 +50,8 @@ func (c *AppOaController) oaScheduleReadPayload() (oaSchedulePayload, bool) {
 func (c *AppOaController) ScheduleList() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -76,7 +78,8 @@ func (c *AppOaController) ScheduleList() {
 func (c *AppOaController) ScheduleDetail() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -109,7 +112,8 @@ func (c *AppOaController) ScheduleDetail() {
 func (c *AppOaController) ScheduleCreate() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -130,7 +134,8 @@ func (c *AppOaController) ScheduleCreate() {
 func (c *AppOaController) ScheduleUpdate() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -157,7 +162,8 @@ func (c *AppOaController) ScheduleUpdate() {
 func (c *AppOaController) ScheduleDelete() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -180,7 +186,8 @@ func (c *AppOaController) ScheduleDelete() {
 func (c *AppOaController) ScheduleFinish() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -207,7 +214,8 @@ const oaUploadMaxBytes = 10 << 20
 func (c *AppOaController) uploadTenantImage() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
@@ -299,7 +307,8 @@ func (c *AppOaController) ScheduleUploadImage() {
 func (c *AppOaController) ScheduleImages() {
 	claims, err := c.oaClaims()
 	if err != nil {
-		c.oaErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oaErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/app_reminder.go b/go/controllers/app_reminder.go
index 51ce8a4..f3abff0 100644
--- a/go/controllers/app_reminder.go
+++ b/go/controllers/app_reminder.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -21,23 +22,9 @@ type AppReminderController struct {
 	beego.Controller
 }
 
+// 只放行移动端与租户端令牌：/api/** 仅被 uniapp 调用，平台令牌不该能打移动端接口。
 func (c *AppReminderController) appClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" && claims.UserType != "platform" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndApp, identity.EndBackend)
 }
 
 func (c *AppReminderController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -72,7 +59,7 @@ type appSchedulePayload struct {
 func (c *AppReminderController) GetList() {
 	claims, err := c.appClaims()
 	if err != nil {
-		c.jsonErr(401, 401, "未登录或无权限")
+		c.jsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -173,7 +160,7 @@ func (c *AppReminderController) GetList() {
 func (c *AppReminderController) GetDetail() {
 	claims, err := c.appClaims()
 	if err != nil {
-		c.jsonErr(401, 401, "未登录或无权限")
+		c.jsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -246,7 +233,7 @@ func (c *AppReminderController) GetDetail() {
 func (c *AppReminderController) Create() {
 	claims, err := c.appClaims()
 	if err != nil {
-		c.jsonErr(401, 401, "未登录或无权限")
+		c.jsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -348,7 +335,7 @@ func (c *AppReminderController) Create() {
 func (c *AppReminderController) Update() {
 	claims, err := c.appClaims()
 	if err != nil {
-		c.jsonErr(401, 401, "未登录或无权限")
+		c.jsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -484,7 +471,7 @@ func (c *AppReminderController) Update() {
 func (c *AppReminderController) Delete() {
 	claims, err := c.appClaims()
 	if err != nil {
-		c.jsonErr(401, 401, "未登录或无权限")
+		c.jsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
@@ -545,7 +532,7 @@ func (c *AppReminderController) Delete() {
 func (c *AppReminderController) ToggleComplete() {
 	claims, err := c.appClaims()
 	if err != nil {
-		c.jsonErr(401, 401, "未登录或无权限")
+		c.jsonErr(identity.Status(err), identity.Status(err), err.Error())
 		return
 	}
 
diff --git a/go/controllers/auth/oidc.go b/go/controllers/auth/oidc.go
index 1124a6a..a52d2f1 100644
--- a/go/controllers/auth/oidc.go
+++ b/go/controllers/auth/oidc.go
@@ -550,7 +550,9 @@ func exchangeCode(code, verifier, clientID string) (*authsvc.TokenPair, *jwtutil
 		Tid:        stored.Tid,
 		ClientID:   clientID,
 		Sid:        session.Sid,
-		UserType:   "tenant",
+		// 不指定 UserType：由 IssueTokens 按应用编码给出 backend / app。
+		// 这里曾硬编码 "tenant"，而业务接口只认 backend/app，导致换码签出的首张令牌
+		// 被 /backend/modules/getTenantList 等判为「无权访问」（续期路径本来就不传，故会自愈）。
 		Amr:        authsvc.AmrPwd,
 		AccessTTL:  accessTTL,
 		RefreshTTL: refreshTTL,
diff --git a/go/controllers/backend_admin_user.go b/go/controllers/backend_admin_user.go
index 03ae56d..616f9cc 100644
--- a/go/controllers/backend_admin_user.go
+++ b/go/controllers/backend_admin_user.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"server/models"
-	"server/pkg/jwtutil"
+	"server/pkg/identity"
 	"server/pkg/passwordutil"
 	"server/services"
 	authsvc "server/services/auth"
@@ -133,47 +133,26 @@ func toBackendUserInfoDTO(u models.SystemTenantUser) backendUserInfoDTO {
 	}
 }
 
-// getJWTUidTid 取当前登录者标识：
-//   - uid：令牌里的 user_id，即认证中心 identity_id
-//   - tid：令牌里的 tenant_id
+// requireBackendIdentity 解析并校验 backend 端登录态；失败时已写好响应，调用方必须立即 return。
 //
-// 键名历史上有两套写法（uid/tid 与 userId/tenantId），这里都兼容；
-// 中间件在 warn/off 模式下可能没有注入，故再兜底自行解析 Authorization 头，
-// 否则会静默拿到 0（曾导致按 identity_id 直查老表、显示到别人的资料）。
-func (c *BackendAdminUserController) getJWTUidTid() (uint64, uint64) {
-	var uid uint64
-	var tid uint64
-
-	data := c.Ctx.Input.Data()
-
-	for _, key := range []string{"uid", "userId"} {
-		if v, ok := data[key].(uint64); ok && v > 0 {
-			uid = v
-			break
-		}
+// 取代原 getJWTUidTid：那版从中间件注入的 ctx data 里取 uid/tid，
+// 既不判端、取不到时又静默返回 0，而 0 会让「按企业过滤」退化成全局查询——
+// 平台或小程序的令牌即可枚举、编辑别家企业的用户。
+// 现在 uid/tid 只来自令牌，且必须是 backend 端且已绑定企业。
+func (c *BackendAdminUserController) requireBackendIdentity() (uint64, uint64, bool) {
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+	if err != nil {
+		code := identity.Status(err)
+		c.Data["json"] = map[string]interface{}{"code": code, "msg": err.Error()}
+		_ = c.ServeJSON()
+		return 0, 0, false
 	}
-	for _, key := range []string{"tid", "tenantId"} {
-		if v, ok := data[key].(uint64); ok && v > 0 {
-			tid = v
-			break
-		}
+	if claims.TenantId <= 0 {
+		c.Data["json"] = map[string]interface{}{"code": 403, "msg": "登录态未绑定企业"}
+		_ = c.ServeJSON()
+		return 0, 0, false
 	}
-
-	if uid == 0 || tid == 0 {
-		auth := c.Ctx.Request.Header.Get("Authorization")
-		if parts := strings.SplitN(auth, " ", 2); len(parts) == 2 && parts[0] == "Bearer" {
-			if claims, err := jwtutil.ParseToken(parts[1]); err == nil {
-				if uid == 0 {
-					uid = uint64(claims.UserID)
-				}
-				if tid == 0 {
-					tid = uint64(claims.TenantId)
-				}
-			}
-		}
-	}
-
-	return uid, tid
+	return uint64(claims.UserID), uint64(claims.TenantId), true
 }
 
 func (c *BackendAdminUserController) parseTenantUserPayload() (backendTenantUserPayload, bool) {
@@ -246,20 +225,21 @@ func findBackendTenantUser(idOrUid uint64, jwtTid uint64, byID bool) (*models.Sy
 // GetAllUsers 获取当前租户后台用户列表
 // GET /backend/getAllUsers
 func (c *BackendAdminUserController) GetAllUsers() {
-	_, jwtTid := c.getJWTUidTid()
+	_, jwtTid, ok := c.requireBackendIdentity()
+	if !ok {
+		return
+	}
 
 	keyword := strings.TrimSpace(c.GetString("keyword"))
-	tid, _ := c.GetUint64("tid")
-
-	if jwtTid > 0 {
-		tid = jwtTid
+	// 用户列表只按登录态隔离：?tid= 不再生效（此前不传 tid 会直接返回全部企业的用户）
+	tid := jwtTid
+	if tid == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 403, "msg": "登录态未绑定企业"}
+		_ = c.ServeJSON()
+		return
 	}
 
-	cond := orm.NewCondition().And("delete_time__isnull", true)
-
-	if tid > 0 {
-		cond = cond.And("tid", tid)
-	}
+	cond := orm.NewCondition().And("delete_time__isnull", true).And("tid", tid)
 
 	if keyword != "" {
 		kwCond := orm.NewCondition().
@@ -303,7 +283,10 @@ func (c *BackendAdminUserController) GetTenantUsers() {
 	tidStr := c.Ctx.Input.Param(":tid")
 	tid, _ := strconv.ParseUint(tidStr, 10, 64)
 
-	_, jwtTid := c.getJWTUidTid()
+	_, jwtTid, ok := c.requireBackendIdentity()
+	if !ok {
+		return
+	}
 	if jwtTid > 0 {
 		tid = jwtTid
 	}
@@ -348,7 +331,10 @@ func (c *BackendAdminUserController) GetTenantUsers() {
 // by=id：前端明确传主键（用户管理页），只按主键查询；
 // 缺省时兼容 identity_id / 老 uid（个人中心等场景）。
 func (c *BackendAdminUserController) GetUserInfo() {
-	jwtUid, jwtTid := c.getJWTUidTid()
+	jwtUid, jwtTid, ok := c.requireBackendIdentity()
+	if !ok {
+		return
+	}
 
 	idStr := c.Ctx.Input.Param(":id")
 	id, _ := strconv.ParseUint(idStr, 10, 64)
@@ -388,7 +374,10 @@ func (c *BackendAdminUserController) AddUser() {
 		return
 	}
 
-	_, jwtTid := c.getJWTUidTid()
+	_, jwtTid, ok := c.requireBackendIdentity()
+	if !ok {
+		return
+	}
 	if jwtTid > 0 {
 		p.Tid = jwtTid
 	}
@@ -423,22 +412,22 @@ func (c *BackendAdminUserController) AddUser() {
 			_ = c.ServeJSON()
 			return
 		}
-		identity, err := authsvc.GetIdentityByID(p.IdentityID)
-		if err != nil || identity == nil {
+		ident, err := authsvc.GetIdentityByID(p.IdentityID)
+		if err != nil || ident == nil {
 			c.Data["json"] = map[string]interface{}{"code": 404, "msg": "认证身份不存在"}
 			_ = c.ServeJSON()
 			return
 		}
-		if !authsvc.VerifyIdentityPassword(identity, strings.TrimSpace(p.VerifyPassword)) {
+		if !authsvc.VerifyIdentityPassword(ident, strings.TrimSpace(p.VerifyPassword)) {
 			c.Data["json"] = map[string]interface{}{"code": 401, "msg": "密码不正确，无法确认是同一账号"}
 			_ = c.ServeJSON()
 			return
 		}
 		// uid 统一为 identity_id，与已全量迁移的业务表口径一致
-		p.Uid = identity.ID
+		p.Uid = ident.ID
 		// 老表镜像身份层现有密码哈希（登录仍以认证中心为准）
-		if identity.PasswordHash != nil && *identity.PasswordHash != "" {
-			h := *identity.PasswordHash
+		if ident.PasswordHash != nil && *ident.PasswordHash != "" {
+			h := *ident.PasswordHash
 			p.Password = &h
 		} else {
 			// 身份层无密码（历史数据），仅镜像到老表，不影响统一认证
@@ -594,7 +583,10 @@ func (c *BackendAdminUserController) EditUser() {
 		return
 	}
 
-	_, jwtTid := c.getJWTUidTid()
+	_, jwtTid, ok := c.requireBackendIdentity()
+	if !ok {
+		return
+	}
 
 	row, err := findBackendTenantUser(id, jwtTid, c.GetString("by") == "id")
 	if err != nil || row == nil {
@@ -719,7 +711,10 @@ func (c *BackendAdminUserController) DeleteUser() {
 		return
 	}
 
-	_, jwtTid := c.getJWTUidTid()
+	_, jwtTid, ok := c.requireBackendIdentity()
+	if !ok {
+		return
+	}
 
 	row, err := findBackendTenantUser(id, jwtTid, c.GetString("by") == "id")
 	if err != nil || row == nil {
@@ -765,7 +760,10 @@ func (c *BackendAdminUserController) ChangePassword() {
 		return
 	}
 
-	_, jwtTid := c.getJWTUidTid()
+	_, jwtTid, ok := c.requireBackendIdentity()
+	if !ok {
+		return
+	}
 
 	row, err := findBackendTenantUser(p.ID, jwtTid, p.By == "id")
 	if err != nil || row == nil {
diff --git a/go/controllers/backend_ai_chat.go b/go/controllers/backend_ai_chat.go
index b24881c..9e53ac9 100644
--- a/go/controllers/backend_ai_chat.go
+++ b/go/controllers/backend_ai_chat.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -24,22 +25,7 @@ type BackendAiChatController struct {
 }
 
 func (c *BackendAiChatController) chatClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendAiChatController) chatJsonErr(httpStatus, bizCode int, msg string) {
@@ -425,7 +411,8 @@ func runToolLoop(claims *jwtutil.Claims, provider models.BackendAiProvider, mode
 func (c *BackendAiChatController) MessageList() {
 	claims, err := c.chatClaims()
 	if err != nil {
-		c.chatJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.chatJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -467,7 +454,8 @@ func (c *BackendAiChatController) MessageList() {
 func (c *BackendAiChatController) DeleteMessage() {
 	claims, err := c.chatClaims()
 	if err != nil {
-		c.chatJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.chatJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -631,7 +619,8 @@ func loadHistory(sessionID uint64) []openaiMessage {
 func (c *BackendAiChatController) Send() {
 	claims, err := c.chatClaims()
 	if err != nil {
-		c.chatJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.chatJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -746,7 +735,8 @@ func (c *BackendAiChatController) SendStream() {
 
 	claims, err := c.chatClaims()
 	if err != nil {
-		c.chatJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.chatJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_ai_chat_preset.go b/go/controllers/backend_ai_chat_preset.go
index b2b5f8f..831ec97 100644
--- a/go/controllers/backend_ai_chat_preset.go
+++ b/go/controllers/backend_ai_chat_preset.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -20,22 +21,7 @@ type BackendAiChatPresetController struct {
 }
 
 func (c *BackendAiChatPresetController) presetClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendAiChatPresetController) presetJsonErr(httpStatus, bizCode int, msg string) {
@@ -59,7 +45,8 @@ type aiPresetPayload struct {
 func (c *BackendAiChatPresetController) List() {
 	claims, err := c.presetClaims()
 	if err != nil {
-		c.presetJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.presetJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -82,7 +69,8 @@ func (c *BackendAiChatPresetController) List() {
 func (c *BackendAiChatPresetController) Create() {
 	claims, err := c.presetClaims()
 	if err != nil {
-		c.presetJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.presetJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -144,7 +132,8 @@ func (c *BackendAiChatPresetController) Create() {
 func (c *BackendAiChatPresetController) Update() {
 	claims, err := c.presetClaims()
 	if err != nil {
-		c.presetJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.presetJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -209,7 +198,8 @@ func (c *BackendAiChatPresetController) Update() {
 func (c *BackendAiChatPresetController) SetDefault() {
 	claims, err := c.presetClaims()
 	if err != nil {
-		c.presetJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.presetJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -255,7 +245,8 @@ func (c *BackendAiChatPresetController) SetDefault() {
 func (c *BackendAiChatPresetController) Delete() {
 	claims, err := c.presetClaims()
 	if err != nil {
-		c.presetJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.presetJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_ai_chat_session.go b/go/controllers/backend_ai_chat_session.go
index 7fb9281..9de9c69 100644
--- a/go/controllers/backend_ai_chat_session.go
+++ b/go/controllers/backend_ai_chat_session.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -20,22 +21,7 @@ type BackendAiChatSessionController struct {
 }
 
 func (c *BackendAiChatSessionController) sessionClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendAiChatSessionController) sessionJsonErr(httpStatus, bizCode int, msg string) {
@@ -58,7 +44,8 @@ type chatSessionPayload struct {
 func (c *BackendAiChatSessionController) List() {
 	claims, err := c.sessionClaims()
 	if err != nil {
-		c.sessionJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.sessionJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -81,7 +68,8 @@ func (c *BackendAiChatSessionController) List() {
 func (c *BackendAiChatSessionController) Create() {
 	claims, err := c.sessionClaims()
 	if err != nil {
-		c.sessionJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.sessionJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -123,7 +111,8 @@ func (c *BackendAiChatSessionController) Create() {
 func (c *BackendAiChatSessionController) Update() {
 	claims, err := c.sessionClaims()
 	if err != nil {
-		c.sessionJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.sessionJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -176,7 +165,8 @@ func (c *BackendAiChatSessionController) Update() {
 func (c *BackendAiChatSessionController) Delete() {
 	claims, err := c.sessionClaims()
 	if err != nil {
-		c.sessionJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.sessionJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_ai_provider.go b/go/controllers/backend_ai_provider.go
index 82380c5..a383799 100644
--- a/go/controllers/backend_ai_provider.go
+++ b/go/controllers/backend_ai_provider.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -21,22 +22,7 @@ type BackendAiProviderController struct {
 }
 
 func (c *BackendAiProviderController) aiClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendAiProviderController) aiJsonErr(httpStatus, bizCode int, msg string) {
@@ -93,7 +79,8 @@ func parseProviderModels(m string) []string {
 func (c *BackendAiProviderController) List() {
 	claims, err := c.aiClaims()
 	if err != nil {
-		c.aiJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.aiJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -121,7 +108,8 @@ func (c *BackendAiProviderController) List() {
 func (c *BackendAiProviderController) Create() {
 	claims, err := c.aiClaims()
 	if err != nil {
-		c.aiJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.aiJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -190,7 +178,8 @@ func (c *BackendAiProviderController) Create() {
 func (c *BackendAiProviderController) Update() {
 	claims, err := c.aiClaims()
 	if err != nil {
-		c.aiJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.aiJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -258,7 +247,8 @@ func (c *BackendAiProviderController) Update() {
 func (c *BackendAiProviderController) Delete() {
 	claims, err := c.aiClaims()
 	if err != nil {
-		c.aiJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.aiJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -307,7 +297,8 @@ type modelTestResult struct {
 // 批量测试模型连通性
 func (c *BackendAiProviderController) Test() {
 	if _, err := c.aiClaims(); err != nil {
-		c.aiJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.aiJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_ai_smart_generate.go b/go/controllers/backend_ai_smart_generate.go
index f9cc0bf..e56cf6a 100644
--- a/go/controllers/backend_ai_smart_generate.go
+++ b/go/controllers/backend_ai_smart_generate.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -21,22 +22,7 @@ type BackendAiSmartGenerateController struct {
 }
 
 func (c *BackendAiSmartGenerateController) sgClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendAiSmartGenerateController) sgJsonErr(httpStatus, bizCode int, msg string) {
@@ -129,7 +115,8 @@ func findCompleteJSON(text string, startPos int) string {
 func (c *BackendAiSmartGenerateController) GenerateCompany() {
 	claims, err := c.sgClaims()
 	if err != nil {
-		c.sgJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.sgJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_approval.go b/go/controllers/backend_approval.go
index 9e88b52..49b64df 100644
--- a/go/controllers/backend_approval.go
+++ b/go/controllers/backend_approval.go
@@ -10,6 +10,7 @@ import (
 
 	"server/models"
 	"server/services"
+	"server/pkg/identity"
 	approvalEngine "server/services/approval"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -44,7 +45,8 @@ func (c *BackendApprovalController) readTenantBody(dst interface{}) error {
 func (c *BackendApprovalController) FlowList() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -85,7 +87,8 @@ func (c *BackendApprovalController) FlowList() {
 func (c *BackendApprovalController) FlowDetail() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -158,7 +161,8 @@ func tenantFlowToView(f models.TenantApprovalFlow) approvalFlowView {
 func (c *BackendApprovalController) FlowSave() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -323,7 +327,8 @@ func (c *BackendApprovalController) FlowSave() {
 func (c *BackendApprovalController) Pick() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -353,7 +358,8 @@ func (c *BackendApprovalController) Pick() {
 func (c *BackendApprovalController) FlowDelete() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -386,7 +392,8 @@ func (c *BackendApprovalController) FlowDelete() {
 func (c *BackendApprovalController) FlowPerm() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -452,7 +459,8 @@ func joinUintCSV(ids []uint64) string {
 func (c *BackendApprovalController) Options() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -539,7 +547,8 @@ func (c *BackendApprovalController) Options() {
 func (c *BackendApprovalController) AvailableFlows() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
diff --git a/go/controllers/backend_approval_center.go b/go/controllers/backend_approval_center.go
index c45e4bd..bedf211 100644
--- a/go/controllers/backend_approval_center.go
+++ b/go/controllers/backend_approval_center.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	approvalEngine "server/services/approval"
 
@@ -70,7 +71,8 @@ type centerTaskView struct {
 func (c *ApprovalCenterController) TaskList() {
 	claims, err := c.centerClaims()
 	if err != nil {
-		c.centerJSON(401, 401, err.Error(), nil)
+		code := identity.Status(err)
+		c.centerJSON(code, code, err.Error(), nil)
 		return
 	}
 
@@ -181,7 +183,8 @@ func (c *ApprovalCenterController) loadInstanceMap(tasks []models.ApprovalTask)
 func (c *ApprovalCenterController) TaskAct() {
 	claims, err := c.centerClaims()
 	if err != nil {
-		c.centerJSON(401, 401, err.Error(), nil)
+		code := identity.Status(err)
+		c.centerJSON(code, code, err.Error(), nil)
 		return
 	}
 
@@ -237,7 +240,8 @@ func (c *ApprovalCenterController) TaskAct() {
 func (c *ApprovalCenterController) InstanceList() {
 	claims, err := c.centerClaims()
 	if err != nil {
-		c.centerJSON(401, 401, err.Error(), nil)
+		code := identity.Status(err)
+		c.centerJSON(code, code, err.Error(), nil)
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -314,7 +318,8 @@ func (c *ApprovalCenterController) loadFlowNames(insts []models.ApprovalInstance
 func (c *ApprovalCenterController) InstanceDetail() {
 	claims, err := c.centerClaims()
 	if err != nil {
-		c.centerJSON(401, 401, err.Error(), nil)
+		code := identity.Status(err)
+		c.centerJSON(code, code, err.Error(), nil)
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/backend_approval_runtime.go b/go/controllers/backend_approval_runtime.go
index e08f20e..5f074e6 100644
--- a/go/controllers/backend_approval_runtime.go
+++ b/go/controllers/backend_approval_runtime.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 	approvalEngine "server/services/approval"
@@ -61,7 +62,8 @@ func approvalRuntimeUID(claims *jwtutil.Claims) uint64 {
 func (c *BackendApprovalRuntimeController) InstanceMine() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		c.fail(401, 401, err.Error())
+		code := identity.Status(err)
+		c.fail(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -112,7 +114,8 @@ func (c *BackendApprovalRuntimeController) InstanceMine() {
 func (c *BackendApprovalRuntimeController) InstanceTodo() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		c.fail(401, 401, err.Error())
+		code := identity.Status(err)
+		c.fail(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -173,7 +176,8 @@ func (c *BackendApprovalRuntimeController) InstanceTodo() {
 func (c *BackendApprovalRuntimeController) InstanceDetail() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		c.fail(401, 401, err.Error())
+		code := identity.Status(err)
+		c.fail(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -229,7 +233,8 @@ type approvalRuntimeApprovePayload struct {
 func (c *BackendApprovalRuntimeController) Approve() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		c.fail(401, 401, err.Error())
+		code := identity.Status(err)
+		c.fail(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -281,7 +286,8 @@ func (c *BackendApprovalRuntimeController) Approve() {
 func (c *BackendApprovalRuntimeController) Withdraw() {
 	claims, err := requireBackend(&c.Controller)
 	if err != nil {
-		c.fail(401, 401, err.Error())
+		code := identity.Status(err)
+		c.fail(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
diff --git a/go/controllers/backend_article.go b/go/controllers/backend_article.go
index e90fd75..fbdf773 100644
--- a/go/controllers/backend_article.go
+++ b/go/controllers/backend_article.go
@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"sort"
 	"strconv"
@@ -10,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -35,34 +35,17 @@ func (c *BackendArticleCategoryController) cmsClaims() (*jwtutil.Claims, error)
 }
 
 func cmsBackendClaims(c *beego.Controller) (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
+// cmsEffectiveTid 取当前 CMS 请求的租户 ID。
+//
+// 只认令牌 claims，不认 ?tid= 与 X-Tenant-Id：这两个入参此前会覆盖登录态，
+// 任何 backend 账号改一下参数就能读写别的企业站点内容。
+// 前端仍会带自己的 tid（同值），忽略即可，不影响正常调用。
+// 公开门户的租户解析走 cmsPortalTid（无登录态，按域名/参数定位站点），不在此列。
 func cmsEffectiveTid(c *beego.Controller, claims *jwtutil.Claims) uint64 {
-	_ = c.ParseForm(1 << 20)
-	if tid, err := c.GetUint64("tid"); err == nil && tid > 0 {
-		return tid
-	}
-	if h := strings.TrimSpace(c.Ctx.Request.Header.Get("X-Tenant-Id")); h != "" {
-		if v, e := strconv.ParseUint(h, 10, 64); e == nil {
-			return v
-		}
-	}
+	_ = c.ParseForm(1 << 20) // 部分调用方依赖这里触发表单解析
 	if claims != nil && claims.TenantId > 0 {
 		return uint64(claims.TenantId)
 	}
@@ -171,7 +154,8 @@ func cmsCategoryToMap(row models.CmsArticleCategory) map[string]interface{} {
 func (c *BackendArticleController) ContentStats() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -250,7 +234,8 @@ func (c *BackendArticleController) ContentStats() {
 func (c *BackendArticleController) List() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -334,7 +319,8 @@ func (c *BackendArticleController) ListAll() {
 func (c *BackendArticleController) Detail() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -390,7 +376,8 @@ type cmsArticlePayload struct {
 func (c *BackendArticleController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -459,7 +446,8 @@ func (c *BackendArticleController) Create() {
 func (c *BackendArticleController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -515,7 +503,8 @@ func (c *BackendArticleController) Update() {
 func (c *BackendArticleController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -547,7 +536,8 @@ func (c *BackendArticleController) Delete() {
 func (c *BackendArticleController) setArticleFlag(field string, value int8) {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -580,7 +570,8 @@ func (c *BackendArticleController) setArticleFlag(field string, value int8) {
 func (c *BackendArticleController) Publish() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -631,7 +622,8 @@ func (c *BackendArticleController) Publish() {
 func (c *BackendArticleController) Unpublish() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -669,7 +661,8 @@ func (c *BackendArticleController) Untop()       { c.setArticleFlag("top", 0) }
 func (c *BackendArticleCategoryController) List() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -725,7 +718,8 @@ func (c *BackendArticleCategoryController) List() {
 func (c *BackendArticleCategoryController) ListAll() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -763,7 +757,8 @@ func (c *BackendArticleCategoryController) ListAll() {
 func (c *BackendArticleCategoryController) Detail() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -806,7 +801,8 @@ type cmsCategoryPayload struct {
 func (c *BackendArticleCategoryController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -857,7 +853,8 @@ func (c *BackendArticleCategoryController) Create() {
 func (c *BackendArticleCategoryController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -923,7 +920,8 @@ func (c *BackendArticleCategoryController) Update() {
 func (c *BackendArticleCategoryController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -989,7 +987,8 @@ func (c *BackendArticleCategoryController) Delete() {
 func (c *BackendArticleCategoryController) UpdateStatus() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
diff --git a/go/controllers/backend_auth.go b/go/controllers/backend_auth.go
index e3aae01..e1b589d 100644
--- a/go/controllers/backend_auth.go
+++ b/go/controllers/backend_auth.go
@@ -1,448 +1,422 @@
-package controllers
-
-import (
-	"encoding/json"
-	"io"
-	"strings"
-
-	"server/models"
-	"server/pkg/jwtutil"
-	"server/services"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type backendAuthLoginRequest struct {
-	TenantName string `json:"tenant_name"`
-	Account    string `json:"account"`
-	Password   string `json:"password"`
-	Code       string `json:"code"`
-	// 极验4验证参数
-	CaptchaID     string `json:"captcha_id"`
-	LotNumber     string `json:"lot_number"`
-	PassToken     string `json:"pass_token"`
-	GenTime       string `json:"gen_time"`
-	CaptchaOutput string `json:"captcha_output"`
-}
-
-// BackendAuthController backend 端认证控制器
-type BackendAuthController struct {
-	beego.Controller
-}
-
-func (c *BackendAuthController) serveJSON(data map[string]interface{}) {
-	c.Data["json"] = data
-	_ = c.ServeJSON()
-}
-
-// recordLoginLog 记录登录日志（成功/失败均记录，失败不影响登录流程）
-func (c *BackendAuthController) recordLoginLog(tid *uint64, userID uint64, account, userName, tenantName, loginType string, status int8, message string) {
-	ip := c.Ctx.Input.IP()
-	userAgent := c.Ctx.Request.UserAgent()
-	RecordLoginLog(tid, userID, account, userName, tenantName, loginType, status, message, ip, userAgent)
-}
-
-// LoginBackend backend 登录（需要租户）
-func (c *BackendAuthController) LoginBackend() {
-	var req backendAuthLoginRequest
-
-	body := c.Ctx.Input.RequestBody
-	if len(body) == 0 {
-		var err error
-		body, err = io.ReadAll(c.Ctx.Request.Body)
-		if err != nil {
-			c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
-			return
-		}
-	}
-	if len(body) == 0 {
-		c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
-		return
-	}
-	if err := json.Unmarshal(body, &req); err != nil {
-		c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
-		return
-	}
-
-	req.TenantName = strings.TrimSpace(req.TenantName)
-	req.Account = strings.TrimSpace(req.Account)
-	req.Password = strings.TrimSpace(req.Password)
-	if req.TenantName == "" || req.Account == "" || req.Password == "" {
-		c.serveJSON(map[string]interface{}{"code": 400, "msg": "租户名称、用户名或密码不能为空"})
-		return
-	}
-
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.OpenVerifyEnabled == 1 {
-		if cfg.VerifyType == "geetest4" || cfg.VerifyType == "geetest" {
-			if req.LotNumber == "" || req.PassToken == "" || req.GenTime == "" || req.CaptchaOutput == "" {
-				c.serveJSON(map[string]interface{}{"code": 400, "msg": "请完成人机验证"})
-				return
-			}
-			// TODO: 集成极验4服务端 SDK 后在这里进行二次校验
-		} else if cfg.VerifyType == "geetest3" {
-			if req.CaptchaOutput == "" {
-				c.serveJSON(map[string]interface{}{"code": 400, "msg": "请完成人机验证"})
-				return
-			}
-			// TODO: 集成极验3服务端 SDK 后在这里进行二次校验
-		} else if cfg.VerifyType == "sms" || cfg.VerifyType == "email" {
-			if strings.TrimSpace(req.Code) == "" {
-				c.serveJSON(map[string]interface{}{"code": 400, "msg": "请输入验证码"})
-				return
-			}
-			if err := services.VerifyBackendLoginCode(req.TenantName, req.Account, cfg.VerifyType, req.Code); err != nil {
-				c.serveJSON(map[string]interface{}{"code": 400, "msg": err.Error()})
-				return
-			}
-		}
-	}
-
-	token, loginUser, err := services.BackendLogin(req.TenantName, req.Account, req.Password)
-	if err != nil {
-		c.recordLoginLog(nil, 0, req.Account, "", req.TenantName, "password", 0, err.Error())
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": err.Error()})
-		return
-	}
-
-	tid := loginUser.Tid
-	c.recordLoginLog(&tid, loginUser.ID, loginUser.Account, loginUser.Name, req.TenantName, "password", 1, "登录成功")
-
-	c.serveJSON(map[string]interface{}{
-		"code": 200,
-		"msg":  "登录成功",
-		"data": map[string]interface{}{
-			"token": token,
-			"user": map[string]interface{}{
-				"id":          loginUser.ID,
-				"account":     loginUser.Account,
-				"name":        loginUser.Name,
-				"tid":         loginUser.Tid,
-				"tenant_name": loginUser.TenantName,
-				"rid":         loginUser.Rid,
-				"avatar":      loginUser.Avatar,
-				"role_name":   loginUser.RoleName,
-			},
-		},
-	})
-}
-
-// GetCurrentUser 当前登录 backend 用户信息，需 Bearer Token
-func (c *BackendAuthController) GetCurrentUser() {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "未登录"})
-		return
-	}
-	authParts := strings.SplitN(authHeader, " ", 2)
-	if len(authParts) != 2 || authParts[0] != "Bearer" {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "认证信息格式错误"})
-		return
-	}
-	claims, err := jwtutil.ParseToken(authParts[1])
-	if err != nil {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "无效的token"})
-		return
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" {
-		c.serveJSON(map[string]interface{}{"code": 403, "msg": "无权访问"})
-		return
-	}
-
-	// 令牌里的 user_id 是认证中心 identity_id，而老表 uid 不在 uid 迁移范围内，
-	// 必须先换算成本租户的老 uid，否则会查不到（甚至按主键误命中他人记录）
-	uid := services.ResolveTenantUID(uint64(claims.TenantId), uint64(claims.UserID))
-	var tenantUser models.SystemTenantUser
-	err = models.Orm.QueryTable(new(models.SystemTenantUser)).
-		Filter("uid", uid).
-		Filter("tid", claims.TenantId).
-		One(&tenantUser)
-	if err != nil {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "用户不存在"})
-		return
-	}
-	if tenantUser.Status == 0 {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "账号已禁用"})
-		return
-	}
-
-	account := ""
-	if tenantUser.Account != nil {
-		account = strings.TrimSpace(*tenantUser.Account)
-	}
-	name := ""
-	if tenantUser.Name != nil {
-		name = strings.TrimSpace(*tenantUser.Name)
-	}
-
-	// 查询当前租户名称
-	tenantName := ""
-	var tenant models.SystemTenant
-	if err := models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", claims.TenantId).One(&tenant); err == nil {
-		tenantName = strings.TrimSpace(tenant.TenantName)
-	}
-
-	// 头像：统一取认证中心身份头像（个人中心上传后写在这里，userinfo 同源）
-	avatar := services.GetIdentityAvatar(tenantUser.Uid)
-
-	c.serveJSON(map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			// id 统一为认证中心 identity_id，与 /auth/userinfo 保持一致，
-			// 避免同一字段在不同来源（登录回跳 vs 本接口）含义不同
-			"id":          claims.UserID,
-			// uid 为老表 yz_system_tenant_user.uid，仅少数按老 uid 存取的场景需要
-			"uid":         tenantUser.Uid,
-			"account":     account,
-			"name":        name,
-			"tid":         tenantUser.Tid,
-			"tenant_name": tenantName,
-			"rid":         0,
-			"avatar":      avatar,
-			"role_name":   "",
-		},
-	})
-}
-
-// GetCurrentUserProfile 当前登录用户的角色 / 部门 / 职位
-// GET /backend/getCurrentUserProfile
-// 返回 department / position（来自员工档案，按登录账号 + 租户匹配）；
-// 若均无，则回退到角色名（role_name）。
-func (c *BackendAuthController) GetCurrentUserProfile() {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "未登录"})
-		return
-	}
-	authParts := strings.SplitN(authHeader, " ", 2)
-	if len(authParts) != 2 || authParts[0] != "Bearer" {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "认证信息格式错误"})
-		return
-	}
-	claims, err := jwtutil.ParseToken(authParts[1])
-	if err != nil {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "无效的token"})
-		return
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" {
-		c.serveJSON(map[string]interface{}{"code": 403, "msg": "无权访问"})
-		return
-	}
-
-	// 同上：令牌 user_id 是 identity_id，需换算成本租户的老 uid
-	uid := services.ResolveTenantUID(uint64(claims.TenantId), uint64(claims.UserID))
-	var tenantUser models.SystemTenantUser
-	if err := models.Orm.QueryTable(new(models.SystemTenantUser)).
-		Filter("uid", uid).
-		Filter("tid", claims.TenantId).
-		One(&tenantUser); err != nil {
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "用户不存在"})
-		return
-	}
-
-	account := ""
-	if tenantUser.Account != nil {
-		account = strings.TrimSpace(*tenantUser.Account)
-	}
-	name := ""
-	if tenantUser.Name != nil {
-		name = strings.TrimSpace(*tenantUser.Name)
-	}
-
-	// 角色名：按 group_id 查询本租户下的租户角色（cid=2）
-	roleName := ""
-	if tenantUser.GroupID > 0 {
-		var role models.AdminRole
-		if err := models.Orm.QueryTable(new(models.AdminRole)).
-			Filter("id", tenantUser.GroupID).
-			Filter("cid", 2).
-			Filter("tenant_id", claims.TenantId).
-			One(&role); err == nil {
-			roleName = role.Name
-		}
-	}
-
-	// 部门 / 职位：来自员工档案，按账号 + 租户匹配
-	department := ""
-	position := ""
-	if account != "" {
-		var emp models.BackendEmployee
-		qs := models.Orm.QueryTable(new(models.BackendEmployee)).Filter("account", account)
-		if claims.TenantId > 0 {
-			qs = qs.Filter("tid", int(claims.TenantId))
-		}
-		if err := qs.One(&emp); err == nil {
-			if emp.Department != nil {
-				department = strings.TrimSpace(*emp.Department)
-			}
-			if emp.Position != nil {
-				position = strings.TrimSpace(*emp.Position)
-			}
-		}
-	}
-
-	// 员工档案的 department 字段存的是组织ID，需转换为组织名称展示
-	if department != "" {
-		orgNames := (&BackendEmployeeFileController{}).efOrgNameMap(int(claims.TenantId))
-		department = efOrgNameByID(orgNames, department)
-	}
-
-	c.serveJSON(map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"account":    account,
-			"name":       name,
-			"role_name":  roleName,
-			"department": department,
-			"position":   position,
-		},
-	})
-}
-
-// SendLoginCode 发送 backend 登录验证码
-func (c *BackendAuthController) SendLoginCode() {
-	var req struct {
-		Account    string `json:"account"`
-		TenantName string `json:"tenant_name"`
-		Channel    string `json:"channel"`
-	}
-	body := c.Ctx.Input.RequestBody
-	if len(body) == 0 {
-		var err error
-		body, err = io.ReadAll(c.Ctx.Request.Body)
-		if err != nil {
-			c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
-			return
-		}
-	}
-	if err := json.Unmarshal(body, &req); err != nil {
-		c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
-		return
-	}
-
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.OpenVerifyEnabled != 1 {
-		c.serveJSON(map[string]interface{}{"code": 400, "msg": "当前未开启验证"})
-		return
-	}
-	channel := strings.TrimSpace(req.Channel)
-	if channel == "" {
-		channel = cfg.VerifyType
-	}
-	if channel != "sms" && channel != "email" {
-		c.serveJSON(map[string]interface{}{"code": 400, "msg": "仅支持短信/邮箱验证码"})
-		return
-	}
-	if err := services.SendBackendLoginCode(req.TenantName, req.Account, channel); err != nil {
-		c.serveJSON(map[string]interface{}{"code": 400, "msg": err.Error()})
-		return
-	}
-	c.serveJSON(map[string]interface{}{"code": 200, "msg": "验证码已发送"})
-}
-
-// LoginBySms 手机号验证码登录（占位实现）
-func (c *BackendAuthController) LoginBySms() {
-	c.serveJSON(map[string]interface{}{
-		"code": 501,
-		"msg":  "手机号验证码登录暂未实现",
-	})
-}
-
-// Logout backend 退出登录（当前为无状态直接返回成功）
-func (c *BackendAuthController) Logout() {
-	c.serveJSON(map[string]interface{}{
-		"code": 200,
-		"msg":  "退出成功",
-	})
-}
-
-// GetGeetest3Infos 获取 backend 极验3.0配置
-func (c *BackendAuthController) GetGeetest3Infos() {
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.Geetest3ID == nil || cfg.Geetest3Key == nil {
-		c.serveJSON(map[string]interface{}{"code": 404, "msg": "未配置极验3参数"})
-		return
-	}
-	c.serveJSON(map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"captcha_id":  *cfg.Geetest3ID,
-			"captcha_key": *cfg.Geetest3Key,
-		},
-	})
-}
-
-// GetGeetest4Infos 获取 backend 极验4.0配置
-func (c *BackendAuthController) GetGeetest4Infos() {
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.Geetest4ID == nil || cfg.Geetest4Key == nil {
-		c.serveJSON(map[string]interface{}{"code": 404, "msg": "未配置极验4参数"})
-		return
-	}
-	c.serveJSON(map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"captcha_id":  *cfg.Geetest4ID,
-			"captcha_key": *cfg.Geetest4Key,
-		},
-	})
-}
-
-// GetOpenVerify 判断是否开启 backend 登录验证
-func (c *BackendAuthController) GetOpenVerify() {
-	cfg, _ := models.GetPlatformLoginVerify()
-	openVerify := "0"
-	if cfg.OpenVerifyEnabled == 1 {
-		openVerify = "1"
-	}
-	c.serveJSON(map[string]interface{}{
-		"code": 200,
-		"msg":  "ok",
-		"data": []map[string]string{
-			{
-				"label": "openVerify",
-				"value": openVerify,
-			},
-			{
-				"label": "verifyType",
-				"value": cfg.VerifyType,
-			},
-		},
-	})
-}
-
-// Register 注册（占位实现）
-func (c *BackendAuthController) Register() {
-	c.serveJSON(map[string]interface{}{
-		"code": 501,
-		"msg":  "注册暂未实现",
-	})
-}
-
-// SendRegisterCode 发送注册验证码（占位实现）
-func (c *BackendAuthController) SendRegisterCode() {
-	c.serveJSON(map[string]interface{}{
-		"code": 501,
-		"msg":  "发送注册验证码暂未实现",
-	})
-}
-
-// ResetPassword 忘记密码重置（占位实现）
-func (c *BackendAuthController) ResetPassword() {
-	c.serveJSON(map[string]interface{}{
-		"code": 501,
-		"msg":  "重置密码暂未实现",
-	})
-}
-
-// SendResetCode 发送找回密码验证码（占位实现）
-func (c *BackendAuthController) SendResetCode() {
-	c.serveJSON(map[string]interface{}{
-		"code": 501,
-		"msg":  "发送找回密码验证码暂未实现",
-	})
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strings"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/services"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type backendAuthLoginRequest struct {
+	TenantName string `json:"tenant_name"`
+	Account    string `json:"account"`
+	Password   string `json:"password"`
+	Code       string `json:"code"`
+	// 极验4验证参数
+	CaptchaID     string `json:"captcha_id"`
+	LotNumber     string `json:"lot_number"`
+	PassToken     string `json:"pass_token"`
+	GenTime       string `json:"gen_time"`
+	CaptchaOutput string `json:"captcha_output"`
+}
+
+// BackendAuthController backend 端认证控制器
+type BackendAuthController struct {
+	beego.Controller
+}
+
+func (c *BackendAuthController) serveJSON(data map[string]interface{}) {
+	c.Data["json"] = data
+	_ = c.ServeJSON()
+}
+
+// recordLoginLog 记录登录日志（成功/失败均记录，失败不影响登录流程）
+func (c *BackendAuthController) recordLoginLog(tid *uint64, userID uint64, account, userName, tenantName, loginType string, status int8, message string) {
+	ip := c.Ctx.Input.IP()
+	userAgent := c.Ctx.Request.UserAgent()
+	RecordLoginLog(tid, userID, account, userName, tenantName, loginType, status, message, ip, userAgent)
+}
+
+// LoginBackend backend 登录（需要租户）
+func (c *BackendAuthController) LoginBackend() {
+	var req backendAuthLoginRequest
+
+	body := c.Ctx.Input.RequestBody
+	if len(body) == 0 {
+		var err error
+		body, err = io.ReadAll(c.Ctx.Request.Body)
+		if err != nil {
+			c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
+			return
+		}
+	}
+	if len(body) == 0 {
+		c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
+		return
+	}
+	if err := json.Unmarshal(body, &req); err != nil {
+		c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
+		return
+	}
+
+	req.TenantName = strings.TrimSpace(req.TenantName)
+	req.Account = strings.TrimSpace(req.Account)
+	req.Password = strings.TrimSpace(req.Password)
+	if req.TenantName == "" || req.Account == "" || req.Password == "" {
+		c.serveJSON(map[string]interface{}{"code": 400, "msg": "租户名称、用户名或密码不能为空"})
+		return
+	}
+
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.OpenVerifyEnabled == 1 {
+		if cfg.VerifyType == "geetest4" || cfg.VerifyType == "geetest" {
+			if req.LotNumber == "" || req.PassToken == "" || req.GenTime == "" || req.CaptchaOutput == "" {
+				c.serveJSON(map[string]interface{}{"code": 400, "msg": "请完成人机验证"})
+				return
+			}
+			// TODO: 集成极验4服务端 SDK 后在这里进行二次校验
+		} else if cfg.VerifyType == "geetest3" {
+			if req.CaptchaOutput == "" {
+				c.serveJSON(map[string]interface{}{"code": 400, "msg": "请完成人机验证"})
+				return
+			}
+			// TODO: 集成极验3服务端 SDK 后在这里进行二次校验
+		} else if cfg.VerifyType == "sms" || cfg.VerifyType == "email" {
+			if strings.TrimSpace(req.Code) == "" {
+				c.serveJSON(map[string]interface{}{"code": 400, "msg": "请输入验证码"})
+				return
+			}
+			if err := services.VerifyBackendLoginCode(req.TenantName, req.Account, cfg.VerifyType, req.Code); err != nil {
+				c.serveJSON(map[string]interface{}{"code": 400, "msg": err.Error()})
+				return
+			}
+		}
+	}
+
+	token, loginUser, err := services.BackendLogin(req.TenantName, req.Account, req.Password)
+	if err != nil {
+		c.recordLoginLog(nil, 0, req.Account, "", req.TenantName, "password", 0, err.Error())
+		c.serveJSON(map[string]interface{}{"code": 401, "msg": err.Error()})
+		return
+	}
+
+	tid := loginUser.Tid
+	c.recordLoginLog(&tid, loginUser.ID, loginUser.Account, loginUser.Name, req.TenantName, "password", 1, "登录成功")
+
+	c.serveJSON(map[string]interface{}{
+		"code": 200,
+		"msg":  "登录成功",
+		"data": map[string]interface{}{
+			"token": token,
+			"user": map[string]interface{}{
+				"id":          loginUser.ID,
+				"account":     loginUser.Account,
+				"name":        loginUser.Name,
+				"tid":         loginUser.Tid,
+				"tenant_name": loginUser.TenantName,
+				"rid":         loginUser.Rid,
+				"avatar":      loginUser.Avatar,
+				"role_name":   loginUser.RoleName,
+			},
+		},
+	})
+}
+
+// GetCurrentUser 当前登录 backend 用户信息，需 Bearer Token
+func (c *BackendAuthController) GetCurrentUser() {
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend, identity.EndApp)
+	if err != nil {
+		code := identity.Status(err)
+		c.serveJSON(map[string]interface{}{"code": code, "msg": err.Error()})
+		return
+	}
+
+	// 令牌里的 user_id 是认证中心 identity_id，而老表 uid 不在 uid 迁移范围内，
+	// 必须先换算成本租户的老 uid，否则会查不到（甚至按主键误命中他人记录）
+	uid := services.ResolveTenantUID(uint64(claims.TenantId), uint64(claims.UserID))
+	var tenantUser models.SystemTenantUser
+	err = models.Orm.QueryTable(new(models.SystemTenantUser)).
+		Filter("uid", uid).
+		Filter("tid", claims.TenantId).
+		One(&tenantUser)
+	if err != nil {
+		c.serveJSON(map[string]interface{}{"code": 401, "msg": "用户不存在"})
+		return
+	}
+	if tenantUser.Status == 0 {
+		c.serveJSON(map[string]interface{}{"code": 401, "msg": "账号已禁用"})
+		return
+	}
+
+	account := ""
+	if tenantUser.Account != nil {
+		account = strings.TrimSpace(*tenantUser.Account)
+	}
+	name := ""
+	if tenantUser.Name != nil {
+		name = strings.TrimSpace(*tenantUser.Name)
+	}
+
+	// 查询当前租户名称
+	tenantName := ""
+	var tenant models.SystemTenant
+	if err := models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", claims.TenantId).One(&tenant); err == nil {
+		tenantName = strings.TrimSpace(tenant.TenantName)
+	}
+
+	// 头像：统一取认证中心身份头像（个人中心上传后写在这里，userinfo 同源）
+	avatar := services.GetIdentityAvatar(tenantUser.Uid)
+
+	c.serveJSON(map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			// id 统一为认证中心 identity_id，与 /auth/userinfo 保持一致，
+			// 避免同一字段在不同来源（登录回跳 vs 本接口）含义不同
+			"id":          claims.UserID,
+			// uid 为老表 yz_system_tenant_user.uid，仅少数按老 uid 存取的场景需要
+			"uid":         tenantUser.Uid,
+			"account":     account,
+			"name":        name,
+			"tid":         tenantUser.Tid,
+			"tenant_name": tenantName,
+			"rid":         0,
+			"avatar":      avatar,
+			"role_name":   "",
+		},
+	})
+}
+
+// GetCurrentUserProfile 当前登录用户的角色 / 部门 / 职位
+// GET /backend/getCurrentUserProfile
+// 返回 department / position（来自员工档案，按登录账号 + 租户匹配）；
+// 若均无，则回退到角色名（role_name）。
+func (c *BackendAuthController) GetCurrentUserProfile() {
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend, identity.EndApp)
+	if err != nil {
+		code := identity.Status(err)
+		c.serveJSON(map[string]interface{}{"code": code, "msg": err.Error()})
+		return
+	}
+
+	// 同上：令牌 user_id 是 identity_id，需换算成本租户的老 uid
+	uid := services.ResolveTenantUID(uint64(claims.TenantId), uint64(claims.UserID))
+	var tenantUser models.SystemTenantUser
+	if err := models.Orm.QueryTable(new(models.SystemTenantUser)).
+		Filter("uid", uid).
+		Filter("tid", claims.TenantId).
+		One(&tenantUser); err != nil {
+		c.serveJSON(map[string]interface{}{"code": 401, "msg": "用户不存在"})
+		return
+	}
+
+	account := ""
+	if tenantUser.Account != nil {
+		account = strings.TrimSpace(*tenantUser.Account)
+	}
+	name := ""
+	if tenantUser.Name != nil {
+		name = strings.TrimSpace(*tenantUser.Name)
+	}
+
+	// 角色名：按 group_id 查询本租户下的租户角色（cid=2）
+	roleName := ""
+	if tenantUser.GroupID > 0 {
+		var role models.AdminRole
+		if err := models.Orm.QueryTable(new(models.AdminRole)).
+			Filter("id", tenantUser.GroupID).
+			Filter("cid", 2).
+			Filter("tenant_id", claims.TenantId).
+			One(&role); err == nil {
+			roleName = role.Name
+		}
+	}
+
+	// 部门 / 职位：来自员工档案，按账号 + 租户匹配
+	department := ""
+	position := ""
+	if account != "" {
+		var emp models.BackendEmployee
+		qs := models.Orm.QueryTable(new(models.BackendEmployee)).Filter("account", account)
+		if claims.TenantId > 0 {
+			qs = qs.Filter("tid", int(claims.TenantId))
+		}
+		if err := qs.One(&emp); err == nil {
+			if emp.Department != nil {
+				department = strings.TrimSpace(*emp.Department)
+			}
+			if emp.Position != nil {
+				position = strings.TrimSpace(*emp.Position)
+			}
+		}
+	}
+
+	// 员工档案的 department 字段存的是组织ID，需转换为组织名称展示
+	if department != "" {
+		orgNames := (&BackendEmployeeFileController{}).efOrgNameMap(int(claims.TenantId))
+		department = efOrgNameByID(orgNames, department)
+	}
+
+	c.serveJSON(map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"account":    account,
+			"name":       name,
+			"role_name":  roleName,
+			"department": department,
+			"position":   position,
+		},
+	})
+}
+
+// SendLoginCode 发送 backend 登录验证码
+func (c *BackendAuthController) SendLoginCode() {
+	var req struct {
+		Account    string `json:"account"`
+		TenantName string `json:"tenant_name"`
+		Channel    string `json:"channel"`
+	}
+	body := c.Ctx.Input.RequestBody
+	if len(body) == 0 {
+		var err error
+		body, err = io.ReadAll(c.Ctx.Request.Body)
+		if err != nil {
+			c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
+			return
+		}
+	}
+	if err := json.Unmarshal(body, &req); err != nil {
+		c.serveJSON(map[string]interface{}{"code": 400, "msg": "参数错误"})
+		return
+	}
+
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.OpenVerifyEnabled != 1 {
+		c.serveJSON(map[string]interface{}{"code": 400, "msg": "当前未开启验证"})
+		return
+	}
+	channel := strings.TrimSpace(req.Channel)
+	if channel == "" {
+		channel = cfg.VerifyType
+	}
+	if channel != "sms" && channel != "email" {
+		c.serveJSON(map[string]interface{}{"code": 400, "msg": "仅支持短信/邮箱验证码"})
+		return
+	}
+	if err := services.SendBackendLoginCode(req.TenantName, req.Account, channel); err != nil {
+		c.serveJSON(map[string]interface{}{"code": 400, "msg": err.Error()})
+		return
+	}
+	c.serveJSON(map[string]interface{}{"code": 200, "msg": "验证码已发送"})
+}
+
+// LoginBySms 手机号验证码登录（占位实现）
+func (c *BackendAuthController) LoginBySms() {
+	c.serveJSON(map[string]interface{}{
+		"code": 501,
+		"msg":  "手机号验证码登录暂未实现",
+	})
+}
+
+// Logout backend 退出登录（当前为无状态直接返回成功）
+func (c *BackendAuthController) Logout() {
+	c.serveJSON(map[string]interface{}{
+		"code": 200,
+		"msg":  "退出成功",
+	})
+}
+
+// GetGeetest3Infos 获取 backend 极验3.0配置
+func (c *BackendAuthController) GetGeetest3Infos() {
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.Geetest3ID == nil || cfg.Geetest3Key == nil {
+		c.serveJSON(map[string]interface{}{"code": 404, "msg": "未配置极验3参数"})
+		return
+	}
+	c.serveJSON(map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"captcha_id":  *cfg.Geetest3ID,
+			"captcha_key": *cfg.Geetest3Key,
+		},
+	})
+}
+
+// GetGeetest4Infos 获取 backend 极验4.0配置
+func (c *BackendAuthController) GetGeetest4Infos() {
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.Geetest4ID == nil || cfg.Geetest4Key == nil {
+		c.serveJSON(map[string]interface{}{"code": 404, "msg": "未配置极验4参数"})
+		return
+	}
+	c.serveJSON(map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"captcha_id":  *cfg.Geetest4ID,
+			"captcha_key": *cfg.Geetest4Key,
+		},
+	})
+}
+
+// GetOpenVerify 判断是否开启 backend 登录验证
+func (c *BackendAuthController) GetOpenVerify() {
+	cfg, _ := models.GetPlatformLoginVerify()
+	openVerify := "0"
+	if cfg.OpenVerifyEnabled == 1 {
+		openVerify = "1"
+	}
+	c.serveJSON(map[string]interface{}{
+		"code": 200,
+		"msg":  "ok",
+		"data": []map[string]string{
+			{
+				"label": "openVerify",
+				"value": openVerify,
+			},
+			{
+				"label": "verifyType",
+				"value": cfg.VerifyType,
+			},
+		},
+	})
+}
+
+// Register 注册（占位实现）
+func (c *BackendAuthController) Register() {
+	c.serveJSON(map[string]interface{}{
+		"code": 501,
+		"msg":  "注册暂未实现",
+	})
+}
+
+// SendRegisterCode 发送注册验证码（占位实现）
+func (c *BackendAuthController) SendRegisterCode() {
+	c.serveJSON(map[string]interface{}{
+		"code": 501,
+		"msg":  "发送注册验证码暂未实现",
+	})
+}
+
+// ResetPassword 忘记密码重置（占位实现）
+func (c *BackendAuthController) ResetPassword() {
+	c.serveJSON(map[string]interface{}{
+		"code": 501,
+		"msg":  "重置密码暂未实现",
+	})
+}
+
+// SendResetCode 发送找回密码验证码（占位实现）
+func (c *BackendAuthController) SendResetCode() {
+	c.serveJSON(map[string]interface{}{
+		"code": 501,
+		"msg":  "发送找回密码验证码暂未实现",
+	})
+}
diff --git a/go/controllers/backend_contact.go b/go/controllers/backend_contact.go
index 8ba4943..bc5ceed 100644
--- a/go/controllers/backend_contact.go
+++ b/go/controllers/backend_contact.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -21,36 +22,20 @@ type BackendErpContactController struct {
 
 // contactClaims 从请求头解析登录态 JWT，返回后端用户 Claims
 func (c *BackendErpContactController) contactClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || !strings.EqualFold(parts[0], "Bearer") {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
-// contactTenantID 获取当前请求的租户ID：优先使用登录态 JWT 中的租户，
-// 仅当显式传入 tid 参数时才以参数为准（兼容管理端等显式指定场景）。
+// contactTenantID 获取当前请求的租户 ID：一律以登录态 JWT 为准。
+// ?tid= 参数不再参与，否则 backend 账号改参数即可读写其他企业的通讯录。
 func (c *BackendErpContactController) contactTenantID() (uint64, error) {
 	claims, err := c.contactClaims()
 	if err != nil {
 		return 0, err
 	}
-	tid := uint64(claims.TenantId)
-	if v, e := c.GetInt64("tid"); e == nil && v > 0 {
-		tid = uint64(v)
+	if claims.TenantId <= 0 {
+		return 0, fmt.Errorf("登录态未绑定企业")
 	}
-	return tid, nil
+	return uint64(claims.TenantId), nil
 }
 
 type erpContactDTO struct {
@@ -413,10 +398,15 @@ func (c *BackendErpContactController) Star() {
 	c.contactJsonOK(nil)
 }
 
-// SyncAllContacts 全量同步：将所有员工同步到通讯录
+// SyncAllContacts 全量同步：将当前租户的员工同步到通讯录
 // POST /backend/erp/contact/syncAll
 func (c *BackendErpContactController) SyncAllContacts() {
-	tid, _ := c.GetInt64("tid")
+	// 此处必须走登录态：早期直接取 ?tid=，不带 token 也能调，会把所有企业的员工一起同步
+	tid, err := c.contactTenantID()
+	if err != nil {
+		c.contactJsonError(401, err.Error())
+		return
+	}
 
 	qs := models.Orm.QueryTable(new(models.BackendEmployee)).
 		Filter("delete_time__isnull", true).
@@ -426,7 +416,7 @@ func (c *BackendErpContactController) SyncAllContacts() {
 	}
 
 	var employees []models.BackendEmployee
-	_, err := qs.All(&employees)
+	_, err = qs.All(&employees)
 	if err != nil {
 		c.contactJsonError(500, "查询员工失败: "+err.Error())
 		return
diff --git a/go/controllers/backend_crm_bidding_bid.go b/go/controllers/backend_crm_bidding_bid.go
index abde62b..246734c 100644
--- a/go/controllers/backend_crm_bidding_bid.go
+++ b/go/controllers/backend_crm_bidding_bid.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // =============================================================
@@ -63,7 +64,8 @@ type bidPayload struct {
 func (c *BackendCrmBiddingBidController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -123,7 +125,8 @@ func (c *BackendCrmBiddingBidController) List() {
 func (c *BackendCrmBiddingBidController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -150,7 +153,8 @@ func (c *BackendCrmBiddingBidController) Detail() {
 func (c *BackendCrmBiddingBidController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -225,7 +229,8 @@ func (c *BackendCrmBiddingBidController) Create() {
 func (c *BackendCrmBiddingBidController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -309,7 +314,8 @@ func (c *BackendCrmBiddingBidController) Update() {
 func (c *BackendCrmBiddingBidController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -352,7 +358,8 @@ func (c *BackendCrmBiddingBidController) Delete() {
 func (c *BackendCrmBiddingBidController) ConvertContract() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -452,7 +459,8 @@ func (c *BackendCrmBiddingBidController) ConvertContract() {
 func (c *BackendCrmBiddingBidController) ConvertProject() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -554,7 +562,8 @@ func (c *BackendCrmBiddingBidController) ConvertProject() {
 func (c *BackendCrmBiddingBidController) SubmitResult() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -644,7 +653,8 @@ func (c *BackendCrmBiddingBidController) SubmitResult() {
 func (c *BackendCrmBiddingBidController) FromBusiness() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -736,7 +746,8 @@ func (c *BackendCrmBiddingBidController) FromBusiness() {
 func (c *BackendCrmBiddingBidController) FromProject() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	var p struct {
diff --git a/go/controllers/backend_crm_bidding_more.go b/go/controllers/backend_crm_bidding_more.go
index 36aabb2..6037793 100644
--- a/go/controllers/backend_crm_bidding_more.go
+++ b/go/controllers/backend_crm_bidding_more.go
@@ -11,6 +11,7 @@ import (
 
 	beego "github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/client/orm"
+	"server/pkg/identity"
 )
 
 // =============================================================
@@ -45,7 +46,8 @@ type tenderAnnouncePayload struct {
 func (c *BackendCrmBiddingTenderAnnounceController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenderID, _ := c.GetInt64("tender_id")
@@ -67,7 +69,8 @@ func (c *BackendCrmBiddingTenderAnnounceController) List() {
 func (c *BackendCrmBiddingTenderAnnounceController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -107,7 +110,8 @@ func (c *BackendCrmBiddingTenderAnnounceController) Create() {
 func (c *BackendCrmBiddingTenderAnnounceController) Publish() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -152,7 +156,8 @@ func (c *BackendCrmBiddingTenderAnnounceController) Publish() {
 func (c *BackendCrmBiddingTenderAnnounceController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -194,7 +199,8 @@ type tenderSupplierPayload struct {
 func (c *BackendCrmBiddingTenderSupplierController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenderID, _ := c.GetInt64("tender_id")
@@ -216,7 +222,8 @@ func (c *BackendCrmBiddingTenderSupplierController) List() {
 func (c *BackendCrmBiddingTenderSupplierController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -260,7 +267,8 @@ func (c *BackendCrmBiddingTenderSupplierController) Create() {
 func (c *BackendCrmBiddingTenderSupplierController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -305,7 +313,8 @@ func (c *BackendCrmBiddingTenderSupplierController) Update() {
 func (c *BackendCrmBiddingTenderSupplierController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -369,7 +378,8 @@ func calcTotalScore(p tenderEvaluationPayload) float64 {
 func (c *BackendCrmBiddingTenderEvaluationController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenderID, _ := c.GetInt64("tender_id")
@@ -391,7 +401,8 @@ func (c *BackendCrmBiddingTenderEvaluationController) List() {
 func (c *BackendCrmBiddingTenderEvaluationController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -455,7 +466,8 @@ func resortEvaluationRanking(tenderID uint64, tenantID string) {
 func (c *BackendCrmBiddingTenderEvaluationController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -483,7 +495,8 @@ type BackendCrmBiddingTenderResultController struct {
 func (c *BackendCrmBiddingTenderResultController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenderID, _ := c.GetInt64("tender_id")
@@ -505,7 +518,8 @@ func (c *BackendCrmBiddingTenderResultController) List() {
 func (c *BackendCrmBiddingTenderResultController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -540,7 +554,8 @@ type bidApprovalPayload struct {
 func (c *BackendCrmBiddingBidApprovalController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bidID, _ := c.GetInt64("bid_id")
@@ -562,7 +577,8 @@ func (c *BackendCrmBiddingBidApprovalController) List() {
 func (c *BackendCrmBiddingBidApprovalController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -616,7 +632,8 @@ func (c *BackendCrmBiddingBidApprovalController) Create() {
 func (c *BackendCrmBiddingBidApprovalController) Approve() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -688,7 +705,8 @@ type bidDocumentPayload struct {
 func (c *BackendCrmBiddingBidDocumentController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bidID, _ := c.GetInt64("bid_id")
@@ -710,7 +728,8 @@ func (c *BackendCrmBiddingBidDocumentController) List() {
 func (c *BackendCrmBiddingBidDocumentController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -751,7 +770,8 @@ func (c *BackendCrmBiddingBidDocumentController) Create() {
 func (c *BackendCrmBiddingBidDocumentController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -797,7 +817,8 @@ func (c *BackendCrmBiddingBidDocumentController) Update() {
 func (c *BackendCrmBiddingBidDocumentController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -835,7 +856,8 @@ type bidTemplatePayload struct {
 func (c *BackendCrmBiddingBidTemplateController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	keyword := strings.TrimSpace(c.GetString("keyword"))
@@ -869,7 +891,8 @@ func (c *BackendCrmBiddingBidTemplateController) List() {
 func (c *BackendCrmBiddingBidTemplateController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -910,7 +933,8 @@ func (c *BackendCrmBiddingBidTemplateController) Create() {
 func (c *BackendCrmBiddingBidTemplateController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -950,7 +974,8 @@ func (c *BackendCrmBiddingBidTemplateController) Update() {
 func (c *BackendCrmBiddingBidTemplateController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -994,7 +1019,8 @@ type bidQualificationPayload struct {
 func (c *BackendCrmBiddingBidQualificationController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	keyword := strings.TrimSpace(c.GetString("keyword"))
@@ -1049,7 +1075,8 @@ func (c *BackendCrmBiddingBidQualificationController) List() {
 func (c *BackendCrmBiddingBidQualificationController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -1095,7 +1122,8 @@ func (c *BackendCrmBiddingBidQualificationController) Create() {
 func (c *BackendCrmBiddingBidQualificationController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -1146,7 +1174,8 @@ func (c *BackendCrmBiddingBidQualificationController) Update() {
 func (c *BackendCrmBiddingBidQualificationController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -1200,7 +1229,8 @@ func sumField(table, field, tenantID string) float64 {
 func (c *BackendCrmBiddingStatisticsController) Tender() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := pipelineTenantID(claims)
@@ -1223,7 +1253,8 @@ func (c *BackendCrmBiddingStatisticsController) Tender() {
 func (c *BackendCrmBiddingStatisticsController) Bid() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := pipelineTenantID(claims)
diff --git a/go/controllers/backend_crm_bidding_reminder.go b/go/controllers/backend_crm_bidding_reminder.go
index fe89342..03855d0 100644
--- a/go/controllers/backend_crm_bidding_reminder.go
+++ b/go/controllers/backend_crm_bidding_reminder.go
@@ -7,6 +7,7 @@ import (
 	"server/models"
 
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // =============================================================
@@ -46,7 +47,8 @@ type biddingReminderItem struct {
 func (c *BackendCrmBiddingReminderController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tid := pipelineTenantID(claims)
diff --git a/go/controllers/backend_crm_bidding_sub.go b/go/controllers/backend_crm_bidding_sub.go
index cba871a..cafb026 100644
--- a/go/controllers/backend_crm_bidding_sub.go
+++ b/go/controllers/backend_crm_bidding_sub.go
@@ -10,6 +10,7 @@ import (
 	"server/models"
 
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // =============================================================
@@ -48,7 +49,8 @@ type bidFilePayload struct {
 func (c *BackendCrmBiddingBidFileController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bidID, _ := c.GetInt64("bid_id")
@@ -69,7 +71,8 @@ func (c *BackendCrmBiddingBidFileController) List() {
 func (c *BackendCrmBiddingBidFileController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -115,7 +118,8 @@ func (c *BackendCrmBiddingBidFileController) Create() {
 func (c *BackendCrmBiddingBidFileController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -164,7 +168,8 @@ type bidTaskPayload struct {
 func (c *BackendCrmBiddingBidTaskController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bidID, _ := c.GetInt64("bid_id")
@@ -185,7 +190,8 @@ func (c *BackendCrmBiddingBidTaskController) List() {
 func (c *BackendCrmBiddingBidTaskController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -231,7 +237,8 @@ func (c *BackendCrmBiddingBidTaskController) Create() {
 func (c *BackendCrmBiddingBidTaskController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -283,7 +290,8 @@ func (c *BackendCrmBiddingBidTaskController) Update() {
 func (c *BackendCrmBiddingBidTaskController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -317,7 +325,8 @@ type BackendCrmBiddingBidResultController struct {
 func (c *BackendCrmBiddingBidResultController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bidID, _ := c.GetInt64("bid_id")
@@ -338,7 +347,8 @@ func (c *BackendCrmBiddingBidResultController) List() {
 func (c *BackendCrmBiddingBidResultController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -383,7 +393,8 @@ type bidQuotePayload struct {
 func (c *BackendCrmBiddingBidQuoteController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bidID, _ := c.GetInt64("bid_id")
@@ -404,7 +415,8 @@ func (c *BackendCrmBiddingBidQuoteController) List() {
 func (c *BackendCrmBiddingBidQuoteController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -450,7 +462,8 @@ func (c *BackendCrmBiddingBidQuoteController) Create() {
 func (c *BackendCrmBiddingBidQuoteController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -495,7 +508,8 @@ type bidCompetitorPayload struct {
 func (c *BackendCrmBiddingBidCompetitorController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bidID, _ := c.GetInt64("bid_id")
@@ -516,7 +530,8 @@ func (c *BackendCrmBiddingBidCompetitorController) List() {
 func (c *BackendCrmBiddingBidCompetitorController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -558,7 +573,8 @@ func (c *BackendCrmBiddingBidCompetitorController) Create() {
 func (c *BackendCrmBiddingBidCompetitorController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -604,7 +620,8 @@ type bidExpensePayload struct {
 func (c *BackendCrmBiddingBidExpenseController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bidID, _ := c.GetInt64("bid_id")
@@ -625,7 +642,8 @@ func (c *BackendCrmBiddingBidExpenseController) List() {
 func (c *BackendCrmBiddingBidExpenseController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -668,7 +686,8 @@ func (c *BackendCrmBiddingBidExpenseController) Create() {
 func (c *BackendCrmBiddingBidExpenseController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -714,7 +733,8 @@ type tenderFilePayload struct {
 func (c *BackendCrmBiddingTenderFileController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenderID, _ := c.GetInt64("tender_id")
@@ -735,7 +755,8 @@ func (c *BackendCrmBiddingTenderFileController) List() {
 func (c *BackendCrmBiddingTenderFileController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -776,7 +797,8 @@ func (c *BackendCrmBiddingTenderFileController) Create() {
 func (c *BackendCrmBiddingTenderFileController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/backend_crm_bidding_tender.go b/go/controllers/backend_crm_bidding_tender.go
index d76a963..049ec10 100644
--- a/go/controllers/backend_crm_bidding_tender.go
+++ b/go/controllers/backend_crm_bidding_tender.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // =============================================================
@@ -60,7 +61,8 @@ type tenderPayload struct {
 func (c *BackendCrmBiddingTenderController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -111,7 +113,8 @@ func (c *BackendCrmBiddingTenderController) List() {
 func (c *BackendCrmBiddingTenderController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -134,7 +137,8 @@ func (c *BackendCrmBiddingTenderController) Detail() {
 func (c *BackendCrmBiddingTenderController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -202,7 +206,8 @@ func (c *BackendCrmBiddingTenderController) Create() {
 func (c *BackendCrmBiddingTenderController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -284,7 +289,8 @@ func (c *BackendCrmBiddingTenderController) Update() {
 func (c *BackendCrmBiddingTenderController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -327,7 +333,8 @@ func (c *BackendCrmBiddingTenderController) Delete() {
 func (c *BackendCrmBiddingTenderController) Award() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -414,7 +421,8 @@ func (c *BackendCrmBiddingTenderController) Award() {
 func (c *BackendCrmBiddingTenderController) AwardToContract() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/backend_crm_business.go b/go/controllers/backend_crm_business.go
index f241075..e291a89 100644
--- a/go/controllers/backend_crm_business.go
+++ b/go/controllers/backend_crm_business.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // BackendCrmBusinessController CRM 商机管理
@@ -45,7 +46,8 @@ type businessPayload struct {
 func (c *BackendCrmBusinessController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -103,7 +105,8 @@ func (c *BackendCrmBusinessController) List() {
 func (c *BackendCrmBusinessController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -129,7 +132,8 @@ func (c *BackendCrmBusinessController) Detail() {
 func (c *BackendCrmBusinessController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -215,7 +219,8 @@ func (c *BackendCrmBusinessController) Create() {
 func (c *BackendCrmBusinessController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -304,7 +309,8 @@ func (c *BackendCrmBusinessController) Update() {
 func (c *BackendCrmBusinessController) ChangeStage() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -389,7 +395,8 @@ func validBusinessStage(s string) bool {
 func (c *BackendCrmBusinessController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -433,7 +440,8 @@ func (c *BackendCrmBusinessController) Delete() {
 func (c *BackendCrmBusinessController) Convert() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/backend_crm_clue.go b/go/controllers/backend_crm_clue.go
index ff47434..4fc557f 100644
--- a/go/controllers/backend_crm_clue.go
+++ b/go/controllers/backend_crm_clue.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // BackendCrmClueController CRM 线索管理
@@ -45,7 +46,8 @@ type cluePayload struct {
 func (c *BackendCrmClueController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 
@@ -105,7 +107,8 @@ func (c *BackendCrmClueController) List() {
 func (c *BackendCrmClueController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -133,7 +136,8 @@ func (c *BackendCrmClueController) Detail() {
 func (c *BackendCrmClueController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -207,7 +211,8 @@ func (c *BackendCrmClueController) Create() {
 func (c *BackendCrmClueController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -300,7 +305,8 @@ func (c *BackendCrmClueController) Update() {
 func (c *BackendCrmClueController) ChangeStatus() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -369,7 +375,8 @@ func clueStatusName(s int8) string {
 func (c *BackendCrmClueController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -414,7 +421,8 @@ func (c *BackendCrmClueController) Delete() {
 func (c *BackendCrmClueController) Convert() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/backend_crm_contact.go b/go/controllers/backend_crm_contact.go
index 63bcc55..427eed3 100644
--- a/go/controllers/backend_crm_contact.go
+++ b/go/controllers/backend_crm_contact.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -202,22 +203,7 @@ func crmContactAtoi(s string) int {
 }
 
 func (c *BackendCrmContactController) contactClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendCrmContactController) crmContactJsonErr(httpStatus, bizCode int, msg string) {
@@ -430,7 +416,8 @@ func crmEnsureCompanyContact(tenantID, companyType string, companyID uint64, nam
 func (c *BackendCrmContactController) List() {
 	claims, err := c.contactClaims()
 	if err != nil {
-		c.crmContactJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.crmContactJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -498,7 +485,8 @@ func (c *BackendCrmContactController) List() {
 func (c *BackendCrmContactController) Add() {
 	claims, err := c.contactClaims()
 	if err != nil {
-		c.crmContactJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.crmContactJsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -579,7 +567,8 @@ func (c *BackendCrmContactController) Add() {
 func (c *BackendCrmContactController) Edit() {
 	claims, err := c.contactClaims()
 	if err != nil {
-		c.crmContactJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.crmContactJsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -668,7 +657,8 @@ func (c *BackendCrmContactController) Edit() {
 func (c *BackendCrmContactController) Delete() {
 	claims, err := c.contactClaims()
 	if err != nil {
-		c.crmContactJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.crmContactJsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
diff --git a/go/controllers/backend_crm_contract.go b/go/controllers/backend_crm_contract.go
index 20694bf..32bcaf5 100644
--- a/go/controllers/backend_crm_contract.go
+++ b/go/controllers/backend_crm_contract.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // BackendCrmContractController CRM 合同管理
@@ -68,7 +69,8 @@ type contractResp struct {
 func (c *BackendCrmContractController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -176,7 +178,8 @@ func (c *BackendCrmContractController) List() {
 func (c *BackendCrmContractController) Stats() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenantID := pipelineTenantID(claims)
@@ -249,7 +252,8 @@ func periodRange(period string) (string, string) {
 func (c *BackendCrmContractController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -281,7 +285,8 @@ func (c *BackendCrmContractController) Detail() {
 func (c *BackendCrmContractController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -380,7 +385,8 @@ func (c *BackendCrmContractController) Create() {
 func (c *BackendCrmContractController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -495,7 +501,8 @@ func (c *BackendCrmContractController) Update() {
 func (c *BackendCrmContractController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -537,7 +544,8 @@ func (c *BackendCrmContractController) Delete() {
 func (c *BackendCrmContractController) ChangeStatus() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/backend_crm_dashboard.go b/go/controllers/backend_crm_dashboard.go
index 52076ae..da704c7 100644
--- a/go/controllers/backend_crm_dashboard.go
+++ b/go/controllers/backend_crm_dashboard.go
@@ -8,6 +8,7 @@ import (
 	"server/models"
 
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // BackendCrmDashboardController CRM 数据仪表盘：按时间维度聚合真实业务数据。
@@ -223,7 +224,8 @@ func crmAmountCol(key string) string {
 func (c *BackendCrmDashboardController) Summary() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenantID := pipelineTenantID(claims)
diff --git a/go/controllers/backend_crm_payback.go b/go/controllers/backend_crm_payback.go
index 8ba2145..7002a50 100644
--- a/go/controllers/backend_crm_payback.go
+++ b/go/controllers/backend_crm_payback.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/services"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -93,7 +94,8 @@ type paybackProgress struct {
 func (c *BackendCrmPaybackController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -193,7 +195,8 @@ func (c *BackendCrmPaybackController) List() {
 func (c *BackendCrmPaybackController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -215,7 +218,8 @@ func (c *BackendCrmPaybackController) Detail() {
 func (c *BackendCrmPaybackController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -286,7 +290,8 @@ func (c *BackendCrmPaybackController) Create() {
 func (c *BackendCrmPaybackController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -382,7 +387,8 @@ func (c *BackendCrmPaybackController) Update() {
 func (c *BackendCrmPaybackController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -428,7 +434,8 @@ func (c *BackendCrmPaybackController) Delete() {
 func (c *BackendCrmPaybackController) ProgressList() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenantID := pipelineTenantID(claims)
@@ -498,7 +505,8 @@ func (c *BackendCrmPaybackController) ProgressList() {
 func (c *BackendCrmPaybackController) Receive() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -735,7 +743,8 @@ func formatAmount(n float64) string {
 func (c *BackendCrmPaybackController) RecordList() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenantID := pipelineTenantID(claims)
@@ -780,7 +789,8 @@ func (c *BackendCrmPaybackController) RecordList() {
 func (c *BackendCrmPaybackController) CreateRecord() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -882,7 +892,8 @@ func (c *BackendCrmPaybackController) CreateRecord() {
 func (c *BackendCrmPaybackController) DeleteRecord() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -926,7 +937,8 @@ func (c *BackendCrmPaybackController) DeleteRecord() {
 func (c *BackendCrmPaybackController) UpdateRecord() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/backend_crm_pipeline_common.go b/go/controllers/backend_crm_pipeline_common.go
index 1dae788..e9bfb2c 100644
--- a/go/controllers/backend_crm_pipeline_common.go
+++ b/go/controllers/backend_crm_pipeline_common.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -33,23 +34,10 @@ func resolveUserName(claims *jwtutil.Claims) string {
 // related_type 约定：1=线索 2=商机 3=项目
 
 // pipelineClaims 解析租户端后台 JWT。
+// CRM 管线接口只挂在 /backend/** 下（平台端无对应路由、平台前端也不调），
+// 此前顺带放行 platform 等于让平台令牌能读写租户的商机与投标数据。
 func pipelineClaims(c *beego.Controller) (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" && claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 // pipelineOk 统一成功响应。
diff --git a/go/controllers/backend_crm_pool.go b/go/controllers/backend_crm_pool.go
index c2d16be..43f9b76 100644
--- a/go/controllers/backend_crm_pool.go
+++ b/go/controllers/backend_crm_pool.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -22,22 +23,7 @@ type BackendCrmPoolController struct {
 }
 
 func (c *BackendCrmPoolController) poolClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendCrmPoolController) poolJsonErr(httpStatus, bizCode int, msg string) {
@@ -55,7 +41,8 @@ func (c *BackendCrmPoolController) poolOk(data interface{}) {
 func (c *BackendCrmPoolController) List() {
 	claims, err := c.poolClaims()
 	if err != nil {
-		c.poolJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.poolJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -116,7 +103,8 @@ func (c *BackendCrmPoolController) List() {
 func (c *BackendCrmPoolController) Move() {
 	claims, err := c.poolClaims()
 	if err != nil {
-		c.poolJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.poolJsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -171,7 +159,8 @@ func (c *BackendCrmPoolController) Move() {
 func (c *BackendCrmPoolController) Claim() {
 	claims, err := c.poolClaims()
 	if err != nil {
-		c.poolJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.poolJsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -218,7 +207,8 @@ func (c *BackendCrmPoolController) Claim() {
 func (c *BackendCrmPoolController) Assign() {
 	claims, err := c.poolClaims()
 	if err != nil {
-		c.poolJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.poolJsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
diff --git a/go/controllers/backend_crm_product.go b/go/controllers/backend_crm_product.go
index 0f3777d..1d9ce44 100644
--- a/go/controllers/backend_crm_product.go
+++ b/go/controllers/backend_crm_product.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // BackendCrmProductController CRM 产品管理（产品台账/目录）
@@ -62,7 +63,8 @@ type crmProductItem struct {
 func (c *BackendCrmProductController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -112,7 +114,8 @@ func (c *BackendCrmProductController) List() {
 func (c *BackendCrmProductController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -134,7 +137,8 @@ func (c *BackendCrmProductController) Detail() {
 func (c *BackendCrmProductController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -197,7 +201,8 @@ func (c *BackendCrmProductController) Create() {
 func (c *BackendCrmProductController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -271,7 +276,8 @@ func (c *BackendCrmProductController) Update() {
 func (c *BackendCrmProductController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -303,7 +309,8 @@ func (c *BackendCrmProductController) Delete() {
 func (c *BackendCrmProductController) SyncFromProject() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
diff --git a/go/controllers/backend_crm_product_category.go b/go/controllers/backend_crm_product_category.go
index 5451a3c..6e160ca 100644
--- a/go/controllers/backend_crm_product_category.go
+++ b/go/controllers/backend_crm_product_category.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // BackendCrmProductCategoryController CRM 产品分类（用户自定义产品归类）
@@ -110,7 +111,8 @@ func crmEnsureDefaultProductCategories(tenantID string) {
 func (c *BackendCrmProductCategoryController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -153,7 +155,8 @@ func (c *BackendCrmProductCategoryController) List() {
 func (c *BackendCrmProductCategoryController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -175,7 +178,8 @@ func (c *BackendCrmProductCategoryController) Detail() {
 func (c *BackendCrmProductCategoryController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -220,7 +224,8 @@ func (c *BackendCrmProductCategoryController) Create() {
 func (c *BackendCrmProductCategoryController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -282,7 +287,8 @@ func (c *BackendCrmProductCategoryController) Update() {
 func (c *BackendCrmProductCategoryController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/backend_crm_project.go b/go/controllers/backend_crm_project.go
index 73797c2..cf4a1e7 100644
--- a/go/controllers/backend_crm_project.go
+++ b/go/controllers/backend_crm_project.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -211,7 +212,8 @@ func crmProjectNameDuplicated(tenantID, name string, customerID *uint64) bool {
 func (c *BackendCrmProjectController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -336,7 +338,8 @@ func (c *BackendCrmProjectController) List() {
 func (c *BackendCrmProjectController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -371,7 +374,8 @@ func (c *BackendCrmProjectController) Detail() {
 func (c *BackendCrmProjectController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -475,7 +479,8 @@ func (c *BackendCrmProjectController) Create() {
 func (c *BackendCrmProjectController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -599,7 +604,8 @@ func (c *BackendCrmProjectController) Update() {
 func (c *BackendCrmProjectController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -686,7 +692,8 @@ func filterCompanyContactIDs(tenantID string, companyType string, companyID *uin
 func (c *BackendCrmProjectController) SaveContacts() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -757,7 +764,8 @@ func (c *BackendCrmProjectController) SaveContacts() {
 func (c *BackendCrmProjectController) ChangeStatus() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -853,7 +861,8 @@ func (c *BackendCrmProjectController) projectDocContext(claims *jwtutil.Claims)
 func (c *BackendCrmProjectController) DocList() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	proj, cid, ok := c.projectDocContext(claims)
@@ -921,7 +930,8 @@ func (c *BackendCrmProjectController) DocList() {
 func (c *BackendCrmProjectController) DocUpload() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	proj, cid, ok := c.projectDocContext(claims)
@@ -1017,7 +1027,8 @@ func (c *BackendCrmProjectController) DocUpload() {
 func (c *BackendCrmProjectController) DocDelete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	proj, cid, ok := c.projectDocContext(claims)
@@ -1070,7 +1081,8 @@ func (c *BackendCrmProjectController) DocDelete() {
 func (c *BackendCrmProjectController) DocFolderCreate() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	proj, cid, ok := c.projectDocContext(claims)
@@ -1114,7 +1126,8 @@ func (c *BackendCrmProjectController) DocFolderCreate() {
 func (c *BackendCrmProjectController) DocFolderDelete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	proj, cid, ok := c.projectDocContext(claims)
diff --git a/go/controllers/backend_crm_support.go b/go/controllers/backend_crm_support.go
index 0869f8d..d7e4e60 100644
--- a/go/controllers/backend_crm_support.go
+++ b/go/controllers/backend_crm_support.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // ============================== 回访 / 跟进记录 ==============================
@@ -25,7 +26,8 @@ type BackendCrmFollowController struct {
 func (c *BackendCrmFollowController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -118,7 +120,8 @@ type followPayload struct {
 func (c *BackendCrmFollowController) Add() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -179,7 +182,8 @@ func (c *BackendCrmFollowController) Add() {
 func (c *BackendCrmFollowController) Edit() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -223,7 +227,8 @@ func (c *BackendCrmFollowController) Edit() {
 func (c *BackendCrmFollowController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -279,7 +284,8 @@ type BackendCrmAttachController struct {
 func (c *BackendCrmAttachController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	relatedType := strings.TrimSpace(c.GetString("related_type"))
@@ -350,7 +356,8 @@ func (c *BackendCrmAttachController) List() {
 func (c *BackendCrmAttachController) Add() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -402,7 +409,8 @@ func (c *BackendCrmAttachController) Add() {
 func (c *BackendCrmAttachController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -440,7 +448,8 @@ type BackendCrmEntityContactController struct {
 func (c *BackendCrmEntityContactController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	relatedType := strings.TrimSpace(c.GetString("related_type"))
@@ -503,7 +512,8 @@ type entityContactPayload struct {
 func (c *BackendCrmEntityContactController) Add() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw := c.Ctx.Input.RequestBody
@@ -550,7 +560,8 @@ func (c *BackendCrmEntityContactController) Add() {
 func (c *BackendCrmEntityContactController) Edit() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw := c.Ctx.Input.RequestBody
@@ -595,7 +606,8 @@ func (c *BackendCrmEntityContactController) Edit() {
 func (c *BackendCrmEntityContactController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -646,7 +658,8 @@ type BackendCrmOperateLogController struct {
 func (c *BackendCrmOperateLogController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	relatedType := strings.TrimSpace(c.GetString("related_type"))
diff --git a/go/controllers/backend_crm_unit.go b/go/controllers/backend_crm_unit.go
index 3ada0a1..c119027 100644
--- a/go/controllers/backend_crm_unit.go
+++ b/go/controllers/backend_crm_unit.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
+	"server/pkg/identity"
 )
 
 // BackendCrmUnitController CRM 基本设置-计量单位（产品等单位下拉取自该表）
@@ -201,7 +202,8 @@ func crmUnitUsage(tenantID string) map[string]int64 {
 func (c *BackendCrmUnitController) List() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -249,7 +251,8 @@ func (c *BackendCrmUnitController) List() {
 func (c *BackendCrmUnitController) All() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	tenantID := pipelineTenantID(claims)
@@ -268,7 +271,8 @@ func (c *BackendCrmUnitController) All() {
 func (c *BackendCrmUnitController) Detail() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -290,7 +294,8 @@ func (c *BackendCrmUnitController) Detail() {
 func (c *BackendCrmUnitController) Create() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -356,7 +361,8 @@ func (c *BackendCrmUnitController) Create() {
 func (c *BackendCrmUnitController) Update() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -429,7 +435,8 @@ func (c *BackendCrmUnitController) Update() {
 func (c *BackendCrmUnitController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -465,7 +472,8 @@ func (c *BackendCrmUnitController) Delete() {
 func (c *BackendCrmUnitController) InitDefault() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
-		pipelineErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		pipelineErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	added := crmInitDefaultUnits(pipelineTenantID(claims))
diff --git a/go/controllers/backend_dict.go b/go/controllers/backend_dict.go
index 30ce2bc..76dc8b2 100644
--- a/go/controllers/backend_dict.go
+++ b/go/controllers/backend_dict.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -42,22 +43,7 @@ var backendDictTagTypes = map[string]bool{
 }
 
 func (c *BackendDictController) dictClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendDictController) dictErr(httpStatus, bizCode int, msg string) {
@@ -139,7 +125,8 @@ func isGlobalDictRow(tenantID string) bool { return tenantID == globalDictTenant
 func (c *BackendDictController) ListTypes() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	page, pageSize, offset := dictPageSize(&c.Controller)
@@ -188,7 +175,8 @@ func (c *BackendDictController) ListTypes() {
 func (c *BackendDictController) CreateType() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -249,7 +237,8 @@ func (c *BackendDictController) CreateType() {
 func (c *BackendDictController) UpdateType() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -303,7 +292,8 @@ func (c *BackendDictController) UpdateType() {
 func (c *BackendDictController) DeleteType() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -349,7 +339,8 @@ func (c *BackendDictController) DeleteType() {
 func (c *BackendDictController) ListItems() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	dictID, _ := c.GetInt64("dict_id")
@@ -411,7 +402,8 @@ func (c *BackendDictController) ListItems() {
 func (c *BackendDictController) CreateItem() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -501,7 +493,8 @@ func (c *BackendDictController) CreateItem() {
 func (c *BackendDictController) UpdateItem() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -559,7 +552,8 @@ func (c *BackendDictController) UpdateItem() {
 func (c *BackendDictController) ToggleItemStatus() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -604,7 +598,8 @@ func (c *BackendDictController) ToggleItemStatus() {
 func (c *BackendDictController) DeleteItem() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -639,7 +634,8 @@ func (c *BackendDictController) DeleteItem() {
 func (c *BackendDictController) OptionsAll() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	tenantID := strconv.Itoa(claims.TenantId)
@@ -697,7 +693,8 @@ func (c *BackendDictController) OptionsAll() {
 func (c *BackendDictController) OptionsBatch() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -780,7 +777,8 @@ func (c *BackendDictController) OptionsBatch() {
 func (c *BackendDictController) Options() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	code := strings.TrimSpace(c.Ctx.Input.Param(":code"))
diff --git a/go/controllers/backend_domain.go b/go/controllers/backend_domain.go
index 93de83a..61eacd2 100644
--- a/go/controllers/backend_domain.go
+++ b/go/controllers/backend_domain.go
@@ -1,664 +1,666 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	"github.com/beego/beego/v2/client/orm"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// BackendDomainPoolController 主域名池管理
-type BackendDomainPoolController struct {
-	beego.Controller
-}
-
-// BackendTenantDomainController 租户域名管理
-type BackendTenantDomainController struct {
-	beego.Controller
-}
-
-func requireBackend(c *beego.Controller) (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-// ===== 主域名池 =====
-
-// Index GET /backend/domain/pool/index?page=&pageSize=&main_domain=&status=
-func (c *BackendDomainPoolController) Index() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 10)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 10
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	mainDomain := strings.TrimSpace(c.GetString("main_domain"))
-	statusStr := strings.TrimSpace(c.GetString("status"))
-
-	qs := models.Orm.QueryTable(new(models.SystemDomainPool)).Filter("delete_time__isnull", true)
-	if mainDomain != "" {
-		qs = qs.Filter("main_domain__icontains", mainDomain)
-	}
-	if statusStr != "" {
-		if st, err := strconv.Atoi(statusStr); err == nil {
-			qs = qs.Filter("status", st)
-		}
-	}
-
-	total, err := qs.Count()
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取主域名池失败: "+err.Error())
-		return
-	}
-	var rows []models.SystemDomainPool
-	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取主域名池失败: "+err.Error())
-		return
-	}
-
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		item := map[string]interface{}{
-			"id":          rows[i].ID,
-			"main_domain": rows[i].MainDomain,
-			"status":      rows[i].Status,
-			"create_time": rows[i].CreateTime.Format("2006-01-02 15:04:05"),
-			"update_time": "",
-		}
-		if rows[i].UpdateTime != nil {
-			item["update_time"] = rows[i].UpdateTime.Format("2006-01-02 15:04:05")
-		}
-		list = append(list, item)
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"list":  list,
-			"total": total,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetEnabledDomains GET /backend/domain/pool/getEnabledDomains
-func (c *BackendDomainPoolController) GetEnabledDomains() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	var rows []models.SystemDomainPool
-	_, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("status", 1).
-		Filter("delete_time__isnull", true).
-		OrderBy("-id").
-		All(&rows)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取主域名失败: "+err.Error())
-		return
-	}
-	out := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		out = append(out, map[string]interface{}{
-			"id":          rows[i].ID,
-			"main_domain": rows[i].MainDomain,
-			"status":      rows[i].Status,
-		})
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": out}
-	_ = c.ServeJSON()
-}
-
-// Create POST /backend/domain/pool/create
-func (c *BackendDomainPoolController) Create() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p domainPoolPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	md := strings.TrimSpace(p.MainDomain)
-	if md == "" {
-		jsonErr(&c.Controller, 400, 400, "主域名不能为空")
-		return
-	}
-	if p.Status != 0 && p.Status != 1 {
-		p.Status = 1
-	}
-	// 简单去重
-	cnt, _ := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("main_domain", md).
-		Filter("delete_time__isnull", true).
-		Count()
-	if cnt > 0 {
-		jsonErr(&c.Controller, 400, 400, "主域名已存在")
-		return
-	}
-	row := &models.SystemDomainPool{MainDomain: md, Status: p.Status}
-	if _, err := models.Orm.Insert(row); err != nil {
-		jsonErr(&c.Controller, 500, 500, "创建失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "创建成功"}
-	_ = c.ServeJSON()
-}
-
-// Update POST /backend/domain/pool/update
-func (c *BackendDomainPoolController) Update() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p domainPoolPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	if p.ID == 0 {
-		jsonErr(&c.Controller, 400, 400, "id 不能为空")
-		return
-	}
-	md := strings.TrimSpace(p.MainDomain)
-	if md == "" {
-		jsonErr(&c.Controller, 400, 400, "主域名不能为空")
-		return
-	}
-	if p.Status != 0 && p.Status != 1 {
-		p.Status = 1
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("id", p.ID).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"main_domain": md, "status": p.Status, "update_time": now})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "更新失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		jsonErr(&c.Controller, 404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "更新成功"}
-	_ = c.ServeJSON()
-}
-
-// Delete DELETE /backend/domain/pool/delete/:id
-func (c *BackendDomainPoolController) Delete() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	idStr := c.Ctx.Input.Param(":id")
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil || id == 0 {
-		jsonErr(&c.Controller, 400, 400, "无效ID")
-		return
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now, "update_time": now})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "删除失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		jsonErr(&c.Controller, 404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
-	_ = c.ServeJSON()
-}
-
-// ToggleStatus POST /backend/domain/pool/toggleStatus  body:{id}
-func (c *BackendDomainPoolController) ToggleStatus() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var row models.SystemDomainPool
-	if err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("id", p.ID).
-		Filter("delete_time__isnull", true).
-		One(&row); err != nil {
-		jsonErr(&c.Controller, 404, 404, "记录不存在")
-		return
-	}
-	newStatus := int8(1)
-	if row.Status == 1 {
-		newStatus = 0
-	}
-	now := time.Now()
-	_, err = models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("id", p.ID).
-		Update(map[string]interface{}{"status": newStatus, "update_time": now})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "切换失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// ===== 租户域名 =====
-
-// Index GET /backend/domain/tenant/index?page=&pageSize=&tid=&status=&sub_domain=
-func (c *BackendTenantDomainController) Index() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 10)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 10
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	tid, _ := c.GetUint64("tid")
-	statusStr := strings.TrimSpace(c.GetString("status"))
-	keyword := strings.TrimSpace(c.GetString("sub_domain"))
-	domainTypeStr := strings.TrimSpace(c.GetString("domain_type"))
-
-	// 条件一次性拼好：SetCond 会覆盖 Filter 累积的条件，不能混用
-	cond := orm.NewCondition().And("delete_time__isnull", true)
-	if tid > 0 {
-		cond = cond.And("tid", tid)
-	}
-	if statusStr != "" {
-		if st, err := strconv.Atoi(statusStr); err == nil {
-			cond = cond.And("status", st)
-		}
-	}
-	if domainTypeStr != "" {
-		if dt, err := strconv.Atoi(domainTypeStr); err == nil {
-			cond = cond.And("domain_type", dt)
-		}
-	}
-	// 关键字同时匹配二级前缀与完整域名：自有域名没有 sub_domain，只能靠 full_domain 命中
-	if keyword != "" {
-		cond = cond.AndCond(orm.NewCondition().
-			Or("sub_domain__icontains", keyword).
-			Or("full_domain__icontains", keyword))
-	}
-	qs := models.Orm.QueryTable(new(models.SystemTenantDomain)).SetCond(cond)
-
-	total, err := qs.Count()
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取租户域名失败: "+err.Error())
-		return
-	}
-	var rows []models.SystemTenantDomain
-	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取租户域名失败: "+err.Error())
-		return
-	}
-	list := tenantDomainList(rows)
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{"list": list, "total": total},
-	}
-	_ = c.ServeJSON()
-}
-
-// MyDomains GET /backend/domain/tenant/myDomains
-// 租户 ID 取登录态，忽略请求参数里的 tid，避免越权查看其他租户域名。
-func (c *BackendTenantDomainController) MyDomains() {
-	claims, err := requireBackend(&c.Controller)
-	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	if claims.TenantId <= 0 {
-		jsonErr(&c.Controller, 400, 400, "当前登录账号未归属租户")
-		return
-	}
-	var rows []models.SystemTenantDomain
-	_, err = models.Orm.QueryTable(new(models.SystemTenantDomain)).
-		Filter("tid", claims.TenantId).
-		Filter("delete_time__isnull", true).
-		OrderBy("-id").
-		All(&rows)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": tenantDomainList(rows)}
-	_ = c.ServeJSON()
-}
-
-// BindCustom POST /backend/domain/tenant/bindCustom  body:{domain}
-// 绑定租户自有域名。租户 ID 取登录态。
-func (c *BackendTenantDomainController) BindCustom() {
-	claims, err := requireBackend(&c.Controller)
-	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	if claims.TenantId <= 0 {
-		jsonErr(&c.Controller, 400, 400, "当前登录账号未归属租户")
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p customDomainPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	id, status, errMsg := bindCustomDomain(uint64(claims.TenantId), p.Domain)
-	if errMsg != "" {
-		jsonErr(&c.Controller, status, status, errMsg)
-		return
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "绑定成功，请按提示配置解析后点击「检测解析」",
-		"data": map[string]interface{}{"id": id},
-	}
-	_ = c.ServeJSON()
-}
-
-// CheckCustomDns POST /backend/domain/tenant/checkCustomDns  body:{id}
-// 检测自有域名解析，通过后异步申请 HTTPS 证书。
-func (c *BackendTenantDomainController) CheckCustomDns() {
-	claims, err := requireBackend(&c.Controller)
-	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	if claims.TenantId <= 0 {
-		jsonErr(&c.Controller, 400, 400, "当前登录账号未归属租户")
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p domainIDPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	data, status, errMsg := checkCustomDomainDNS(p.ID, uint64(claims.TenantId))
-	if errMsg != "" {
-		jsonErr(&c.Controller, status, status, errMsg)
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
-	_ = c.ServeJSON()
-}
-
-// CustomDomainGuide GET /backend/domain/tenant/customDomainGuide
-// 返回租户该怎么配解析（CNAME 目标 / A 记录 IP），前端不硬编码。
-func (c *BackendTenantDomainController) CustomDomainGuide() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": customDomainGuideData()}
-	_ = c.ServeJSON()
-}
-
-// Apply POST /backend/domain/tenant/apply  body:{sub_domain,main_domain}
-// 租户 ID 取登录态，不信请求体，避免替其他租户申请。
-func (c *BackendTenantDomainController) Apply() {
-	claims, err := requireBackend(&c.Controller)
-	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		SubDomain  string `json:"sub_domain"`
-		MainDomain string `json:"main_domain"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	if claims.TenantId <= 0 {
-		jsonErr(&c.Controller, 400, 400, "当前登录账号未归属租户")
-		return
-	}
-	tenantID := uint64(claims.TenantId)
-	sub := strings.TrimSpace(p.SubDomain)
-	main := strings.TrimSpace(p.MainDomain)
-	if sub == "" {
-		jsonErr(&c.Controller, 400, 400, "二级域名前缀不能为空")
-		return
-	}
-	if main == "" {
-		jsonErr(&c.Controller, 400, 400, "请选择主域名")
-		return
-	}
-	if !subDomainRe.MatchString(sub) {
-		jsonErr(&c.Controller, 400, 400, "二级域名前缀格式不正确")
-		return
-	}
-
-	// 该租户是否已申请过平台二级域名（自有域名单独计数，两者可以共存）
-	cnt, _ := models.Orm.QueryTable(new(models.SystemTenantDomain)).
-		Filter("tid", tenantID).
-		Filter("domain_type", models.DomainTypePlatformSub).
-		Filter("delete_time__isnull", true).
-		Count()
-	if cnt > 0 {
-		jsonErr(&c.Controller, 400, 400, "该租户已有二级域名，请删除后再次申请")
-		return
-	}
-
-	// 主域名存在且启用
-	var pool models.SystemDomainPool
-	if err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("main_domain", main).
-		Filter("status", 1).
-		Filter("delete_time__isnull", true).
-		One(&pool); err != nil {
-		jsonErr(&c.Controller, 400, 400, "主域名不存在或已禁用")
-		return
-	}
-
-	// 二级域名是否已被使用（同主域名下）
-	used, _ := models.Orm.QueryTable(new(models.SystemTenantDomain)).
-		Filter("sub_domain", sub).
-		Filter("main_domain", main).
-		Filter("delete_time__isnull", true).
-		Count()
-	if used > 0 {
-		jsonErr(&c.Controller, 400, 400, "该二级域名已被使用")
-		return
-	}
-
-	full := sub + "." + main
-	now := time.Now()
-	tid := tenantID
-	row := &models.SystemTenantDomain{
-		Tid:        &tid,
-		DomainType: models.DomainTypePlatformSub,
-		SubDomain:  &sub,
-		MainDomain: &main,
-		FullDomain: &full,
-		Status:     0,
-		CreateTime: now,
-		UpdateTime: &now,
-	}
-	id, err := models.Orm.Insert(row)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "申请失败: "+err.Error())
-		return
-	}
-	// 提交后进入平台侧审批流（backend 提起、platform 审核）；严格：未配置流程/无有效审批人则提交失败并回滚
-	if errMsg := submitDomainApprovalChecked(uint64(id), tenantID, uint64(claims.UserID), claims.Username, full); errMsg != "" {
-		jsonErr(&c.Controller, 400, 400, errMsg)
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "申请提交成功，等待审批", "data": map[string]interface{}{"id": uint64(id)}}
-	_ = c.ServeJSON()
-}
-
-// ToggleStatus POST /backend/domain/tenant/toggleStatus body:{id}
-func (c *BackendTenantDomainController) ToggleStatus() {
-	if _, err := requireBackend(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var row models.SystemTenantDomain
-	if err := models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).One(&row); err != nil {
-		jsonErr(&c.Controller, 404, 404, "域名不存在")
-		return
-	}
-	if row.Status == 0 {
-		if row.DomainType == models.DomainTypeCustom {
-			jsonErr(&c.Controller, 400, 400, "该域名尚未生效（解析或证书未就绪），无需禁用")
-		} else {
-			jsonErr(&c.Controller, 400, 400, "审核中不可操作")
-		}
-		return
-	}
-	newStatus := 2
-	if row.Status == 2 {
-		// 自有域名重新启用要求证书还在，否则启用后访问会报证书错误
-		if row.DomainType == models.DomainTypeCustom && row.SSLStatus != models.SSLStatusIssued {
-			jsonErr(&c.Controller, 400, 400, "该域名的 HTTPS 证书未就绪，请先检测解析并等待证书签发")
-			return
-		}
-		newStatus = 1
-	}
-	now := time.Now()
-	_, err = models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).Update(map[string]interface{}{
-		"status":      newStatus,
-		"update_time": now,
-	})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "操作失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// Delete DELETE /backend/domain/tenant/delete/:id
-// 只能删除本租户的域名记录。
-func (c *BackendTenantDomainController) Delete() {
-	claims, err := requireBackend(&c.Controller)
-	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	idStr := c.Ctx.Input.Param(":id")
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil || id == 0 {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	qs := models.Orm.QueryTable(new(models.SystemTenantDomain)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true)
-	if claims.TenantId > 0 {
-		qs = qs.Filter("tid", claims.TenantId)
-	}
-	now := time.Now()
-	n, err := qs.Update(map[string]interface{}{"delete_time": now, "update_time": now})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "删除失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		jsonErr(&c.Controller, 404, 404, "域名不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
-	_ = c.ServeJSON()
-}
-
-// 用于复杂筛选时可扩展：当前保留 orm.Condition import，避免被 gofmt 删除
-var _ = orm.NewCondition
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	"github.com/beego/beego/v2/client/orm"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// BackendDomainPoolController 主域名池管理
+type BackendDomainPoolController struct {
+	beego.Controller
+}
+
+// BackendTenantDomainController 租户域名管理
+type BackendTenantDomainController struct {
+	beego.Controller
+}
+
+func requireBackend(c *beego.Controller) (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+}
+
+// ===== 主域名池 =====
+
+// Index GET /backend/domain/pool/index?page=&pageSize=&main_domain=&status=
+func (c *BackendDomainPoolController) Index() {
+	if _, err := requireBackend(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 10)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 10
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	mainDomain := strings.TrimSpace(c.GetString("main_domain"))
+	statusStr := strings.TrimSpace(c.GetString("status"))
+
+	qs := models.Orm.QueryTable(new(models.SystemDomainPool)).Filter("delete_time__isnull", true)
+	if mainDomain != "" {
+		qs = qs.Filter("main_domain__icontains", mainDomain)
+	}
+	if statusStr != "" {
+		if st, err := strconv.Atoi(statusStr); err == nil {
+			qs = qs.Filter("status", st)
+		}
+	}
+
+	total, err := qs.Count()
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取主域名池失败: "+err.Error())
+		return
+	}
+	var rows []models.SystemDomainPool
+	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取主域名池失败: "+err.Error())
+		return
+	}
+
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		item := map[string]interface{}{
+			"id":          rows[i].ID,
+			"main_domain": rows[i].MainDomain,
+			"status":      rows[i].Status,
+			"create_time": rows[i].CreateTime.Format("2006-01-02 15:04:05"),
+			"update_time": "",
+		}
+		if rows[i].UpdateTime != nil {
+			item["update_time"] = rows[i].UpdateTime.Format("2006-01-02 15:04:05")
+		}
+		list = append(list, item)
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"list":  list,
+			"total": total,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetEnabledDomains GET /backend/domain/pool/getEnabledDomains
+func (c *BackendDomainPoolController) GetEnabledDomains() {
+	if _, err := requireBackend(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	var rows []models.SystemDomainPool
+	_, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("status", 1).
+		Filter("delete_time__isnull", true).
+		OrderBy("-id").
+		All(&rows)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取主域名失败: "+err.Error())
+		return
+	}
+	out := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		out = append(out, map[string]interface{}{
+			"id":          rows[i].ID,
+			"main_domain": rows[i].MainDomain,
+			"status":      rows[i].Status,
+		})
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": out}
+	_ = c.ServeJSON()
+}
+
+// Create POST /backend/domain/pool/create
+func (c *BackendDomainPoolController) Create() {
+	if _, err := requireBackend(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p domainPoolPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	md := strings.TrimSpace(p.MainDomain)
+	if md == "" {
+		jsonErr(&c.Controller, 400, 400, "主域名不能为空")
+		return
+	}
+	if p.Status != 0 && p.Status != 1 {
+		p.Status = 1
+	}
+	// 简单去重
+	cnt, _ := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("main_domain", md).
+		Filter("delete_time__isnull", true).
+		Count()
+	if cnt > 0 {
+		jsonErr(&c.Controller, 400, 400, "主域名已存在")
+		return
+	}
+	row := &models.SystemDomainPool{MainDomain: md, Status: p.Status}
+	if _, err := models.Orm.Insert(row); err != nil {
+		jsonErr(&c.Controller, 500, 500, "创建失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "创建成功"}
+	_ = c.ServeJSON()
+}
+
+// Update POST /backend/domain/pool/update
+func (c *BackendDomainPoolController) Update() {
+	if _, err := requireBackend(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p domainPoolPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	if p.ID == 0 {
+		jsonErr(&c.Controller, 400, 400, "id 不能为空")
+		return
+	}
+	md := strings.TrimSpace(p.MainDomain)
+	if md == "" {
+		jsonErr(&c.Controller, 400, 400, "主域名不能为空")
+		return
+	}
+	if p.Status != 0 && p.Status != 1 {
+		p.Status = 1
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("id", p.ID).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"main_domain": md, "status": p.Status, "update_time": now})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "更新失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		jsonErr(&c.Controller, 404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "更新成功"}
+	_ = c.ServeJSON()
+}
+
+// Delete DELETE /backend/domain/pool/delete/:id
+func (c *BackendDomainPoolController) Delete() {
+	if _, err := requireBackend(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	idStr := c.Ctx.Input.Param(":id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil || id == 0 {
+		jsonErr(&c.Controller, 400, 400, "无效ID")
+		return
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now, "update_time": now})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "删除失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		jsonErr(&c.Controller, 404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
+	_ = c.ServeJSON()
+}
+
+// ToggleStatus POST /backend/domain/pool/toggleStatus  body:{id}
+func (c *BackendDomainPoolController) ToggleStatus() {
+	if _, err := requireBackend(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var row models.SystemDomainPool
+	if err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("id", p.ID).
+		Filter("delete_time__isnull", true).
+		One(&row); err != nil {
+		jsonErr(&c.Controller, 404, 404, "记录不存在")
+		return
+	}
+	newStatus := int8(1)
+	if row.Status == 1 {
+		newStatus = 0
+	}
+	now := time.Now()
+	_, err = models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("id", p.ID).
+		Update(map[string]interface{}{"status": newStatus, "update_time": now})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "切换失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// ===== 租户域名 =====
+
+// Index GET /backend/domain/tenant/index?page=&pageSize=&tid=&status=&sub_domain=
+func (c *BackendTenantDomainController) Index() {
+	claims, err := requireBackend(&c.Controller)
+	if err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 10)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 10
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	// 只看自己企业的域名：?tid= 一律忽略（此前可指定他人 tid，不传时更是列出全部租户）
+	tid := uint64(claims.TenantId)
+	statusStr := strings.TrimSpace(c.GetString("status"))
+	keyword := strings.TrimSpace(c.GetString("sub_domain"))
+	domainTypeStr := strings.TrimSpace(c.GetString("domain_type"))
+	if tid == 0 {
+		jsonErr(&c.Controller, 403, 403, "登录态未绑定企业")
+		return
+	}
+
+	// 条件一次性拼好：SetCond 会覆盖 Filter 累积的条件，不能混用
+	cond := orm.NewCondition().And("delete_time__isnull", true).And("tid", tid)
+	if statusStr != "" {
+		if st, err := strconv.Atoi(statusStr); err == nil {
+			cond = cond.And("status", st)
+		}
+	}
+	if domainTypeStr != "" {
+		if dt, err := strconv.Atoi(domainTypeStr); err == nil {
+			cond = cond.And("domain_type", dt)
+		}
+	}
+	// 关键字同时匹配二级前缀与完整域名：自有域名没有 sub_domain，只能靠 full_domain 命中
+	if keyword != "" {
+		cond = cond.AndCond(orm.NewCondition().
+			Or("sub_domain__icontains", keyword).
+			Or("full_domain__icontains", keyword))
+	}
+	qs := models.Orm.QueryTable(new(models.SystemTenantDomain)).SetCond(cond)
+
+	total, err := qs.Count()
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取租户域名失败: "+err.Error())
+		return
+	}
+	var rows []models.SystemTenantDomain
+	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取租户域名失败: "+err.Error())
+		return
+	}
+	list := tenantDomainList(rows)
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{"list": list, "total": total},
+	}
+	_ = c.ServeJSON()
+}
+
+// MyDomains GET /backend/domain/tenant/myDomains
+// 租户 ID 取登录态，忽略请求参数里的 tid，避免越权查看其他租户域名。
+func (c *BackendTenantDomainController) MyDomains() {
+	claims, err := requireBackend(&c.Controller)
+	if err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	if claims.TenantId <= 0 {
+		jsonErr(&c.Controller, 400, 400, "当前登录账号未归属租户")
+		return
+	}
+	var rows []models.SystemTenantDomain
+	_, err = models.Orm.QueryTable(new(models.SystemTenantDomain)).
+		Filter("tid", claims.TenantId).
+		Filter("delete_time__isnull", true).
+		OrderBy("-id").
+		All(&rows)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": tenantDomainList(rows)}
+	_ = c.ServeJSON()
+}
+
+// BindCustom POST /backend/domain/tenant/bindCustom  body:{domain}
+// 绑定租户自有域名。租户 ID 取登录态。
+func (c *BackendTenantDomainController) BindCustom() {
+	claims, err := requireBackend(&c.Controller)
+	if err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	if claims.TenantId <= 0 {
+		jsonErr(&c.Controller, 400, 400, "当前登录账号未归属租户")
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p customDomainPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	id, status, errMsg := bindCustomDomain(uint64(claims.TenantId), p.Domain)
+	if errMsg != "" {
+		jsonErr(&c.Controller, status, status, errMsg)
+		return
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "绑定成功，请按提示配置解析后点击「检测解析」",
+		"data": map[string]interface{}{"id": id},
+	}
+	_ = c.ServeJSON()
+}
+
+// CheckCustomDns POST /backend/domain/tenant/checkCustomDns  body:{id}
+// 检测自有域名解析，通过后异步申请 HTTPS 证书。
+func (c *BackendTenantDomainController) CheckCustomDns() {
+	claims, err := requireBackend(&c.Controller)
+	if err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	if claims.TenantId <= 0 {
+		jsonErr(&c.Controller, 400, 400, "当前登录账号未归属租户")
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p domainIDPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	data, status, errMsg := checkCustomDomainDNS(p.ID, uint64(claims.TenantId))
+	if errMsg != "" {
+		jsonErr(&c.Controller, status, status, errMsg)
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+// CustomDomainGuide GET /backend/domain/tenant/customDomainGuide
+// 返回租户该怎么配解析（CNAME 目标 / A 记录 IP），前端不硬编码。
+func (c *BackendTenantDomainController) CustomDomainGuide() {
+	if _, err := requireBackend(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": customDomainGuideData()}
+	_ = c.ServeJSON()
+}
+
+// Apply POST /backend/domain/tenant/apply  body:{sub_domain,main_domain}
+// 租户 ID 取登录态，不信请求体，避免替其他租户申请。
+func (c *BackendTenantDomainController) Apply() {
+	claims, err := requireBackend(&c.Controller)
+	if err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		SubDomain  string `json:"sub_domain"`
+		MainDomain string `json:"main_domain"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	if claims.TenantId <= 0 {
+		jsonErr(&c.Controller, 400, 400, "当前登录账号未归属租户")
+		return
+	}
+	tenantID := uint64(claims.TenantId)
+	sub := strings.TrimSpace(p.SubDomain)
+	main := strings.TrimSpace(p.MainDomain)
+	if sub == "" {
+		jsonErr(&c.Controller, 400, 400, "二级域名前缀不能为空")
+		return
+	}
+	if main == "" {
+		jsonErr(&c.Controller, 400, 400, "请选择主域名")
+		return
+	}
+	if !subDomainRe.MatchString(sub) {
+		jsonErr(&c.Controller, 400, 400, "二级域名前缀格式不正确")
+		return
+	}
+
+	// 该租户是否已申请过平台二级域名（自有域名单独计数，两者可以共存）
+	cnt, _ := models.Orm.QueryTable(new(models.SystemTenantDomain)).
+		Filter("tid", tenantID).
+		Filter("domain_type", models.DomainTypePlatformSub).
+		Filter("delete_time__isnull", true).
+		Count()
+	if cnt > 0 {
+		jsonErr(&c.Controller, 400, 400, "该租户已有二级域名，请删除后再次申请")
+		return
+	}
+
+	// 主域名存在且启用
+	var pool models.SystemDomainPool
+	if err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("main_domain", main).
+		Filter("status", 1).
+		Filter("delete_time__isnull", true).
+		One(&pool); err != nil {
+		jsonErr(&c.Controller, 400, 400, "主域名不存在或已禁用")
+		return
+	}
+
+	// 二级域名是否已被使用（同主域名下）
+	used, _ := models.Orm.QueryTable(new(models.SystemTenantDomain)).
+		Filter("sub_domain", sub).
+		Filter("main_domain", main).
+		Filter("delete_time__isnull", true).
+		Count()
+	if used > 0 {
+		jsonErr(&c.Controller, 400, 400, "该二级域名已被使用")
+		return
+	}
+
+	full := sub + "." + main
+	now := time.Now()
+	tid := tenantID
+	row := &models.SystemTenantDomain{
+		Tid:        &tid,
+		DomainType: models.DomainTypePlatformSub,
+		SubDomain:  &sub,
+		MainDomain: &main,
+		FullDomain: &full,
+		Status:     0,
+		CreateTime: now,
+		UpdateTime: &now,
+	}
+	id, err := models.Orm.Insert(row)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "申请失败: "+err.Error())
+		return
+	}
+	// 提交后进入平台侧审批流（backend 提起、platform 审核）；严格：未配置流程/无有效审批人则提交失败并回滚
+	if errMsg := submitDomainApprovalChecked(uint64(id), tenantID, uint64(claims.UserID), claims.Username, full); errMsg != "" {
+		jsonErr(&c.Controller, 400, 400, errMsg)
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "申请提交成功，等待审批", "data": map[string]interface{}{"id": uint64(id)}}
+	_ = c.ServeJSON()
+}
+
+// ToggleStatus POST /backend/domain/tenant/toggleStatus body:{id}
+func (c *BackendTenantDomainController) ToggleStatus() {
+	if _, err := requireBackend(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var row models.SystemTenantDomain
+	if err := models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).One(&row); err != nil {
+		jsonErr(&c.Controller, 404, 404, "域名不存在")
+		return
+	}
+	if row.Status == 0 {
+		if row.DomainType == models.DomainTypeCustom {
+			jsonErr(&c.Controller, 400, 400, "该域名尚未生效（解析或证书未就绪），无需禁用")
+		} else {
+			jsonErr(&c.Controller, 400, 400, "审核中不可操作")
+		}
+		return
+	}
+	newStatus := 2
+	if row.Status == 2 {
+		// 自有域名重新启用要求证书还在，否则启用后访问会报证书错误
+		if row.DomainType == models.DomainTypeCustom && row.SSLStatus != models.SSLStatusIssued {
+			jsonErr(&c.Controller, 400, 400, "该域名的 HTTPS 证书未就绪，请先检测解析并等待证书签发")
+			return
+		}
+		newStatus = 1
+	}
+	now := time.Now()
+	_, err = models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).Update(map[string]interface{}{
+		"status":      newStatus,
+		"update_time": now,
+	})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "操作失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// Delete DELETE /backend/domain/tenant/delete/:id
+// 只能删除本租户的域名记录。
+func (c *BackendTenantDomainController) Delete() {
+	claims, err := requireBackend(&c.Controller)
+	if err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	idStr := c.Ctx.Input.Param(":id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil || id == 0 {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	qs := models.Orm.QueryTable(new(models.SystemTenantDomain)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true)
+	if claims.TenantId > 0 {
+		qs = qs.Filter("tid", claims.TenantId)
+	}
+	now := time.Now()
+	n, err := qs.Update(map[string]interface{}{"delete_time": now, "update_time": now})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "删除失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		jsonErr(&c.Controller, 404, 404, "域名不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
+	_ = c.ServeJSON()
+}
+
+// 用于复杂筛选时可扩展：当前保留 orm.Condition import，避免被 gofmt 删除
+var _ = orm.NewCondition
diff --git a/go/controllers/backend_employee_file.go b/go/controllers/backend_employee_file.go
index e56cb47..444fb9d 100644
--- a/go/controllers/backend_employee_file.go
+++ b/go/controllers/backend_employee_file.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -25,22 +26,7 @@ type BackendEmployeeFileController struct {
 }
 
 func (c *BackendEmployeeFileController) efClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendEmployeeFileController) efOk(data interface{}) {
@@ -319,7 +305,8 @@ func (c *BackendEmployeeFileController) efAssembleDTOList(tid int, files []model
 func (c *BackendEmployeeFileController) List() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -385,7 +372,8 @@ func (c *BackendEmployeeFileController) List() {
 func (c *BackendEmployeeFileController) Stats() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -408,7 +396,8 @@ func (c *BackendEmployeeFileController) Stats() {
 func (c *BackendEmployeeFileController) Detail() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -525,7 +514,8 @@ func (c *BackendEmployeeFileController) efParsePayload() (employeeFilePayload, b
 func (c *BackendEmployeeFileController) Create() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -609,7 +599,8 @@ func (c *BackendEmployeeFileController) Create() {
 func (c *BackendEmployeeFileController) Update() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -682,7 +673,8 @@ type employeeFileCertificatesPayload struct {
 func (c *BackendEmployeeFileController) UpdateCertificates() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -739,7 +731,8 @@ func (c *BackendEmployeeFileController) UpdateCertificates() {
 func (c *BackendEmployeeFileController) Delete() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -779,7 +772,8 @@ func (c *BackendEmployeeFileController) Delete() {
 func (c *BackendEmployeeFileController) FiledEmployees() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -858,7 +852,8 @@ func (c *BackendEmployeeFileController) efParseRecordPayload() (employeeFileReco
 func (c *BackendEmployeeFileController) CreateRecord() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -904,7 +899,8 @@ func (c *BackendEmployeeFileController) CreateRecord() {
 func (c *BackendEmployeeFileController) UpdateRecord() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
@@ -956,7 +952,8 @@ func (c *BackendEmployeeFileController) UpdateRecord() {
 func (c *BackendEmployeeFileController) DeleteRecord() {
 	claims, err := c.efClaims()
 	if err != nil {
-		c.efErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.efErr(code, code, err.Error())
 		return
 	}
 	tid := claims.TenantId
diff --git a/go/controllers/backend_erp_account_set.go b/go/controllers/backend_erp_account_set.go
index d6105f9..81f1278 100644
--- a/go/controllers/backend_erp_account_set.go
+++ b/go/controllers/backend_erp_account_set.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -20,22 +21,7 @@ type BackendErpAccountSetController struct {
 }
 
 func (c *BackendErpAccountSetController) asClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendErpAccountSetController) asJsonErr(httpStatus, bizCode int, msg string) {
@@ -67,7 +53,8 @@ type accountSetFormPayload struct {
 func (c *BackendErpAccountSetController) List() {
 	claims, err := c.asClaims()
 	if err != nil {
-		c.asJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.asJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -115,7 +102,8 @@ func (c *BackendErpAccountSetController) List() {
 func (c *BackendErpAccountSetController) Detail() {
 	claims, err := c.asClaims()
 	if err != nil {
-		c.asJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.asJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -143,7 +131,8 @@ func (c *BackendErpAccountSetController) Detail() {
 func (c *BackendErpAccountSetController) Create() {
 	claims, err := c.asClaims()
 	if err != nil {
-		c.asJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.asJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -216,7 +205,8 @@ func (c *BackendErpAccountSetController) Create() {
 func (c *BackendErpAccountSetController) Update() {
 	claims, err := c.asClaims()
 	if err != nil {
-		c.asJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.asJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -274,7 +264,8 @@ func (c *BackendErpAccountSetController) Update() {
 func (c *BackendErpAccountSetController) Delete() {
 	claims, err := c.asClaims()
 	if err != nil {
-		c.asJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.asJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -305,7 +296,8 @@ func (c *BackendErpAccountSetController) Delete() {
 func (c *BackendErpAccountSetController) ToggleStatus() {
 	claims, err := c.asClaims()
 	if err != nil {
-		c.asJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.asJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_erp_base.go b/go/controllers/backend_erp_base.go
new file mode 100644
index 0000000..68fc9ea
--- /dev/null
+++ b/go/controllers/backend_erp_base.go
@@ -0,0 +1,240 @@
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	"github.com/beego/beego/v2/client/orm"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// BackendErpBaseController 进销存交易/档案类接口的公共底座。
+//
+// 沿用 ERP 家族既有约定：控制器自解 Authorization（不依赖全局中间件），
+// tenant_id 以字符串形式落库，所有查询都必须带 tenant_id 过滤，避免跨租户串数据。
+// 响应口径与 backend_erp_customer.go 一致：{code,msg,data} + 分页 {list,total,page,pageSize}。
+type BackendErpBaseController struct {
+	beego.Controller
+}
+
+// claims 解析租户端 JWT，仅允许 backend 身份。
+func (c *BackendErpBaseController) claims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+}
+
+// tid 当前租户ID的字符串口径（ERP 表统一使用）
+func (c *BackendErpBaseController) tid(cl *jwtutil.Claims) string {
+	return fmt.Sprintf("%d", cl.TenantId)
+}
+
+func (c *BackendErpBaseController) ok(data interface{}) {
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+func (c *BackendErpBaseController) listOK(list interface{}, total int64, page, pageSize int) {
+	c.ok(map[string]interface{}{"list": list, "total": total, "page": page, "pageSize": pageSize})
+}
+
+func (c *BackendErpBaseController) fail(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// denied 鉴权失败统一出口（返回 true 表示已响应，调用方应 return）
+func (c *BackendErpBaseController) denied(err error) bool {
+	if err != nil {
+		code := identity.Status(err)
+		c.fail(code, code, err.Error())
+		return true
+	}
+	return false
+}
+
+func (c *BackendErpBaseController) pathID() uint64 {
+	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	return id
+}
+
+// pageArgs 分页参数：默认 20，上限 100
+func (c *BackendErpBaseController) pageArgs() (int, int) {
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 20)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 || pageSize > 100 {
+		pageSize = 20
+	}
+	return page, pageSize
+}
+
+// bindJSON 解析请求体，失败时已响应
+func (c *BackendErpBaseController) bindJSON(v interface{}) bool {
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.fail(400, 400, "参数错误")
+		return false
+	}
+	if len(strings.TrimSpace(string(raw))) == 0 {
+		c.fail(400, 400, "请求体为空")
+		return false
+	}
+	if err := json.Unmarshal(raw, v); err != nil {
+		c.fail(400, 400, "参数错误: "+err.Error())
+		return false
+	}
+	return true
+}
+
+func erpUintParam(v string) uint64 {
+	n, _ := strconv.ParseUint(strings.TrimSpace(v), 10, 64)
+	return n
+}
+
+// erpUserOrgID 发起人所属组织，供审批引擎按「部门主管」规则解析审批人
+func erpUserOrgID(tid, uid uint64) uint64 {
+	var tu models.SystemTenantUser
+	if err := models.Orm.QueryTable(new(models.SystemTenantUser)).
+		Filter("uid", uid).Filter("tid", tid).
+		Filter("delete_time__isnull", true).One(&tu); err != nil {
+		return 0
+	}
+	return tu.OrgID
+}
+
+// erpDocTypes 合法单据类型白名单，防止未知类型绕过效果引擎
+var erpDocTypes = map[string]bool{
+	models.ErpDocPurchaseOrder:  true,
+	models.ErpDocPurchaseIn:     true,
+	models.ErpDocPurchaseReturn: true,
+	models.ErpDocSalesOrder:     true,
+	models.ErpDocSalesOut:       true,
+	models.ErpDocSalesReturn:    true,
+	models.ErpDocOtherIn:        true,
+	models.ErpDocOtherOut:       true,
+	models.ErpDocTransfer:       true,
+	models.ErpDocStockTake:      true,
+}
+
+func erpPartnerLabel(partnerType string) string {
+	if partnerType == "supplier" {
+		return "供应商"
+	}
+	return "客户"
+}
+
+// erpLoadDoc 按租户取单据（所有单据读写入口都先过这一层，保证租户隔离）
+func erpLoadDoc(docID uint64, tenantID string) (*models.ErpDocument, error) {
+	var doc models.ErpDocument
+	if err := models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("id", docID).Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).One(&doc); err != nil {
+		return nil, err
+	}
+	return &doc, nil
+}
+
+// erpDocItems 取单据明细（按行序）
+func erpDocItems(o orm.QueryExecutor, docID uint64) []models.ErpDocumentItem {
+	var items []models.ErpDocumentItem
+	_, _ = o.QueryTable(new(models.ErpDocumentItem)).
+		Filter("doc_id", docID).OrderBy("sort_order", "id").All(&items)
+	return items
+}
+
+// erpFillItemStock 给明细行补商品编码/单位与当前可用库存，供开单界面展示。
+// fallbackWh：明细行没落仓库时的归属仓（单据表头仓库），否则结存恒查不到、界面显示 0。
+func erpFillItemStock(tenantID string, items []models.ErpDocumentItem, fallbackWh uint64) {
+	if len(items) == 0 {
+		return
+	}
+	ids := make([]uint64, 0, len(items))
+	for _, it := range items {
+		if it.ProductID > 0 {
+			ids = append(ids, it.ProductID)
+		}
+	}
+	var products []models.ErpProduct
+	_, _ = models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("id__in", ids).
+		All(&products, "id", "product_code", "base_unit", "spec")
+	pmap := make(map[uint64]models.ErpProduct, len(products))
+	for _, p := range products {
+		pmap[p.ID] = p
+	}
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tenantID).Filter("product_id__in", ids).
+		All(&stocks, "product_id", "warehouse_id", "quantity")
+	type whKey struct{ productID, warehouseID uint64 }
+	qmap := map[whKey]float64{}
+	for _, s := range stocks {
+		qmap[whKey{s.ProductID, s.WarehouseID}] += s.Quantity
+	}
+	for i := range items {
+		if p, hit := pmap[items[i].ProductID]; hit {
+			items[i].ProductCode = p.ProductCode
+			if items[i].BaseUnit == "" {
+				items[i].BaseUnit = p.BaseUnit
+			}
+		}
+		wh := items[i].WarehouseID
+		if wh == 0 {
+			wh = fallbackWh
+		}
+		items[i].StockQty = qmap[whKey{items[i].ProductID, wh}]
+	}
+}
+
+// erpFillDocNames 给单据补仓库名/来源单号，列表与详情共用
+func erpFillDocNames(docs []models.ErpDocument) {
+	if len(docs) == 0 {
+		return
+	}
+	whIDs := make([]uint64, 0, len(docs)*2)
+	srcIDs := make([]uint64, 0, len(docs))
+	for _, d := range docs {
+		if d.WarehouseID > 0 {
+			whIDs = append(whIDs, d.WarehouseID)
+		}
+		if d.ToWarehouseID > 0 {
+			whIDs = append(whIDs, d.ToWarehouseID)
+		}
+		if d.SourceDocID > 0 {
+			srcIDs = append(srcIDs, d.SourceDocID)
+		}
+	}
+	names := map[uint64]string{}
+	if len(whIDs) > 0 {
+		var whs []models.ErpWarehouse
+		_, _ = models.Orm.QueryTable(new(models.ErpWarehouse)).
+			Filter("id__in", whIDs).All(&whs, "id", "warehouse_name")
+		for _, w := range whs {
+			names[w.ID] = w.WarehouseName
+		}
+	}
+	srcNos := map[uint64]string{}
+	if len(srcIDs) > 0 {
+		var srcs []models.ErpDocument
+		_, _ = models.Orm.QueryTable(new(models.ErpDocument)).
+			Filter("id__in", srcIDs).All(&srcs, "id", "doc_no")
+		for _, s := range srcs {
+			srcNos[s.ID] = s.DocNo
+		}
+	}
+	for i := range docs {
+		docs[i].WarehouseName = names[docs[i].WarehouseID]
+		docs[i].ToWarehouseName = names[docs[i].ToWarehouseID]
+		docs[i].SourceDocNo = srcNos[docs[i].SourceDocID]
+		docs[i].DocTypeLabel = models.ErpDocTypeLabel[docs[i].DocType]
+	}
+}
diff --git a/go/controllers/backend_erp_company_contact.go b/go/controllers/backend_erp_company_contact.go
index 5460c42..09c9c08 100644
--- a/go/controllers/backend_erp_company_contact.go
+++ b/go/controllers/backend_erp_company_contact.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -20,22 +21,7 @@ type BackendErpCompanyContactController struct {
 }
 
 func (c *BackendErpCompanyContactController) contactClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendErpCompanyContactController) contactJsonErr(httpStatus, bizCode int, msg string) {
@@ -72,7 +58,8 @@ type companyContactPayload struct {
 func (c *BackendErpCompanyContactController) List() {
 	claims, err := c.contactClaims()
 	if err != nil {
-		c.contactJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.contactJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -110,7 +97,8 @@ func (c *BackendErpCompanyContactController) List() {
 func (c *BackendErpCompanyContactController) Create() {
 	claims, err := c.contactClaims()
 	if err != nil {
-		c.contactJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.contactJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -169,7 +157,8 @@ func (c *BackendErpCompanyContactController) Create() {
 func (c *BackendErpCompanyContactController) Update() {
 	claims, err := c.contactClaims()
 	if err != nil {
-		c.contactJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.contactJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -230,7 +219,8 @@ func (c *BackendErpCompanyContactController) Update() {
 func (c *BackendErpCompanyContactController) Delete() {
 	claims, err := c.contactClaims()
 	if err != nil {
-		c.contactJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.contactJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_erp_customer.go b/go/controllers/backend_erp_customer.go
index 6f22f50..5fe9834 100644
--- a/go/controllers/backend_erp_customer.go
+++ b/go/controllers/backend_erp_customer.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -20,22 +21,7 @@ type BackendErpCustomerController struct {
 }
 
 func (c *BackendErpCustomerController) customerClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendErpCustomerController) customerJsonErr(httpStatus, bizCode int, msg string) {
@@ -76,13 +62,16 @@ type customerFormPayload struct {
 	BankAccount       string  `json:"bank_account"`
 	RegisteredAddress string  `json:"registered_address"`
 	RegisteredPhone   string  `json:"registered_phone"`
+	CreditLimit       float64 `json:"credit_limit"`
+	PaymentDays       int     `json:"payment_days"`
 }
 
 // List GET /backend/erp/customer/list
 func (c *BackendErpCustomerController) List() {
 	claims, err := c.customerClaims()
 	if err != nil {
-		c.customerJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.customerJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -158,7 +147,8 @@ func (c *BackendErpCustomerController) List() {
 func (c *BackendErpCustomerController) Detail() {
 	claims, err := c.customerClaims()
 	if err != nil {
-		c.customerJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.customerJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -189,7 +179,8 @@ func (c *BackendErpCustomerController) Detail() {
 func (c *BackendErpCustomerController) ConvertToSupplier() {
 	claims, err := c.customerClaims()
 	if err != nil {
-		c.customerJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.customerJsonErr(code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -228,7 +219,8 @@ func (c *BackendErpCustomerController) ConvertToSupplier() {
 func (c *BackendErpCustomerController) Create() {
 	claims, err := c.customerClaims()
 	if err != nil {
-		c.customerJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.customerJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -278,6 +270,8 @@ func (c *BackendErpCustomerController) Create() {
 		BankAccount:       strings.TrimSpace(p.BankAccount),
 		RegisteredAddress: strings.TrimSpace(p.RegisteredAddress),
 		RegisteredPhone:   strings.TrimSpace(p.RegisteredPhone),
+		CreditLimit:       p.CreditLimit,
+		PaymentDays:       p.PaymentDays,
 		OwnerUserID:       fmt.Sprintf("%d", claims.UserID),
 		OwnerUserName:     resolveUserName(claims),
 		CreateUserID:      fmt.Sprintf("%d", claims.UserID),
@@ -320,7 +314,8 @@ func (c *BackendErpCustomerController) Create() {
 func (c *BackendErpCustomerController) Update() {
 	claims, err := c.customerClaims()
 	if err != nil {
-		c.customerJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.customerJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -375,6 +370,8 @@ func (c *BackendErpCustomerController) Update() {
 	customer.BankAccount = strings.TrimSpace(p.BankAccount)
 	customer.RegisteredAddress = strings.TrimSpace(p.RegisteredAddress)
 	customer.RegisteredPhone = strings.TrimSpace(p.RegisteredPhone)
+	customer.CreditLimit = p.CreditLimit
+	customer.PaymentDays = p.PaymentDays
 	customer.UpdateTime = time.Now()
 
 	if p.RegisterTime != "" {
@@ -412,7 +409,8 @@ func (c *BackendErpCustomerController) Update() {
 func (c *BackendErpCustomerController) Delete() {
 	claims, err := c.customerClaims()
 	if err != nil {
-		c.customerJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.customerJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -459,7 +457,8 @@ func (c *BackendErpCustomerController) Delete() {
 func (c *BackendErpCustomerController) ToggleStatus() {
 	claims, err := c.customerClaims()
 	if err != nil {
-		c.customerJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.customerJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_erp_document.go b/go/controllers/backend_erp_document.go
new file mode 100644
index 0000000..b1a659a
--- /dev/null
+++ b/go/controllers/backend_erp_document.go
@@ -0,0 +1,468 @@
+package controllers
+
+import (
+	"fmt"
+	"math"
+	"strings"
+
+	"server/models"
+	approvalEngine "server/services/approval"
+	erp "server/services/erp"
+)
+
+// BackendErpDocumentController 进销存单据中心（采购/销售/库存十类单据共用一套接口）
+//
+// 单据生命周期：草稿(0) →[提交审批]→ 审批中(1) →[引擎回调]→ 已生效(2)/已驳回(3)，
+// 或草稿/驳回/审批中 →[直接审核/作废]→ 已生效(2)/已作废(4)。
+// 只有「已生效」才由 services/erp.ApplyDocEffect 产生库存流水与往来账，
+// 库存结存一律由流水驱动，接口层不提供任何直接改库存的入口。
+//
+// 本文件只做「解令牌 + 组装参数 + 输出响应」，校验与落库统一在 erp_document_core.go，
+// 移动端 /api/erp/document* 走同一套核心，避免两端各写一遍业务规则。
+type BackendErpDocumentController struct {
+	BackendErpBaseController
+}
+
+type erpDocItemPayload struct {
+	ID             uint64  `json:"id"`
+	ProductID      uint64  `json:"product_id"`
+	ProductName    string  `json:"product_name"`
+	Spec           string  `json:"spec"`
+	Unit           string  `json:"unit"`
+	WarehouseID    uint64  `json:"warehouse_id"`
+	BatchNo        string  `json:"batch_no"`
+	Quantity       float64 `json:"quantity"`
+	BookQty        float64 `json:"book_qty"`
+	RefItemID      uint64  `json:"ref_item_id"`
+	UnitPrice      float64 `json:"unit_price"`
+	Amount         float64 `json:"amount"`
+	ProductionDate string  `json:"production_date"`
+	ExpireDate     string  `json:"expire_date"`
+	Remark         string  `json:"remark"`
+	SortOrder      int     `json:"sort_order"`
+}
+
+type erpDocPayload struct {
+	ID             uint64              `json:"id"`
+	DocNo          string              `json:"doc_no"`
+	DocType        string              `json:"doc_type"`
+	BizDate        string              `json:"biz_date"`
+	WarehouseID    uint64              `json:"warehouse_id"`
+	ToWarehouseID  uint64              `json:"to_warehouse_id"`
+	PartnerType    string              `json:"partner_type"`
+	PartnerID      uint64              `json:"partner_id"`
+	SourceDocID    uint64              `json:"source_doc_id"`
+	DiscountAmount float64             `json:"discount_amount"`
+	Remark         string              `json:"remark"`
+	Items          []erpDocItemPayload `json:"items"`
+}
+
+// docTypePartner 单据类型对应的往来单位类型（空=不需要往来单位）
+func docTypePartner(docType string) string {
+	switch docType {
+	case models.ErpDocPurchaseOrder, models.ErpDocPurchaseIn, models.ErpDocPurchaseReturn:
+		return "supplier"
+	case models.ErpDocSalesOrder, models.ErpDocSalesOut, models.ErpDocSalesReturn:
+		return "customer"
+	}
+	return ""
+}
+
+// docTypeSources 单据允许的"来源单据"类型集合（空=不限来源）。
+// 退货既可追溯到订单，也可追溯到已生效的入库/出库单，故两者都放行。
+func docTypeSources(docType string) []string {
+	switch docType {
+	case models.ErpDocPurchaseIn:
+		return []string{models.ErpDocPurchaseOrder}
+	case models.ErpDocPurchaseReturn:
+		return []string{models.ErpDocPurchaseOrder, models.ErpDocPurchaseIn}
+	case models.ErpDocSalesOut:
+		return []string{models.ErpDocSalesOrder}
+	case models.ErpDocSalesReturn:
+		return []string{models.ErpDocSalesOrder, models.ErpDocSalesOut}
+	}
+	return nil
+}
+
+// List GET /backend/erp/document/list
+func (c *BackendErpDocumentController) List() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	page, pageSize := c.pageArgs()
+
+	f := erpDocFilter{
+		DocType:     strings.TrimSpace(c.GetString("doc_type")),
+		DocTypes:    strings.TrimSpace(c.GetString("doc_types")),
+		Status:      strings.TrimSpace(c.GetString("status")),
+		Keyword:     strings.TrimSpace(c.GetString("keyword")),
+		PartnerID:   erpUintParam(c.GetString("partner_id")),
+		WarehouseID: erpUintParam(c.GetString("warehouse_id")),
+		SourceDocID: erpUintParam(c.GetString("source_doc_id")),
+		DateFrom:    strings.TrimSpace(c.GetString("date_from")),
+		DateTo:      strings.TrimSpace(c.GetString("date_to")),
+	}
+	list, total, code, msg := erpDocListCore(erpNewActor(cl), f, page, pageSize)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.listOK(list, total, page, pageSize)
+}
+
+// Detail GET /backend/erp/document/:id
+func (c *BackendErpDocumentController) Detail() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	doc, code, msg := erpDocDetailCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(doc)
+}
+
+// Save POST /backend/erp/document
+// 新建或覆盖保存草稿（payload 带 id 即为编辑）。已生效/审批中的单据不允许改动。
+func (c *BackendErpDocumentController) Save() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	var p erpDocPayload
+	if !c.bindJSON(&p) {
+		return
+	}
+	id, docNo, code, msg := erpDocSaveCore(erpNewActor(cl), p)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"id": id, "doc_no": docNo})
+}
+
+// Delete DELETE /backend/erp/document/:id 仅草稿/驳回可删除（软删）
+func (c *BackendErpDocumentController) Delete() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	code, msg := erpDocDeleteCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(nil)
+}
+
+// Cancel POST /backend/erp/document/:id/cancel 作废单据
+func (c *BackendErpDocumentController) Cancel() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	code, msg := erpDocCancelCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(nil)
+}
+
+// Approve POST /backend/erp/document/:id/approve
+// 直接审核生效（未走审批流时使用）。库存/往来账效果在同一事务内落地。
+func (c *BackendErpDocumentController) Approve() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	code, msg := erpDocApproveCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(nil)
+}
+
+// Submit POST /backend/erp/document/:id/submit
+func (c *BackendErpDocumentController) Submit() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	instID, code, msg := erpDocSubmitCore(erpNewActor(cl), c.pathID(),
+		erpUintParam(c.GetString("flow_id")))
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"instance_id": instID})
+}
+
+// Flows GET /backend/erp/document/flows?doc_type=
+// 返回该单据类型可用的审批流，前端据此决定是否显示「提交审批」。
+func (c *BackendErpDocumentController) Flows() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	bizType, flows, code, msg := erpDocFlowsCore(erpNewActor(cl), strings.TrimSpace(c.GetString("doc_type")))
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"list": flows, "biz_type": bizType})
+}
+
+// Executable GET /backend/erp/document/:id/executable
+// 取来源订单中尚可执行的明细行（入库/出库/退货按行带出，避免超收超发）。
+func (c *BackendErpDocumentController) Executable() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	data, code, msg := erpDocExecutableCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+// TakeSheet GET /backend/erp/document/takeSheet?warehouse_id=
+// 盘点表初始化：带出当前账面数量与加权成本，盘点员只改实盘数。
+func (c *BackendErpDocumentController) TakeSheet() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	wid := erpUintParam(c.GetString("warehouse_id"))
+	if wid == 0 {
+		c.fail(400, 400, "请选择仓库")
+		return
+	}
+	list, code, msg := erpTakeSheetCore(erpNewActor(cl), wid)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"list": list, "warehouse_id": wid})
+}
+
+// Meta GET /backend/erp/document/meta 前端开单页所需的字典与默认值
+func (c *BackendErpDocumentController) Meta() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	c.ok(erpDocMetaDict(erpNewActor(cl)))
+}
+
+// ---- 内部 ----
+
+// erpLinePreCheck 开单录入时的行前校验：超订单可执行量、超原单可退量、库存不足。
+// 审核生效引擎会再校验一次，这里只是让开单人当场看到问题，不用等审批完才发现。
+func erpLinePreCheck(tid string, doc *models.ErpDocument, s *erp.Settings, it *models.ErpDocumentItem) string {
+	switch doc.DocType {
+	case models.ErpDocPurchaseIn, models.ErpDocSalesOut:
+		if it.RefItemID == 0 {
+			break
+		}
+		var ref models.ErpDocumentItem
+		if models.Orm.QueryTable(new(models.ErpDocumentItem)).Filter("id", it.RefItemID).
+			One(&ref, "quantity", "executed_qty") == nil {
+			if remain := ref.Quantity - ref.ExecutedQty; it.Quantity-remain > 0.000001 {
+				return fmt.Sprintf("商品「%s」超出订单可执行数量（剩余 %.4f，本次 %.4f）", it.ProductName, remain, it.Quantity)
+			}
+		}
+	case models.ErpDocPurchaseReturn, models.ErpDocSalesReturn:
+		if it.RefItemID == 0 {
+			break
+		}
+		var ref models.ErpDocumentItem
+		if models.Orm.QueryTable(new(models.ErpDocumentItem)).Filter("id", it.RefItemID).
+			One(&ref, "quantity") == nil {
+			left := ref.Quantity - erpReturnedQty(tid, it.RefItemID, doc.ID)
+			if it.Quantity-left > 0.000001 {
+				return fmt.Sprintf("商品「%s」退货数量超出原单可退数量（可退 %.4f，本次 %.4f）", it.ProductName, left, it.Quantity)
+			}
+		}
+	}
+	var outQty float64
+	switch doc.DocType {
+	case models.ErpDocSalesOut, models.ErpDocPurchaseReturn, models.ErpDocOtherOut:
+		outQty = it.Quantity
+	case models.ErpDocTransfer:
+		outQty = it.Quantity
+	}
+	if outQty > 0 && !s.NegativeAllowed {
+		wh := it.WarehouseID
+		if wh == 0 {
+			wh = doc.WarehouseID
+		}
+		if avail := erpStockQty(tid, it.ProductID, wh, it.BatchNo); avail-outQty < -0.000001 {
+			return fmt.Sprintf("商品「%s」库存不足：可用 %.4f，本次需要 %.4f", it.ProductName, avail, outQty)
+		}
+	}
+	return ""
+}
+
+// erpPickPrice 价格体系取价：采购单取采购价，销售类按基础设置的售价类型
+func erpPickPrice(p models.ErpProduct, docType, salesPriceType string) float64 {
+	switch docType {
+	case models.ErpDocPurchaseOrder, models.ErpDocPurchaseIn, models.ErpDocOtherIn:
+		return p.PurchasePrice
+	case models.ErpDocPurchaseReturn:
+		return p.PurchasePrice
+	case models.ErpDocSalesReturn:
+		return p.SalePrice
+	case models.ErpDocSalesOrder, models.ErpDocSalesOut, models.ErpDocOtherOut:
+		switch salesPriceType {
+		case "wholesale":
+			if p.WholesalePrice > 0 {
+				return p.WholesalePrice
+			}
+		case "member":
+			if p.MemberPrice > 0 {
+				return p.MemberPrice
+			}
+		}
+		return p.SalePrice
+	}
+	return 0
+}
+
+// erpLoadEditable 取当前租户单据并校验状态在允许集合内
+func erpLoadEditable(id uint64, tid string, allow []int8) (*models.ErpDocument, string) {
+	if id == 0 {
+		return nil, "无效的ID"
+	}
+	doc, err := erpLoadDoc(id, tid)
+	if err != nil {
+		return nil, "单据未找到"
+	}
+	for _, s := range allow {
+		if doc.Status == s {
+			return doc, ""
+		}
+	}
+	return nil, "当前状态不可执行该操作"
+}
+
+func erpWarehouseOwned(tid string, id uint64) bool {
+	var w models.ErpWarehouse
+	return models.Orm.QueryTable(new(models.ErpWarehouse)).
+		Filter("id", id).Filter("tenant_id", tid).
+		Filter("delete_time__isnull", true).One(&w) == nil
+}
+
+func erpPartnerName(partnerType string, id uint64) string {
+	if id == 0 {
+		return ""
+	}
+	if partnerType == "supplier" {
+		var s models.TenantCrmSupplier
+		if err := models.Orm.QueryTable(new(models.TenantCrmSupplier)).
+			Filter("id", id).Filter("delete_time__isnull", true).One(&s); err == nil {
+			return s.SupplierName
+		}
+		return ""
+	}
+	var cu models.TenantCrmCustomer
+	if err := models.Orm.QueryTable(new(models.TenantCrmCustomer)).
+		Filter("id", id).Filter("delete_time__isnull", true).One(&cu); err == nil {
+		return cu.CustomerName
+	}
+	return ""
+}
+
+func erpProductMap(tid string, ids []uint64) map[uint64]models.ErpProduct {
+	out := map[uint64]models.ErpProduct{}
+	if len(ids) == 0 {
+		return out
+	}
+	var rows []models.ErpProduct
+	_, _ = models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", tid).Filter("id__in", ids).All(&rows)
+	for _, r := range rows {
+		out[r.ID] = r
+	}
+	return out
+}
+
+func erpStockQty(tid string, productID, warehouseID uint64, batch string) float64 {
+	var s models.ErpStock
+	if err := models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).Filter("product_id", productID).
+		Filter("warehouse_id", warehouseID).Filter("batch_no", batch).
+		One(&s, "quantity"); err == nil {
+		return s.Quantity
+	}
+	return 0
+}
+
+func erpStockCost(tid string, productID, warehouseID uint64, batch string) float64 {
+	var s models.ErpStock
+	if err := models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).Filter("product_id", productID).
+		Filter("warehouse_id", warehouseID).Filter("batch_no", batch).
+		One(&s, "cost_price"); err == nil {
+		return s.CostPrice
+	}
+	return 0
+}
+
+// erpReturnedQty 某原单行已退数量（仅统计已生效退货单，排除 excludeDocID）
+func erpReturnedQty(tid string, refItemID, excludeDocID uint64) float64 {
+	qs := models.Orm.QueryTable(new(models.ErpDocumentItem)).
+		Filter("tenant_id", tid).Filter("ref_item_id", refItemID)
+	if excludeDocID > 0 {
+		qs = qs.Exclude("doc_id", excludeDocID)
+	}
+	var sibs []models.ErpDocumentItem
+	_, _ = qs.All(&sibs, "doc_id", "quantity")
+	if len(sibs) == 0 {
+		return 0
+	}
+	ids := make([]uint64, 0, len(sibs))
+	for _, s := range sibs {
+		ids = append(ids, s.DocID)
+	}
+	var docs []models.ErpDocument
+	_, _ = models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("id__in", ids).Filter("tenant_id", tid).
+		Filter("status", models.ErpDocStatusApproved).
+		Filter("delete_time__isnull", true).All(&docs, "id")
+	alive := map[uint64]bool{}
+	for _, d := range docs {
+		alive[d.ID] = true
+	}
+	var sum float64
+	for _, s := range sibs {
+		if alive[s.DocID] {
+			sum += s.Quantity
+		}
+	}
+	return sum
+}
+
+// erpPickFlowID 单据类型可用审批流：先精确匹配 erp_xxx，再回落到模块级 erp。
+// 部门适用范围、启用状态等匹配规则统一交给引擎的 ListAvailableFlows，避免两处口径不一致。
+func erpPickFlowID(tid, orgID uint64, bizType string) uint64 {
+	for _, bt := range []string{bizType, "erp"} {
+		flows, err := approvalEngine.ListAvailableFlows(models.ApprovalScopeTenant, tid, bt, orgID)
+		if err == nil && len(flows) > 0 {
+			return flows[0].FlowID
+		}
+	}
+	return 0
+}
+
+func docTypeLabelOf(t string) string { return models.ErpDocTypeLabel[t] }
+
+func round4f(v float64) float64 {
+	return math.Round(v*10000) / 10000
+}
diff --git a/go/controllers/backend_erp_finance.go b/go/controllers/backend_erp_finance.go
new file mode 100644
index 0000000..3a5a43a
--- /dev/null
+++ b/go/controllers/backend_erp_finance.go
@@ -0,0 +1,265 @@
+package controllers
+
+import (
+	"strconv"
+	"strings"
+	"time"
+
+	erp "server/services/erp"
+)
+
+// BackendErpFinanceController 往来账（应收/应付）、收付款与核销
+//
+// 往来账由单据生效时自动生成，不开放手工新增/修改，保证「业务单据 → 往来账 → 收付款」
+// 三段可追溯；收付款单可以手工开草稿，确认后按单核销（显式指定或按到期日 FIFO）。
+// 查询与核销口径统一在 erp_finance_core.go，与移动端 /api/erp/finance* 共用。
+type BackendErpFinanceController struct {
+	BackendErpBaseController
+}
+
+// BillList GET /backend/erp/finance/bill/list 往来账列表
+func (c *BackendErpFinanceController) BillList() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	page, pageSize := c.pageArgs()
+
+	f := erpBillFilter{
+		BillType:    strings.TrimSpace(c.GetString("bill_type")),
+		PartnerID:   erpUintParam(c.GetString("partner_id")),
+		PartnerType: strings.TrimSpace(c.GetString("partner_type")),
+		SourceDocID: erpUintParam(c.GetString("source_doc_id")),
+		SettleState: strings.TrimSpace(c.GetString("settle_state")),
+		Keyword:     strings.TrimSpace(c.GetString("keyword")),
+		DateFrom:    strings.TrimSpace(c.GetString("date_from")),
+		DateTo:      strings.TrimSpace(c.GetString("date_to")),
+	}
+	list, total, summary, code, msg := erpBillListCore(erpNewActor(cl), f, page, pageSize)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{
+		"list": list, "total": total, "page": page, "pageSize": pageSize,
+		"summary": summary,
+	})
+}
+
+// BillDetail GET /backend/erp/finance/bill/:id 往来账详情（含核销记录与原单据）
+func (c *BackendErpFinanceController) BillDetail() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	data, code, msg := erpBillDetailCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+// Aging GET /backend/erp/finance/aging 账龄分析（按未结余额分桶）
+func (c *BackendErpFinanceController) Aging() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	data, code, msg := erpAgingCore(erpNewActor(cl))
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+// FundList GET /backend/erp/finance/fund/list 收付款单列表
+func (c *BackendErpFinanceController) FundList() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	page, pageSize := c.pageArgs()
+
+	f := erpFundFilter{
+		FundType:  strings.TrimSpace(c.GetString("fund_type")),
+		Status:    strings.TrimSpace(c.GetString("status")),
+		PartnerID: erpUintParam(c.GetString("partner_id")),
+		Keyword:   strings.TrimSpace(c.GetString("keyword")),
+		DateFrom:  strings.TrimSpace(c.GetString("date_from")),
+		DateTo:    strings.TrimSpace(c.GetString("date_to")),
+	}
+	rows, total, code, msg := erpFundListCore(erpNewActor(cl), f, page, pageSize)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.listOK(rows, total, page, pageSize)
+}
+
+// FundDetail GET /backend/erp/finance/fund/:id
+func (c *BackendErpFinanceController) FundDetail() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	data, code, msg := erpFundDetailCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+type erpFundPayload struct {
+	ID         uint64  `json:"id"`
+	FundType   int8    `json:"fund_type"`
+	PartnerID  uint64  `json:"partner_id"`
+	Amount     float64 `json:"amount"`
+	PayMethod  string  `json:"pay_method"`
+	PayAccount string  `json:"pay_account"`
+	BizDate    string  `json:"biz_date"`
+	Remark     string  `json:"remark"`
+}
+
+// FundSave POST /backend/erp/finance/fund 新建/修改收付款草稿
+func (c *BackendErpFinanceController) FundSave() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	var p erpFundPayload
+	if !c.bindJSON(&p) {
+		return
+	}
+	id, fundNo, code, msg := erpFundSaveCore(erpNewActor(cl), p)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"id": id, "fund_no": fundNo})
+}
+
+// FundConfirm POST /backend/erp/finance/fund/:id/confirm
+// 确认收付款并核销；body 可选 settles=[{partner_bill_id,amount}]，不传则按到期日自动 FIFO。
+func (c *BackendErpFinanceController) FundConfirm() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	var body struct {
+		Settles []erp.SettleItem `json:"settles"`
+	}
+	// 允许空 body（自动核销）
+	_ = c.bindJSON(&body)
+	code, msg := erpFundConfirmCore(erpNewActor(cl), c.pathID(), body.Settles)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(nil)
+}
+
+// FundVoid POST /backend/erp/finance/fund/:id/void
+func (c *BackendErpFinanceController) FundVoid() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	code, msg := erpFundVoidCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(nil)
+}
+
+// FundDelete DELETE /backend/erp/finance/fund/:id 仅草稿可删
+func (c *BackendErpFinanceController) FundDelete() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	code, msg := erpFundDeleteCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(nil)
+}
+
+// FundOpenBills GET /backend/erp/finance/fund/openBills?fund_type=&partner_id=
+// 收款/付款时列出可核销的往来账，前端据此勾选。
+func (c *BackendErpFinanceController) FundOpenBills() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	ft, _ := erpInt8Query(c.GetString("fund_type"))
+	list, code, msg := erpFundOpenBillsCore(erpNewActor(cl), ft, erpUintParam(c.GetString("partner_id")))
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"list": list})
+}
+
+// CashFlow GET /backend/erp/finance/cashflow 资金流水（含单据生成的往来账不在此列，只统计实际收付）
+func (c *BackendErpFinanceController) CashFlow() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	from := time.Now().AddDate(0, 0, -30)
+	if d := strings.TrimSpace(c.GetString("date_from")); d != "" {
+		if t, e := time.ParseInLocation("2006-01-02", d, time.Local); e == nil {
+			from = t
+		}
+	}
+	to := time.Now()
+	if d := strings.TrimSpace(c.GetString("date_to")); d != "" {
+		if t, e := time.ParseInLocation("2006-01-02", d, time.Local); e == nil {
+			to = t
+		}
+	}
+	data, code, msg := erpCashFlowCore(erpNewActor(cl), from, to)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+// PartnerSummary GET /backend/erp/finance/partner 往来单位对账汇总
+func (c *BackendErpFinanceController) PartnerSummary() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	data, code, msg := erpPartnerSummaryCore(erpNewActor(cl), strings.TrimSpace(c.GetString("partner_type")))
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+func erpBillStatusLabel(s int8) string {
+	switch s {
+	case 1:
+		return "部分核销"
+	case 2:
+		return "已结清"
+	default:
+		return "未核销"
+	}
+}
+
+func erpInt8Query(v string) (int8, bool) {
+	n, err := strconv.Atoi(strings.TrimSpace(v))
+	if err != nil {
+		return 0, false
+	}
+	return int8(n), true
+}
diff --git a/go/controllers/backend_erp_normal_setting.go b/go/controllers/backend_erp_normal_setting.go
index b0ff56f..9a3ae68 100644
--- a/go/controllers/backend_erp_normal_setting.go
+++ b/go/controllers/backend_erp_normal_setting.go
@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
+	erp "server/services/erp"
 
 	beego "github.com/beego/beego/v2/server/web"
 )
@@ -19,22 +20,7 @@ type BackendErpNormalSettingController struct {
 }
 
 func (c *BackendErpNormalSettingController) nsClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendErpNormalSettingController) nsJsonErr(httpStatus, bizCode int, msg string) {
@@ -49,15 +35,17 @@ func (c *BackendErpNormalSettingController) nsOk(data interface{}) {
 }
 
 // 默认基础配置项定义
-var defaultErpNormalSettings = []struct {
-	Key          string
-	Name         string
-	Group        string
-	Type         string
-	Value        string
-	Options      string
-	SortOrder    int
-}{
+type normalSettingDef struct {
+	Key       string
+	Name      string
+	Group     string
+	Type      string
+	Value     string
+	Options   string
+	SortOrder int
+}
+
+var defaultErpNormalSettings = []normalSettingDef{
 	// 公司信息
 	{"company_name", "公司名称", "company", "input", "", "", 1},
 	{"company_address", "公司地址", "company", "input", "", "", 2},
@@ -70,13 +58,9 @@ var defaultErpNormalSettings = []struct {
 	{"taxpayer_no", "纳税人识别号", "tax", "input", "", "", 2},
 	{"default_tax_rate", "默认税率(%)", "tax", "number", "13", "", 3},
 	{"tax_type", "纳税人类型", "tax", "select", "general", "[{\"label\":\"一般纳税人\",\"value\":\"general\"},{\"label\":\"小规模纳税人\",\"value\":\"small\"}]", 4},
-	// 单据设置
-	{"sale_order_prefix", "销售单号前缀", "document", "input", "XS", "", 1},
-	{"purchase_order_prefix", "采购单号前缀", "document", "input", "CG", "", 2},
-	{"stock_in_prefix", "入库单号前缀", "document", "input", "RK", "", 3},
-	{"stock_out_prefix", "出库单号前缀", "document", "input", "CK", "", 4},
-	{"return_order_prefix", "退货单号前缀", "document", "input", "TH", "", 5},
-	{"auto_generate_doc_no", "自动生成单据号", "document", "switch", "1", "", 6},
+	// 单据设置：各类单据独立前缀（doc_prefix_*）由 erp.ErpDocPrefixFields() 追加，
+	// 一型一前缀，单据号可直接反推业务类型
+	{"auto_generate_doc_no", "自动生成单据号", "document", "switch", "1", "", 20},
 	// 库存设置
 	{"stock_warning_threshold", "库存预警阈值", "inventory", "number", "10", "", 1},
 	{"default_warehouse", "默认仓库", "inventory", "input", "", "", 2},
@@ -89,12 +73,27 @@ var defaultErpNormalSettings = []struct {
 	{"fiscal_year_start", "会计年度起始月", "finance", "number", "1", "", 4},
 }
 
+// 单据前缀项与取号逻辑共用同一份定义，避免键名/默认值在两处漂移
+func init() {
+	for i, f := range erp.ErpDocPrefixFields() {
+		defaultErpNormalSettings = append(defaultErpNormalSettings, normalSettingDef{
+			Key:       f.Key,
+			Name:      f.Name,
+			Group:     "document",
+			Type:      "input",
+			Value:     f.Default,
+			SortOrder: i + 1,
+		})
+	}
+}
+
 // List GET /backend/erp/normal-settings
 // 获取租户所有基础设置，按分组返回；如果租户还没有配置，自动初始化默认配置
 func (c *BackendErpNormalSettingController) List() {
 	claims, err := c.nsClaims()
 	if err != nil {
-		c.nsJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.nsJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -107,26 +106,34 @@ func (c *BackendErpNormalSettingController) List() {
 		return
 	}
 
-	// 如果没有配置，自动初始化默认配置
-	if len(list) == 0 {
-		now := time.Now()
-		for _, item := range defaultErpNormalSettings {
-			setting := models.ErpNormalSetting{
-				TenantID:      tenantID,
-				ConfigKey:     item.Key,
-				ConfigValue:   item.Value,
-				ConfigName:    item.Name,
-				ConfigGroup:   item.Group,
-				ConfigType:    item.Type,
-				ConfigOptions: item.Options,
-				SortOrder:     item.SortOrder,
-				Status:        1,
-				CreateTime:    now,
-				UpdateTime:    now,
-			}
-			_, _ = models.Orm.Insert(&setting)
+	// 补齐缺失的配置项：既覆盖首次使用，也让老租户自动获得后续新增的键
+	// （否则只在新租户写入，老租户界面上永远看不到新字段）
+	existing := make(map[string]bool, len(list))
+	for _, item := range list {
+		existing[item.ConfigKey] = true
+	}
+	seeded := false
+	for _, item := range defaultErpNormalSettings {
+		if existing[item.Key] {
+			continue
 		}
-		// 重新查询
+		now := time.Now()
+		_, _ = models.Orm.Insert(&models.ErpNormalSetting{
+			TenantID:      tenantID,
+			ConfigKey:     item.Key,
+			ConfigValue:   item.Value,
+			ConfigName:    item.Name,
+			ConfigGroup:   item.Group,
+			ConfigType:    item.Type,
+			ConfigOptions: item.Options,
+			SortOrder:     item.SortOrder,
+			Status:        1,
+			CreateTime:    now,
+			UpdateTime:    now,
+		})
+		seeded = true
+	}
+	if seeded {
 		list, _ = models.GetErpNormalSettingsByTenant(tenantID)
 	}
 
@@ -192,7 +199,8 @@ func (c *BackendErpNormalSettingController) List() {
 func (c *BackendErpNormalSettingController) Save() {
 	claims, err := c.nsClaims()
 	if err != nil {
-		c.nsJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.nsJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -254,7 +262,8 @@ func (c *BackendErpNormalSettingController) Save() {
 func (c *BackendErpNormalSettingController) Reset() {
 	claims, err := c.nsClaims()
 	if err != nil {
-		c.nsJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.nsJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_erp_product.go b/go/controllers/backend_erp_product.go
new file mode 100644
index 0000000..1b428a8
--- /dev/null
+++ b/go/controllers/backend_erp_product.go
@@ -0,0 +1,534 @@
+package controllers
+
+import (
+	"fmt"
+	"math"
+	"strings"
+	"time"
+
+	"server/models"
+	erp "server/services/erp"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// BackendErpProductController 商品档案 + 商品分类（进销存基础数据）
+type BackendErpProductController struct {
+	BackendErpBaseController
+}
+
+type erpProductPayload struct {
+	ProductCode    string  `json:"product_code"`
+	ProductName    string  `json:"product_name"`
+	CategoryID     uint64  `json:"category_id"`
+	Brand          string  `json:"brand"`
+	Spec           string  `json:"spec"`
+	Model          string  `json:"model"`
+	BaseUnit       string  `json:"base_unit"`
+	AuxUnit        string  `json:"aux_unit"`
+	AuxRatio       float64 `json:"aux_ratio"`
+	Barcode        string  `json:"barcode"`
+	ExtraBarcodes  string  `json:"extra_barcodes"`
+	PurchasePrice  float64 `json:"purchase_price"`
+	SalePrice      float64 `json:"sale_price"`
+	WholesalePrice float64 `json:"wholesale_price"`
+	MemberPrice    float64 `json:"member_price"`
+	MinPrice       float64 `json:"min_price"`
+	TaxRate        float64 `json:"tax_rate"`
+	SafetyQty      float64 `json:"safety_qty"`
+	MaxQty         float64 `json:"max_qty"`
+	ShelfLifeDays  int     `json:"shelf_life_days"`
+	EnableBatch    int8    `json:"enable_batch"`
+	ImageURL       string  `json:"image_url"`
+	Status         *int8   `json:"status"`
+	IsDraft        int8    `json:"is_draft"`
+	Remark         string  `json:"remark"`
+}
+
+// List GET /backend/erp/product/list
+func (c *BackendErpProductController) List() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	page, pageSize := c.pageArgs()
+	f := erpProductFilter{
+		Keyword:     c.GetString("keyword"),
+		CategoryID:  erpUintParam(c.GetString("category_id")),
+		Brand:       c.GetString("brand"),
+		Status:      c.GetString("status"),
+		IsDraft:     c.GetString("is_draft"),
+		OnlyEnabled: strings.TrimSpace(c.GetString("only_enabled")) == "1",
+	}
+	list, total, code, msg := erpProductListCore(erpNewActor(cl), f, page, pageSize)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.listOK(list, total, page, pageSize)
+}
+
+// Detail GET /backend/erp/product/:id
+func (c *BackendErpProductController) Detail() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	p, code, msg := erpProductDetailCore(erpNewActor(cl), c.pathID())
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(p)
+}
+
+// Create POST /backend/erp/product
+func (c *BackendErpProductController) Create() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	var p erpProductPayload
+	if !c.bindJSON(&p) {
+		return
+	}
+	if strings.TrimSpace(p.ProductName) == "" {
+		c.fail(400, 400, "商品名称不能为空")
+		return
+	}
+	if strings.TrimSpace(p.BaseUnit) == "" {
+		c.fail(400, 400, "基本单位不能为空")
+		return
+	}
+	tid := c.tid(cl)
+	if p.Status == nil {
+		enabled := int8(1)
+		p.Status = &enabled
+	}
+	code := strings.TrimSpace(p.ProductCode)
+	if code == "" {
+		code = erp.GenerateProductCode(tid)
+	}
+	if erpProductCodeExists(tid, code, 0) {
+		c.fail(400, 400, "商品编码已存在: "+code)
+		return
+	}
+	p.ProductCode = code
+	row := erpApplyProduct(&models.ErpProduct{TenantID: tid, CreateUserID: fmt.Sprintf("%d", cl.UserID)}, &p)
+	row.CreateTime = time.Now()
+	row.UpdateTime = time.Now()
+	id, err := models.Orm.Insert(&row)
+	if err != nil {
+		c.fail(500, 500, "创建失败: "+err.Error())
+		return
+	}
+	c.ok(map[string]interface{}{"id": id, "product_code": row.ProductCode})
+}
+
+// Update PUT /backend/erp/product/:id
+func (c *BackendErpProductController) Update() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	id := c.pathID()
+	if id == 0 {
+		c.fail(400, 400, "无效的ID")
+		return
+	}
+	var p erpProductPayload
+	if !c.bindJSON(&p) {
+		return
+	}
+	tid := c.tid(cl)
+	var row models.ErpProduct
+	if err := models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("id", id).Filter("tenant_id", tid).
+		Filter("delete_time__isnull", true).One(&row); err != nil {
+		c.fail(404, 404, "商品未找到")
+		return
+	}
+	code := strings.TrimSpace(p.ProductCode)
+	if code == "" {
+		code = row.ProductCode
+	}
+	if erpProductCodeExists(tid, code, id) {
+		c.fail(400, 400, "商品编码已存在: "+code)
+		return
+	}
+	updated := erpApplyProduct(&row, &p)
+	updated.ID = row.ID
+	updated.TenantID = tid
+	updated.CreateTime = row.CreateTime
+	updated.UpdateTime = time.Now()
+	if _, err := models.Orm.Update(&updated); err != nil {
+		c.fail(500, 500, "更新失败: "+err.Error())
+		return
+	}
+	c.ok(nil)
+}
+
+// Delete DELETE /backend/erp/product/:id
+// 软删除；已有库存或已开过单的商品不允许删除，避免历史数据失去指向。
+func (c *BackendErpProductController) Delete() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	id := c.pathID()
+	if id == 0 {
+		c.fail(400, 400, "无效的ID")
+		return
+	}
+	tid := c.tid(cl)
+	var row models.ErpProduct
+	if err := models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("id", id).Filter("tenant_id", tid).
+		Filter("delete_time__isnull", true).One(&row); err != nil {
+		c.fail(404, 404, "商品未找到")
+		return
+	}
+	if qty := erpProductTotalQty(tid, id); qty > 0.000001 {
+		c.fail(400, 400, "该商品仍有库存，不能删除")
+		return
+	}
+	var used int64
+	if n, err := models.Orm.QueryTable(new(models.ErpDocumentItem)).
+		Filter("tenant_id", tid).Filter("product_id", id).Count(); err == nil {
+		used = n
+	}
+	if used > 0 {
+		c.fail(400, 400, "该商品已存在业务单据中，请停用而不是删除")
+		return
+	}
+	now := time.Now()
+	_, err = models.Orm.QueryTable(new(models.ErpProduct)).Filter("id", id).
+		Update(orm.Params{"delete_time": now, "update_time": now})
+	if err != nil {
+		c.fail(500, 500, "删除失败: "+err.Error())
+		return
+	}
+	c.ok(nil)
+}
+
+// ToggleStatus POST /backend/erp/product/:id/status
+func (c *BackendErpProductController) ToggleStatus() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	id := c.pathID()
+	if id == 0 {
+		c.fail(400, 400, "无效的ID")
+		return
+	}
+	var p struct {
+		Status int8 `json:"status"`
+	}
+	if !c.bindJSON(&p) {
+		return
+	}
+	_, err = models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("id", id).Filter("tenant_id", c.tid(cl)).
+		Update(orm.Params{"status": p.Status, "is_draft": 0, "update_time": time.Now()})
+	if err != nil {
+		c.fail(500, 500, "操作失败: "+err.Error())
+		return
+	}
+	c.ok(nil)
+}
+
+// ---- 分类 ----
+
+// CategoryList GET /backend/erp/product/category/list
+func (c *BackendErpProductController) CategoryList() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	rows, tree, code, msg := erpCategoryListCore(erpNewActor(cl))
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"list": rows, "tree": tree})
+}
+
+// CategorySave POST /backend/erp/product/category 新建传 id=0，修改传原 id
+func (c *BackendErpProductController) CategorySave() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	tid := c.tid(cl)
+	var p struct {
+		ID           uint64 `json:"id"`
+		CategoryName string `json:"category_name"`
+		ParentID     uint64 `json:"parent_id"`
+		SortOrder    int    `json:"sort_order"`
+		Status       int8   `json:"status"`
+		Remark       string `json:"remark"`
+	}
+	if !c.bindJSON(&p) {
+		return
+	}
+	if strings.TrimSpace(p.CategoryName) == "" {
+		c.fail(400, 400, "分类名称不能为空")
+		return
+	}
+	if p.ID == 0 {
+		p.Status = 1
+	}
+	now := time.Now()
+	id := p.ID
+	if p.ID > 0 {
+		if p.ParentID == p.ID {
+			c.fail(400, 400, "上级分类不能是自己")
+			return
+		}
+		if erpCategoryIsDescendant(tid, p.ParentID, p.ID) {
+			c.fail(400, 400, "上级分类不能是自己的子分类")
+			return
+		}
+		_, err = models.Orm.QueryTable(new(models.ErpProductCategory)).
+			Filter("id", p.ID).Filter("tenant_id", tid).
+			Update(orm.Params{
+				"category_name": strings.TrimSpace(p.CategoryName), "parent_id": p.ParentID,
+				"sort_order": p.SortOrder, "status": p.Status, "remark": p.Remark, "update_time": now,
+			})
+	} else {
+		row := models.ErpProductCategory{
+			TenantID: tid, CategoryName: strings.TrimSpace(p.CategoryName),
+			ParentID: p.ParentID, SortOrder: p.SortOrder, Status: p.Status, Remark: p.Remark,
+			CreateTime: now, UpdateTime: now,
+		}
+		newID, e := models.Orm.Insert(&row)
+		if e != nil {
+			c.fail(500, 500, "保存失败: "+e.Error())
+			return
+		}
+		id = uint64(newID)
+	}
+	if err != nil {
+		c.fail(500, 500, "保存失败: "+err.Error())
+		return
+	}
+	c.ok(map[string]interface{}{"id": id})
+}
+
+// CategoryDelete DELETE /backend/erp/product/category/:id
+func (c *BackendErpProductController) CategoryDelete() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	id := c.pathID()
+	if id == 0 {
+		c.fail(400, 400, "无效的ID")
+		return
+	}
+	tid := c.tid(cl)
+	var kids int64
+	if n, err := models.Orm.QueryTable(new(models.ErpProductCategory)).
+		Filter("tenant_id", tid).Filter("parent_id", id).
+		Filter("delete_time__isnull", true).Count(); err == nil {
+		kids = n
+	}
+	if kids > 0 {
+		c.fail(400, 400, "请先删除子分类")
+		return
+	}
+	var used int64
+	if n, err := models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", tid).Filter("category_id", id).
+		Filter("delete_time__isnull", true).Count(); err == nil {
+		used = n
+	}
+	if used > 0 {
+		c.fail(400, 400, "该分类下还有商品，不能删除")
+		return
+	}
+	now := time.Now()
+	if _, err := models.Orm.QueryTable(new(models.ErpProductCategory)).Filter("id", id).
+		Update(orm.Params{"delete_time": now, "update_time": now}); err != nil {
+		c.fail(500, 500, "删除失败: "+err.Error())
+		return
+	}
+	c.ok(nil)
+}
+
+// ---- 内部工具 ----
+
+func erpApplyProduct(row *models.ErpProduct, p *erpProductPayload) models.ErpProduct {
+	out := *row
+	out.ProductCode = strings.TrimSpace(p.ProductCode)
+	out.ProductName = strings.TrimSpace(p.ProductName)
+	out.CategoryID = p.CategoryID
+	out.Brand = strings.TrimSpace(p.Brand)
+	out.Spec = strings.TrimSpace(p.Spec)
+	out.Model = strings.TrimSpace(p.Model)
+	out.BaseUnit = strings.TrimSpace(p.BaseUnit)
+	out.AuxUnit = strings.TrimSpace(p.AuxUnit)
+	out.AuxRatio = p.AuxRatio
+	out.Barcode = strings.TrimSpace(p.Barcode)
+	out.ExtraBarcodes = strings.TrimSpace(p.ExtraBarcodes)
+	out.PurchasePrice = p.PurchasePrice
+	out.SalePrice = p.SalePrice
+	out.WholesalePrice = p.WholesalePrice
+	out.MemberPrice = p.MemberPrice
+	out.MinPrice = p.MinPrice
+	out.TaxRate = p.TaxRate
+	out.SafetyQty = p.SafetyQty
+	out.MaxQty = p.MaxQty
+	out.ShelfLifeDays = p.ShelfLifeDays
+	out.EnableBatch = p.EnableBatch
+	out.ImageURL = strings.TrimSpace(p.ImageURL)
+	if p.Status != nil {
+		out.Status = *p.Status
+	}
+	out.IsDraft = p.IsDraft
+	out.Remark = p.Remark
+	if out.AuxRatio <= 0 {
+		out.AuxRatio = 1
+	}
+	return out
+}
+
+func erpProductCodeExists(tid, code string, excludeID uint64) bool {
+	qs := models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", tid).Filter("product_code", code).
+		Filter("delete_time__isnull", true)
+	if excludeID > 0 {
+		qs = qs.Exclude("id", excludeID)
+	}
+	n, _ := qs.Count()
+	return n > 0
+}
+
+func erpProductTotalQty(tid string, productID uint64) float64 {
+	var rows []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).Filter("product_id", productID).
+		All(&rows, "quantity")
+	var sum float64
+	for _, r := range rows {
+		sum += r.Quantity
+	}
+	return sum
+}
+
+type erpStockAggRow struct {
+	qty   float64
+	cost  float64
+	value float64
+}
+
+func erpStockAggregate(tid string, productIDs []uint64) map[uint64]erpStockAggRow {
+	out := map[uint64]erpStockAggRow{}
+	if len(productIDs) == 0 {
+		return out
+	}
+	var rows []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).Filter("product_id__in", productIDs).
+		All(&rows, "product_id", "quantity", "cost_price")
+	for _, r := range rows {
+		v := out[r.ProductID]
+		v.qty += r.Quantity
+		v.value += r.Quantity * r.CostPrice
+		out[r.ProductID] = v
+	}
+	return out
+}
+
+func erpProductStocks(tid string, productID uint64) []map[string]interface{} {
+	var rows []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).Filter("product_id", productID).
+		OrderBy("warehouse_id", "batch_no").All(&rows)
+	names := erpWarehouseNameMap(tid)
+	out := make([]map[string]interface{}, 0, len(rows))
+	for _, r := range rows {
+		out = append(out, map[string]interface{}{
+			"warehouse_id": r.WarehouseID, "warehouse_name": names[r.WarehouseID],
+			"batch_no": r.BatchNo, "quantity": r.Quantity, "cost_price": r.CostPrice,
+			"amount": round2f(r.Quantity * r.CostPrice),
+		})
+	}
+	return out
+}
+
+// erpSafetyState low-低于安全库存 / over-超过最高库存 / normal
+func erpSafetyState(safety, qty, max float64) string {
+	if safety > 0 && qty < safety {
+		return "low"
+	}
+	if max > 0 && qty > max {
+		return "over"
+	}
+	return "normal"
+}
+
+func erpCategoryMap(tid string) map[uint64]string {
+	var rows []models.ErpProductCategory
+	_, _ = models.Orm.QueryTable(new(models.ErpProductCategory)).
+		Filter("tenant_id", tid).All(&rows, "id", "category_name")
+	m := make(map[uint64]string, len(rows))
+	for _, r := range rows {
+		m[r.ID] = r.CategoryName
+	}
+	return m
+}
+
+func erpCategoryTree(rows []map[string]interface{}, parent uint64) []map[string]interface{} {
+	out := make([]map[string]interface{}, 0)
+	for _, r := range rows {
+		pv, _ := r["parent_id"].(uint64)
+		if pv != parent {
+			continue
+		}
+		node := map[string]interface{}{}
+		for k, v := range r {
+			node[k] = v
+		}
+		node["children"] = erpCategoryTree(rows, node["id"].(uint64))
+		out = append(out, node)
+	}
+	return out
+}
+
+func erpCategoryIsDescendant(tid string, nodeID, ancestor uint64) bool {
+	if nodeID == 0 {
+		return false
+	}
+	seen := map[uint64]bool{}
+	cur := nodeID
+	for cur != 0 && !seen[cur] {
+		seen[cur] = true
+		if cur == ancestor {
+			return true
+		}
+		var row models.ErpProductCategory
+		if err := models.Orm.QueryTable(new(models.ErpProductCategory)).
+			Filter("tenant_id", tid).Filter("id", cur).One(&row, "parent_id"); err != nil {
+			return false
+		}
+		cur = row.ParentID
+	}
+	return false
+}
+
+func erpWarehouseNameMap(tid string) map[uint64]string {
+	var rows []models.ErpWarehouse
+	_, _ = models.Orm.QueryTable(new(models.ErpWarehouse)).
+		Filter("tenant_id", tid).All(&rows, "id", "warehouse_name")
+	m := make(map[uint64]string, len(rows))
+	for _, r := range rows {
+		m[r.ID] = r.WarehouseName
+	}
+	return m
+}
+
+func round2f(v float64) float64 {
+	return math.Round(v*100) / 100
+}
diff --git a/go/controllers/backend_erp_report.go b/go/controllers/backend_erp_report.go
new file mode 100644
index 0000000..52a6ce5
--- /dev/null
+++ b/go/controllers/backend_erp_report.go
@@ -0,0 +1,344 @@
+package controllers
+
+import (
+	"sort"
+	"strings"
+	"time"
+
+	"server/models"
+)
+
+// BackendErpReportController 进销存报表：购销汇总、收发存、毛利、客户RFM、经营看板
+//
+// 统计口径全部来自「已生效」单据与库存流水，草稿/审批中/作废不参与，
+// 这样报表数字与账务（往来账、库存结存）永远一致。
+type BackendErpReportController struct {
+	BackendErpBaseController
+}
+
+// reportRange 解析日期区间，默认当月
+func (c *BackendErpReportController) reportRange() (time.Time, time.Time) {
+	from, to := erpMonthRange(0)
+	if d := strings.TrimSpace(c.GetString("date_from")); d != "" {
+		if t, e := time.ParseInLocation("2006-01-02", d, time.Local); e == nil {
+			from = t
+		}
+	}
+	if d := strings.TrimSpace(c.GetString("date_to")); d != "" {
+		if t, e := time.ParseInLocation("2006-01-02", d, time.Local); e == nil {
+			to = t.AddDate(0, 0, 1)
+		}
+	}
+	return from, to
+}
+
+func erpMonthRange(offsetMonths int) (time.Time, time.Time) {
+	now := time.Now()
+	first := time.Date(now.Year(), now.Month()+time.Month(offsetMonths), 1, 0, 0, 0, 0, time.Local)
+	return first, first.AddDate(0, 1, 0)
+}
+
+// approvedDocIDs 区间内已生效单据ID（按类型）
+func erpApprovedDocIDs(tid string, docTypes []string, from, to time.Time, partnerID uint64) []uint64 {
+	qs := models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("tenant_id", tid).
+		Filter("doc_type__in", docTypes).
+		Filter("status", models.ErpDocStatusApproved).
+		Filter("delete_time__isnull", true).
+		Filter("biz_date__gte", from).Filter("biz_date__lt", to)
+	if partnerID > 0 {
+		qs = qs.Filter("partner_id", partnerID)
+	}
+	var rows []models.ErpDocument
+	_, _ = qs.All(&rows, "id")
+	ids := make([]uint64, 0, len(rows))
+	for _, r := range rows {
+		ids = append(ids, r.ID)
+	}
+	return ids
+}
+
+func erpItemsByDocs(tid string, docIDs []uint64) []models.ErpDocumentItem {
+	if len(docIDs) == 0 {
+		return nil
+	}
+	var out []models.ErpDocumentItem
+	_, _ = models.Orm.QueryTable(new(models.ErpDocumentItem)).
+		Filter("tenant_id", tid).Filter("doc_id__in", docIDs).All(&out)
+	return out
+}
+
+// PurchaseSummary GET /backend/erp/report/purchase 采购汇总（dimension=product|supplier|month）
+func (c *BackendErpReportController) PurchaseSummary() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	tid := c.tid(cl)
+	from, to := c.reportRange()
+	group := erpReportDimension(c.GetString("dimension"))
+	items, docPartner, returnItems := erpSummaryDocs(tid, models.ErpDocPurchaseIn,
+		models.ErpDocPurchaseReturn, from, to, erpUintParam(c.GetString("partner_id")))
+	c.ok(erpSummaryReportData(group, items, docPartner, returnItems))
+}
+
+// SalesSummary GET /backend/erp/report/sales 销售汇总（dimension=product|customer|month）
+func (c *BackendErpReportController) SalesSummary() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	tid := c.tid(cl)
+	from, to := c.reportRange()
+	group := erpReportDimension(c.GetString("dimension"))
+	items, docPartner, returnItems := erpSummaryDocs(tid, models.ErpDocSalesOut,
+		models.ErpDocSalesReturn, from, to, erpUintParam(c.GetString("partner_id")))
+	c.ok(erpSummaryReportData(group, items, docPartner, returnItems))
+}
+
+// Rank GET /backend/erp/report/rank 热销/滞销排行
+func (c *BackendErpReportController) Rank() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	from, to := c.reportRange()
+	top, _ := c.GetInt("top", 10)
+	asc := strings.TrimSpace(c.GetString("order")) == "asc"
+	data, code, msg := erpSalesRankCore(erpNewActor(cl), from, to, top, asc)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+// StockMove GET /backend/erp/report/stockmove 收发存汇总表
+// 期末取自库存结存，本期收发取自库存流水，期初=期末-(入-出)，保证与账实一致。
+func (c *BackendErpReportController) StockMove() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	from, to := c.reportRange()
+	page, pageSize := c.pageArgs()
+	list, total, summary, code, msg := erpStockMoveCore(
+		erpNewActor(cl), from, to,
+		erpUintParam(c.GetString("warehouse_id")),
+		c.GetString("keyword"),
+		page, pageSize,
+	)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200, "msg": "success",
+		"data": map[string]interface{}{
+			"list": list, "total": total, "page": page, "pageSize": pageSize,
+			"summary": summary,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// Profit GET /backend/erp/report/profit 毛利分析：收入=销售出库金额-销售退货金额，
+// 成本取库存流水的实际出库成本（移动加权），不受手工录入影响。
+func (c *BackendErpReportController) Profit() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	from, to := c.reportRange()
+	data, code, msg := erpProfitCore(erpNewActor(cl), from, to)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+// RFM GET /backend/erp/report/rfm 客户价值分层（R最近购买/F频次/M金额）
+func (c *BackendErpReportController) RFM() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	tid := c.tid(cl)
+	var docs []models.ErpDocument
+	_, _ = models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("tenant_id", tid).
+		Filter("doc_type__in", []string{models.ErpDocSalesOut, models.ErpDocSalesReturn}).
+		Filter("status", models.ErpDocStatusApproved).
+		Filter("delete_time__isnull", true).All(&docs)
+	now := time.Now()
+	type row struct {
+		CustomerID   uint64  `json:"customer_id"`
+		CustomerName string  `json:"customer_name"`
+		RDays        int     `json:"r_days"`
+		FCount       int     `json:"f_count"`
+		MAmount      float64 `json:"m_amount"`
+		RScore       int     `json:"r_score"`
+		FScore       int     `json:"f_score"`
+		MScore       int     `json:"m_score"`
+		Segment      string  `json:"segment"`
+		LastDate     string  `json:"last_date"`
+	}
+	agg := map[uint64]*row{}
+	for _, d := range docs {
+		if d.PartnerID == 0 {
+			continue
+		}
+		r := agg[d.PartnerID]
+		if r == nil {
+			r = &row{CustomerID: d.PartnerID, CustomerName: d.PartnerName, RDays: 99999}
+			agg[d.PartnerID] = r
+		}
+		amount := d.ActualAmount
+		if d.DocType == models.ErpDocSalesReturn {
+			// 退货只冲减金额，不计购买频次、不影响最近购买时间
+			r.MAmount -= amount
+			continue
+		}
+		r.FCount++
+		r.MAmount += amount
+		if d.BizDate.After(now.AddDate(0, 0, -r.RDays)) {
+			days := int(now.Sub(d.BizDate).Hours() / 24)
+			if days < r.RDays {
+				r.RDays = days
+				r.LastDate = d.BizDate.Format("2006-01-02")
+			}
+		}
+	}
+	list := make([]*row, 0, len(agg))
+	rs, fs, ms := make([]float64, 0, len(agg)), make([]float64, 0, len(agg)), make([]float64, 0, len(agg))
+	for _, r := range agg {
+		list = append(list, r)
+		rs = append(rs, float64(r.RDays))
+		fs = append(fs, float64(r.FCount))
+		ms = append(ms, r.MAmount)
+	}
+	rMed := erpMedian(rs)
+	fMed := erpMedian(fs)
+	mMed := erpMedian(ms)
+	for _, r := range list {
+		r.MAmount = round2f(r.MAmount)
+		r.RScore = erpHighScore(float64(r.RDays), rMed, true) // R 越小越好
+		r.FScore = erpHighScore(float64(r.FCount), fMed, false)
+		r.MScore = erpHighScore(r.MAmount, mMed, false)
+		r.Segment = erpRFMSegment(r.RScore, r.FScore, r.MScore)
+	}
+	sort.Slice(list, func(i, j int) bool {
+		if list[i].MAmount != list[j].MAmount {
+			return list[i].MAmount > list[j].MAmount
+		}
+		return list[i].CustomerID < list[j].CustomerID
+	})
+	segCount := map[string]int{}
+	for _, r := range list {
+		segCount[r.Segment]++
+	}
+	c.ok(map[string]interface{}{
+		"list": list, "median": map[string]float64{"r": rMed, "f": fMed, "m": mMed},
+		"segment_counts": segCount,
+	})
+}
+
+// Dashboard GET /backend/erp/report/dashboard 经营看板
+func (c *BackendErpReportController) Dashboard() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	c.ok(erpDashboardCore(erpNewActor(cl)))
+}
+
+// ---- 汇总报表共用：聚合实现见 erp_report_core.go ----
+
+func absFloat(v float64) float64 {
+	if v < 0 {
+		return -v
+	}
+	return v
+}
+
+func erpDocPartnerMap(ids []uint64) map[uint64]models.ErpDocument {
+	out := map[uint64]models.ErpDocument{}
+	if len(ids) == 0 {
+		return out
+	}
+	var docs []models.ErpDocument
+	_, _ = models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("id__in", ids).All(&docs, "id", "partner_id", "partner_name", "biz_date")
+	for _, d := range docs {
+		out[d.ID] = d
+	}
+	return out
+}
+
+func keysOfU64[V any](m map[uint64]V) []uint64 {
+	out := make([]uint64, 0, len(m))
+	for k := range m {
+		out = append(out, k)
+	}
+	return out
+}
+
+func erpMedian(v []float64) float64 {
+	if len(v) == 0 {
+		return 0
+	}
+	c := append([]float64{}, v...)
+	sort.Float64s(c)
+	n := len(c)
+	if n%2 == 1 {
+		return c[n/2]
+	}
+	return (c[n/2-1] + c[n/2]) / 2
+}
+
+// erpHighScore 1=高于中位数（好），0=低于中位数；reverse=true 表示值越小越好
+func erpHighScore(v, med float64, reverse bool) int {
+	if reverse {
+		if v <= med {
+			return 1
+		}
+		return 0
+	}
+	if v >= med {
+		return 1
+	}
+	return 0
+}
+
+func erpRFMSegment(r, f, m int) string {
+	switch {
+	case r == 1 && f == 1 && m == 1:
+		return "重要价值客户"
+	case r == 1 && f == 0 && m == 1:
+		return "重要发展客户"
+	case r == 0 && f == 1 && m == 1:
+		return "重要保持客户"
+	case r == 0 && f == 0 && m == 1:
+		return "重要挽留客户"
+	case r == 1 && f == 1 && m == 0:
+		return "一般价值客户"
+	case r == 1 && f == 0 && m == 0:
+		return "一般发展客户"
+	case r == 0 && f == 1 && m == 0:
+		return "一般保持客户"
+	default:
+		return "一般挽留客户"
+	}
+}
+
+// erpErpPendingTaskCount 待当前用户审批的进销存单据数
+func erpErpPendingTaskCount(tid, uid uint64) int64 {
+	var rows []models.ApprovalTask
+	_, _ = models.Orm.QueryTable(new(models.ApprovalTask)).
+		Filter("tid", tid).Filter("approver_id", uid).
+		Filter("status", models.ApprovalTaskPending).
+		Filter("biz_type__startswith", "erp_").
+		Filter("is_deleted", 0).All(&rows, "id")
+	return int64(len(rows))
+}
diff --git a/go/controllers/backend_erp_stock.go b/go/controllers/backend_erp_stock.go
new file mode 100644
index 0000000..6a2bb61
--- /dev/null
+++ b/go/controllers/backend_erp_stock.go
@@ -0,0 +1,377 @@
+package controllers
+
+import (
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+)
+
+// BackendErpStockController 库存查询、流水追溯与预警
+//
+// 结存只能由流水驱动，因此这里全部是只读接口：任何"改库存"的需求都必须
+// 通过其他出入库/调拨/盘点单据生效来完成。
+// 查询与算法在 erp_stock_core.go，与移动端 /api/erp/stock* 共用同一份实现。
+type BackendErpStockController struct {
+	BackendErpBaseController
+}
+
+// List GET /backend/erp/stock/list 库存结存（可按商品聚合或按批次展开）
+func (c *BackendErpStockController) List() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	page, pageSize := c.pageArgs()
+
+	f := erpStockFilter{
+		WarehouseID:    erpUintParam(c.GetString("warehouse_id")),
+		ProductID:      erpUintParam(c.GetString("product_id")),
+		BatchNo:        strings.TrimSpace(c.GetString("batch_no")),
+		OnlyStock:      strings.TrimSpace(c.GetString("only_stock")) == "1",
+		GroupByProduct: strings.TrimSpace(c.GetString("group_by")) == "product",
+		Keyword:        strings.TrimSpace(c.GetString("keyword")),
+		CategoryID:     erpUintParam(c.GetString("category_id")),
+		SafetyState:    strings.TrimSpace(c.GetString("safety_state")),
+	}
+	list, total, sumAmount, code, msg := erpStockListCore(erpNewActor(cl), f, page, pageSize)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{
+		"list": list, "total": total, "page": page, "pageSize": pageSize,
+		"sum_amount": sumAmount,
+	})
+}
+
+// Ledger GET /backend/erp/stock/ledger 库存流水（收发存明细追溯）
+func (c *BackendErpStockController) Ledger() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	page, pageSize := c.pageArgs()
+
+	f := erpLedgerFilter{
+		ProductID:   erpUintParam(c.GetString("product_id")),
+		WarehouseID: erpUintParam(c.GetString("warehouse_id")),
+		DocType:     strings.TrimSpace(c.GetString("doc_type")),
+		BatchNo:     strings.TrimSpace(c.GetString("batch_no")),
+		DocNo:       strings.TrimSpace(c.GetString("doc_no")),
+		DateFrom:    strings.TrimSpace(c.GetString("date_from")),
+		DateTo:      strings.TrimSpace(c.GetString("date_to")),
+	}
+	rows, total, code, msg := erpLedgerCore(erpNewActor(cl), f, page, pageSize)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.listOK(rows, total, page, pageSize)
+}
+
+// Warning GET /backend/erp/stock/warning 库存预警：低于安全库存 / 超储 / 零库存 / 效期临近
+func (c *BackendErpStockController) Warning() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	data, code, msg := erpWarningCore(erpNewActor(cl))
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(data)
+}
+
+// Replenish GET /backend/erp/stock/replenish 智能补货建议（按供应商分组，可一键生成采购订单）
+func (c *BackendErpStockController) Replenish() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	rows, code, msg := erpReplenishCore(erpNewActor(cl))
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"list": rows, "total": len(rows)})
+}
+
+// Batch GET /backend/erp/stock/batch 批次与效期台账
+// 支持 warehouse_id / product_id / keyword / expire_state(expired|expiring|normal) 过滤。
+func (c *BackendErpStockController) Batch() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	page, pageSize := c.pageArgs()
+
+	f := erpBatchFilter{
+		WarehouseID:  erpUintParam(c.GetString("warehouse_id")),
+		ProductID:    erpUintParam(c.GetString("product_id")),
+		OnlyPositive: strings.TrimSpace(c.GetString("only_positive")) == "1",
+		Keyword:      strings.TrimSpace(c.GetString("keyword")),
+		ExpireState:  strings.TrimSpace(c.GetString("expire_state")),
+	}
+	list, total, code, msg := erpBatchCore(erpNewActor(cl), f, page, pageSize)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.listOK(list, total, page, pageSize)
+}
+
+// erpBatchRow 批次台账行；未登记效期时 expire_in_days 为 null
+type erpBatchRow struct {
+	ProductID     uint64  `json:"product_id"`
+	ProductCode   string  `json:"product_code"`
+	ProductName   string  `json:"product_name"`
+	Spec          string  `json:"spec"`
+	Unit          string  `json:"unit"`
+	WarehouseID   uint64  `json:"warehouse_id"`
+	WarehouseName string  `json:"warehouse_name"`
+	BatchNo       string  `json:"batch_no"`
+	Quantity      float64 `json:"quantity"`
+	CostPrice     float64 `json:"cost_price"`
+	Amount        float64 `json:"amount"`
+	ExpireDate    string  `json:"expire_date"`
+	ExpireInDays  *int    `json:"expire_in_days"`
+	Expired       bool    `json:"expired"`
+}
+
+// erpStockRow 库存结存行（列表按仓库+批次展开，或按商品聚合）
+type erpStockRow struct {
+	ProductID     uint64  `json:"product_id"`
+	ProductCode   string  `json:"product_code"`
+	ProductName   string  `json:"product_name"`
+	Spec          string  `json:"spec"`
+	Unit          string  `json:"unit"`
+	CategoryName  string  `json:"category_name"`
+	WarehouseID   uint64  `json:"warehouse_id"`
+	WarehouseName string  `json:"warehouse_name"`
+	BatchNo       string  `json:"batch_no"`
+	Quantity      float64 `json:"quantity"`
+	CostPrice     float64 `json:"cost_price"`
+	Amount        float64 `json:"amount"`
+	SafetyQty     float64 `json:"safety_qty"`
+	MaxQty        float64 `json:"max_qty"`
+	SafetyState   string  `json:"safety_state"`
+}
+
+// erpWarnRow 预警行：低库存/积压/缺货/效期共用一套字段
+type erpWarnRow struct {
+	ProductID     uint64  `json:"product_id"`
+	ProductCode   string  `json:"product_code"`
+	ProductName   string  `json:"product_name"`
+	Spec          string  `json:"spec"`
+	Unit          string  `json:"unit"`
+	CategoryName  string  `json:"category_name"`
+	WarehouseName string  `json:"warehouse_name"`
+	BatchNo       string  `json:"batch_no"`
+	Quantity      float64 `json:"quantity"`
+	SafetyQty     float64 `json:"safety_qty"`
+	MaxQty        float64 `json:"max_qty"`
+	InTransit     float64 `json:"in_transit"`
+	Type          string  `json:"type"`
+	TypeLabel     string  `json:"type_label"`
+	SuggestQty    float64 `json:"suggest_qty"`
+	ExpireDate    string  `json:"expire_date"`
+	ExpireInDays  int     `json:"expire_in_days"`
+}
+
+// erpReplenishRow 补货建议行
+type erpReplenishRow struct {
+	ProductID   uint64  `json:"product_id"`
+	ProductCode string  `json:"product_code"`
+	ProductName string  `json:"product_name"`
+	Spec        string  `json:"spec"`
+	Unit        string  `json:"unit"`
+	Quantity    float64 `json:"quantity"`
+	SafetyQty   float64 `json:"safety_qty"`
+	InTransit   float64 `json:"in_transit"`
+	Sold30      float64 `json:"sold_30"`
+	SuggestQty  float64 `json:"suggest_qty"`
+	UnitPrice   float64 `json:"unit_price"`
+	Amount      float64 `json:"amount"`
+}
+
+// ---- 内部 ----
+
+func erpStockProductIDs(rows []models.ErpStock) []uint64 {
+	seen := map[uint64]bool{}
+	out := make([]uint64, 0, len(rows))
+	for _, r := range rows {
+		if !seen[r.ProductID] {
+			seen[r.ProductID] = true
+			out = append(out, r.ProductID)
+		}
+	}
+	return out
+}
+
+func erpLedgerProductIDs(rows []models.ErpStockLedger) []uint64 {
+	seen := map[uint64]bool{}
+	out := make([]uint64, 0, len(rows))
+	for _, r := range rows {
+		if !seen[r.ProductID] {
+			seen[r.ProductID] = true
+			out = append(out, r.ProductID)
+		}
+	}
+	return out
+}
+
+// erpPurchaseInTransit 已生效采购订单的未执行数量（按商品汇总）
+func erpPurchaseInTransit(tid string) map[uint64]float64 {
+	out := map[uint64]float64{}
+	var docs []models.ErpDocument
+	_, _ = models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("tenant_id", tid).Filter("doc_type", models.ErpDocPurchaseOrder).
+		Filter("status", models.ErpDocStatusApproved).
+		Filter("delete_time__isnull", true).All(&docs, "id")
+	if len(docs) == 0 {
+		return out
+	}
+	ids := make([]uint64, 0, len(docs))
+	for _, d := range docs {
+		ids = append(ids, d.ID)
+	}
+	var items []models.ErpDocumentItem
+	_, _ = models.Orm.QueryTable(new(models.ErpDocumentItem)).
+		Filter("tenant_id", tid).Filter("doc_id__in", ids).
+		All(&items, "product_id", "quantity", "executed_qty")
+	for _, it := range items {
+		r := it.Quantity - it.ExecutedQty
+		if r > 0 {
+			out[it.ProductID] += r
+		}
+	}
+	return out
+}
+
+// erpSoldQty 近 n 天销售出库数量（按商品汇总）
+func erpSoldQty(tid string, days int) map[uint64]float64 {
+	out := map[uint64]float64{}
+	var rows []models.ErpStockLedger
+	_, _ = models.Orm.QueryTable(new(models.ErpStockLedger)).
+		Filter("tenant_id", tid).
+		Filter("doc_type", models.ErpDocSalesOut).
+		Filter("direction", models.ErpStockOut).
+		Filter("create_time__gte", time.Now().AddDate(0, 0, -days)).
+		All(&rows, "product_id", "quantity")
+	for _, r := range rows {
+		out[r.ProductID] += r.Quantity
+	}
+	return out
+}
+
+// erpBatchKey 批次主键：效期属于批次，不随所在仓库变化
+func erpBatchKey(productID uint64, batch string) string {
+	return strconv.FormatUint(productID, 10) + "|" + batch
+}
+
+// erpToday 本地零点，用于按日历日计算剩余天数
+func erpToday() time.Time {
+	n := time.Now()
+	return time.Date(n.Year(), n.Month(), n.Day(), 0, 0, 0, 0, time.Local)
+}
+
+// erpBatchExpiry 批次到期日表（key = erpBatchKey）。
+//
+// 优先取该批次入库流水登记的最早到期日；没登记但商品配了保质期的，
+// 按该批次最早入库日推算，这样老数据与手工开单也能纳入效期管控。
+func erpBatchExpiry(tid string, productIDs []uint64, pmap map[uint64]models.ErpProduct) map[string]time.Time {
+	out := map[string]time.Time{}
+	if len(productIDs) == 0 {
+		return out
+	}
+	var ledgers []models.ErpStockLedger
+	_, _ = models.Orm.QueryTable(new(models.ErpStockLedger)).
+		Filter("tenant_id", tid).
+		Filter("product_id__in", productIDs).
+		Filter("direction", models.ErpStockIn).
+		Exclude("batch_no", "").
+		All(&ledgers, "product_id", "batch_no", "expire_date", "create_time")
+	firstIn := map[string]time.Time{}
+	for _, l := range ledgers {
+		if l.BatchNo == "" {
+			continue
+		}
+		k := erpBatchKey(l.ProductID, l.BatchNo)
+		if l.ExpireDate != nil {
+			if cur, hit := out[k]; !hit || l.ExpireDate.Before(cur) {
+				out[k] = *l.ExpireDate
+			}
+		}
+		if cur, hit := firstIn[k]; !hit || l.CreateTime.Before(cur) {
+			firstIn[k] = l.CreateTime
+		}
+	}
+	for k, in := range firstIn {
+		if _, hit := out[k]; hit {
+			continue
+		}
+		head, _, _ := strings.Cut(k, "|")
+		pid, _ := strconv.ParseUint(head, 10, 64)
+		days := pmap[pid].ShelfLifeDays
+		if days <= 0 {
+			continue
+		}
+		out[k] = time.Date(in.Year(), in.Month(), in.Day()+days, 0, 0, 0, 0, time.Local)
+	}
+	return out
+}
+
+// erpExpiringBatches 近 withinDays 天内到期（或已过期）且仍有库存的批次
+func erpExpiringBatches(tid string, withinDays int) []erpWarnRow {
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).Exclude("batch_no", "").
+		Filter("quantity__gt", 0).All(&stocks)
+	if len(stocks) == 0 {
+		return nil
+	}
+	ids := erpStockProductIDs(stocks)
+	pmap := erpProductMap(tid, ids)
+	expireMap := erpBatchExpiry(tid, ids, pmap)
+	wmap := erpWarehouseNameMap(tid)
+	today := erpToday()
+	out := make([]erpWarnRow, 0)
+	for _, s := range stocks {
+		exp, hit := expireMap[erpBatchKey(s.ProductID, s.BatchNo)]
+		if !hit {
+			continue
+		}
+		days := int(exp.Sub(today).Hours() / 24)
+		if days > withinDays {
+			continue
+		}
+		p := pmap[s.ProductID]
+		label := "效期临近"
+		typ := "expiring"
+		if days < 0 {
+			label, typ = "已过期", "expired"
+		}
+		out = append(out, erpWarnRow{
+			ProductID: s.ProductID, ProductCode: p.ProductCode, ProductName: p.ProductName,
+			Spec: p.Spec, Unit: p.BaseUnit, WarehouseName: wmap[s.WarehouseID],
+			BatchNo: s.BatchNo, Quantity: round4f(s.Quantity),
+			Type: typ, TypeLabel: label,
+			ExpireDate: exp.Format("2006-01-02"), ExpireInDays: days,
+			SuggestQty: round4f(s.Quantity),
+		})
+	}
+	return out
+}
+
+func erpFilterRows[T any](rows []T, keep func(T) bool) []T {
+	out := make([]T, 0, len(rows))
+	for _, r := range rows {
+		if keep(r) {
+			out = append(out, r)
+		}
+	}
+	return out
+}
diff --git a/go/controllers/backend_erp_supplier.go b/go/controllers/backend_erp_supplier.go
index a98db17..856faef 100644
--- a/go/controllers/backend_erp_supplier.go
+++ b/go/controllers/backend_erp_supplier.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -20,22 +21,7 @@ type BackendErpSupplierController struct {
 }
 
 func (c *BackendErpSupplierController) supplierClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendErpSupplierController) supplierJsonErr(httpStatus, bizCode int, msg string) {
@@ -76,13 +62,15 @@ type supplierFormPayload struct {
 	BankAccount       string `json:"bank_account"`
 	RegisteredAddress string `json:"registered_address"`
 	RegisteredPhone   string `json:"registered_phone"`
+	PaymentDays       int    `json:"payment_days"`
 }
 
 // List GET /backend/erp/supplier/list
 func (c *BackendErpSupplierController) List() {
 	claims, err := c.supplierClaims()
 	if err != nil {
-		c.supplierJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.supplierJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -156,7 +144,8 @@ func (c *BackendErpSupplierController) List() {
 func (c *BackendErpSupplierController) Detail() {
 	claims, err := c.supplierClaims()
 	if err != nil {
-		c.supplierJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.supplierJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -187,7 +176,8 @@ func (c *BackendErpSupplierController) Detail() {
 func (c *BackendErpSupplierController) ConvertToCustomer() {
 	claims, err := c.supplierClaims()
 	if err != nil {
-		c.supplierJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.supplierJsonErr(code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -226,7 +216,8 @@ func (c *BackendErpSupplierController) ConvertToCustomer() {
 func (c *BackendErpSupplierController) Create() {
 	claims, err := c.supplierClaims()
 	if err != nil {
-		c.supplierJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.supplierJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -276,6 +267,7 @@ func (c *BackendErpSupplierController) Create() {
 		BankAccount:       strings.TrimSpace(p.BankAccount),
 		RegisteredAddress: strings.TrimSpace(p.RegisteredAddress),
 		RegisteredPhone:   strings.TrimSpace(p.RegisteredPhone),
+		PaymentDays:       p.PaymentDays,
 		CreateUserID:      fmt.Sprintf("%d", claims.UserID),
 		CreateTime:        time.Now(),
 		UpdateTime:        time.Now(),
@@ -316,7 +308,8 @@ func (c *BackendErpSupplierController) Create() {
 func (c *BackendErpSupplierController) Update() {
 	claims, err := c.supplierClaims()
 	if err != nil {
-		c.supplierJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.supplierJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -371,6 +364,7 @@ func (c *BackendErpSupplierController) Update() {
 	supplier.BankAccount = strings.TrimSpace(p.BankAccount)
 	supplier.RegisteredAddress = strings.TrimSpace(p.RegisteredAddress)
 	supplier.RegisteredPhone = strings.TrimSpace(p.RegisteredPhone)
+	supplier.PaymentDays = p.PaymentDays
 	supplier.UpdateTime = time.Now()
 
 	if p.RegisterTime != "" {
@@ -408,7 +402,8 @@ func (c *BackendErpSupplierController) Update() {
 func (c *BackendErpSupplierController) Delete() {
 	claims, err := c.supplierClaims()
 	if err != nil {
-		c.supplierJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.supplierJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -455,7 +450,8 @@ func (c *BackendErpSupplierController) Delete() {
 func (c *BackendErpSupplierController) ToggleStatus() {
 	claims, err := c.supplierClaims()
 	if err != nil {
-		c.supplierJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.supplierJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_erp_warehouse.go b/go/controllers/backend_erp_warehouse.go
new file mode 100644
index 0000000..cc59c91
--- /dev/null
+++ b/go/controllers/backend_erp_warehouse.go
@@ -0,0 +1,234 @@
+package controllers
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"server/models"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// BackendErpWarehouseController 仓库档案
+type BackendErpWarehouseController struct {
+	BackendErpBaseController
+}
+
+type erpWarehousePayload struct {
+	WarehouseCode string `json:"warehouse_code"`
+	WarehouseName string `json:"warehouse_name"`
+	Address       string `json:"address"`
+	Manager       string `json:"manager"`
+	Phone         string `json:"phone"`
+	IsDefault     int8   `json:"is_default"`
+	Status        *int8  `json:"status"`
+	Remark        string `json:"remark"`
+}
+
+// List GET /backend/erp/warehouse/list
+func (c *BackendErpWarehouseController) List() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	rows, code, msg := erpWarehouseListCore(
+		erpNewActor(cl),
+		c.GetString("keyword"),
+		c.GetString("status"),
+		strings.TrimSpace(c.GetString("only_enabled")) == "1",
+	)
+	if msg != "" {
+		c.fail(code, code, msg)
+		return
+	}
+	c.ok(map[string]interface{}{"list": rows})
+}
+
+// Detail GET /backend/erp/warehouse/:id
+func (c *BackendErpWarehouseController) Detail() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	id := c.pathID()
+	var row models.ErpWarehouse
+	if err := models.Orm.QueryTable(new(models.ErpWarehouse)).
+		Filter("id", id).Filter("tenant_id", c.tid(cl)).
+		Filter("delete_time__isnull", true).One(&row); err != nil {
+		c.fail(404, 404, "仓库未找到")
+		return
+	}
+	c.ok(row)
+}
+
+// Create POST /backend/erp/warehouse
+func (c *BackendErpWarehouseController) Create() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	var p erpWarehousePayload
+	if !c.bindJSON(&p) {
+		return
+	}
+	if strings.TrimSpace(p.WarehouseName) == "" {
+		c.fail(400, 400, "仓库名称不能为空")
+		return
+	}
+	tid := c.tid(cl)
+	name := strings.TrimSpace(p.WarehouseName)
+	code := strings.TrimSpace(p.WarehouseCode)
+	if erpWarehouseFieldTaken(tid, "warehouse_name", name, 0) {
+		c.fail(400, 400, "仓库名称「"+name+"」已存在")
+		return
+	}
+	if code != "" && erpWarehouseFieldTaken(tid, "warehouse_code", code, 0) {
+		c.fail(400, 400, "仓库编号「"+code+"」已存在")
+		return
+	}
+	now := time.Now()
+	row := models.ErpWarehouse{
+		TenantID: tid, WarehouseCode: strings.TrimSpace(p.WarehouseCode),
+		WarehouseName: strings.TrimSpace(p.WarehouseName), Address: p.Address,
+		Manager: p.Manager, Phone: p.Phone, IsDefault: p.IsDefault,
+		Status: erpStatusOr(p.Status, 1), Remark: p.Remark,
+		CreateTime: now, UpdateTime: now,
+	}
+	if row.WarehouseCode == "" {
+		row.WarehouseCode = fmt.Sprintf("CK%s", now.Format("01021504"))
+	}
+	id, err := models.Orm.Insert(&row)
+	if err != nil {
+		c.fail(500, 500, "创建失败: "+err.Error())
+		return
+	}
+	if row.IsDefault == 1 {
+		erpClearDefaultWarehouse(tid, uint64(id))
+	}
+	c.ok(map[string]interface{}{"id": id})
+}
+
+// Update PUT /backend/erp/warehouse/:id
+func (c *BackendErpWarehouseController) Update() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	id := c.pathID()
+	if id == 0 {
+		c.fail(400, 400, "无效的ID")
+		return
+	}
+	var p erpWarehousePayload
+	if !c.bindJSON(&p) {
+		return
+	}
+	if strings.TrimSpace(p.WarehouseName) == "" {
+		c.fail(400, 400, "仓库名称不能为空")
+		return
+	}
+	tid := c.tid(cl)
+	var row models.ErpWarehouse
+	if err := models.Orm.QueryTable(new(models.ErpWarehouse)).
+		Filter("id", id).Filter("tenant_id", tid).
+		Filter("delete_time__isnull", true).One(&row); err != nil {
+		c.fail(404, 404, "仓库未找到")
+		return
+	}
+	name := strings.TrimSpace(p.WarehouseName)
+	code := strings.TrimSpace(p.WarehouseCode)
+	if erpWarehouseFieldTaken(tid, "warehouse_name", name, id) {
+		c.fail(400, 400, "仓库名称「"+name+"」已存在")
+		return
+	}
+	if code != "" && erpWarehouseFieldTaken(tid, "warehouse_code", code, id) {
+		c.fail(400, 400, "仓库编号「"+code+"」已存在")
+		return
+	}
+	if _, err := models.Orm.QueryTable(new(models.ErpWarehouse)).Filter("id", id).
+		Update(orm.Params{
+			"warehouse_code": strings.TrimSpace(p.WarehouseCode),
+			"warehouse_name": strings.TrimSpace(p.WarehouseName),
+			"address":        p.Address, "manager": p.Manager, "phone": p.Phone,
+			"is_default": p.IsDefault, "status": erpStatusOr(p.Status, row.Status), "remark": p.Remark,
+			"update_time": time.Now(),
+		}); err != nil {
+		c.fail(500, 500, "更新失败: "+err.Error())
+		return
+	}
+	if p.IsDefault == 1 {
+		erpClearDefaultWarehouse(tid, id)
+	}
+	c.ok(nil)
+}
+
+// Delete DELETE /backend/erp/warehouse/:id
+func (c *BackendErpWarehouseController) Delete() {
+	cl, err := c.claims()
+	if c.denied(err) {
+		return
+	}
+	id := c.pathID()
+	if id == 0 {
+		c.fail(400, 400, "无效的ID")
+		return
+	}
+	tid := c.tid(cl)
+	var row models.ErpWarehouse
+	if err := models.Orm.QueryTable(new(models.ErpWarehouse)).
+		Filter("id", id).Filter("tenant_id", tid).
+		Filter("delete_time__isnull", true).One(&row); err != nil {
+		c.fail(404, 404, "仓库未找到")
+		return
+	}
+	var qty float64
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).Filter("warehouse_id", id).All(&stocks, "quantity")
+	for _, s := range stocks {
+		qty += s.Quantity
+	}
+	if qty > 0.000001 {
+		c.fail(400, 400, "该仓库仍有库存，不能删除，请先调拨出库或停用")
+		return
+	}
+	now := time.Now()
+	if _, err := models.Orm.QueryTable(new(models.ErpWarehouse)).Filter("id", id).
+		Update(orm.Params{"delete_time": now, "update_time": now}); err != nil {
+		c.fail(500, 500, "删除失败: "+err.Error())
+		return
+	}
+	c.ok(nil)
+}
+
+// erpStatusOr status 用指针区分「未传」与「显式传 0（停用）」，未传时回落到调用方给的默认值。
+func erpStatusOr(v *int8, def int8) int8 {
+	if v == nil {
+		return def
+	}
+	return *v
+}
+
+// erpWarehouseFieldTaken 仓库名称/编号在租户内是否已被占用（excludeID>0 时排除自身）。
+// 名称唯一是硬约束：ERP 基础设置里的默认仓库按名称存储，重名会让设置指向错误的仓。
+func erpWarehouseFieldTaken(tid, field, value string, excludeID uint64) bool {
+	if strings.TrimSpace(value) == "" {
+		return false
+	}
+	qs := models.Orm.QueryTable(new(models.ErpWarehouse)).
+		Filter("tenant_id", tid).Filter("delete_time__isnull", true).
+		Filter(field, value)
+	if excludeID > 0 {
+		qs = qs.Exclude("id", excludeID)
+	}
+	n, _ := qs.Count()
+	return n > 0
+}
+
+// erpClearDefaultWarehouse 默认仓库全租户唯一
+func erpClearDefaultWarehouse(tid string, keepID uint64) {
+	_, _ = models.Orm.QueryTable(new(models.ErpWarehouse)).
+		Filter("tenant_id", tid).Filter("is_default", 1).Exclude("id", keepID).
+		Update(orm.Params{"is_default": 0, "update_time": time.Now()})
+}
diff --git a/go/controllers/backend_file.go b/go/controllers/backend_file.go
index 8d6309c..6d501b5 100644
--- a/go/controllers/backend_file.go
+++ b/go/controllers/backend_file.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -46,34 +47,13 @@ var allowedExtByCategory = map[string][]string{
 }
 
 func (c *BackendFileController) backendClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
+// effectiveTid 取文件归属租户 ID：只认令牌 claims。
+// ?tid= 与 X-Tenant-Id 此前可覆盖登录态，等于让任意 backend 账号往别人的目录树写文件。
 func (c *BackendFileController) effectiveTid(claims *jwtutil.Claims) uint64 {
-	_ = c.ParseForm(1 << 20)
-	if tid, err := c.GetUint64("tid"); err == nil && tid > 0 {
-		return tid
-	}
-	if h := strings.TrimSpace(c.Ctx.Request.Header.Get("X-Tenant-Id")); h != "" {
-		if v, e := strconv.ParseUint(h, 10, 64); e == nil {
-			return v
-		}
-	}
+	_ = c.ParseForm(1 << 20) // 上传接口需要先解析表单字段
 	if claims != nil && claims.TenantId > 0 {
 		return uint64(claims.TenantId)
 	}
@@ -195,7 +175,8 @@ func removePhysicalBySrc(webSrc string) {
 func (c *BackendFileController) GetAllFiles() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -249,7 +230,8 @@ func (c *BackendFileController) GetAllFiles() {
 func (c *BackendFileController) GetUserCate() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -290,7 +272,8 @@ type createCateBody struct {
 func (c *BackendFileController) CreateFileCate() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -337,7 +320,8 @@ type renameCateBody struct {
 func (c *BackendFileController) RenameFileCate() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -383,7 +367,8 @@ func (c *BackendFileController) RenameFileCate() {
 func (c *BackendFileController) DeleteFileCate() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -428,7 +413,8 @@ func (c *BackendFileController) DeleteFileCate() {
 func (c *BackendFileController) GetCateFiles() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -486,7 +472,8 @@ func (c *BackendFileController) GetCateFiles() {
 func (c *BackendFileController) GetFileByID() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -513,7 +500,8 @@ func (c *BackendFileController) GetFileByID() {
 func (c *BackendFileController) UploadFile() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	if err := c.Ctx.Request.ParseMultipartForm(fileUploadMaxBytes); err != nil {
@@ -659,7 +647,8 @@ type updateFileBody struct {
 func (c *BackendFileController) UpdateFile() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -713,7 +702,8 @@ func (c *BackendFileController) UpdateFile() {
 func (c *BackendFileController) DeleteFile() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -745,7 +735,8 @@ func (c *BackendFileController) DeleteFile() {
 func (c *BackendFileController) DeleteFilePermanently() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -783,7 +774,8 @@ func (c *BackendFileController) DeleteFilePermanently() {
 func (c *BackendFileController) MoveFile() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -821,7 +813,8 @@ type idsBody struct {
 func (c *BackendFileController) BatchDeleteFiles() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -861,7 +854,8 @@ func (c *BackendFileController) BatchDeleteFiles() {
 func (c *BackendFileController) BatchDeleteFilesPermanently() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -925,7 +919,8 @@ var avatarAllowedExts = map[string]bool{
 func (c *BackendFileController) UploadAvatar() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	if err := c.Ctx.Request.ParseMultipartForm(avatarUploadMaxBytes); err != nil {
@@ -1023,7 +1018,8 @@ func (c *BackendFileController) saveAvatarAndReply(identityID int, url, name str
 func (c *BackendFileController) UpdateAvatar() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -1048,7 +1044,8 @@ func (c *BackendFileController) UpdateAvatar() {
 func (c *BackendFileController) BatchMoveFiles() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
diff --git a/go/controllers/backend_frontend_content.go b/go/controllers/backend_frontend_content.go
index 52c1337..a165a09 100644
--- a/go/controllers/backend_frontend_content.go
+++ b/go/controllers/backend_frontend_content.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -144,7 +145,8 @@ func (c *BackendBannerController) readBannerPayload() (*cmsBannerPayload, error)
 func (c *BackendBannerController) ListAll() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -177,7 +179,8 @@ func (c *BackendBannerController) ListAll() {
 func (c *BackendBannerController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -225,7 +228,8 @@ func (c *BackendBannerController) Create() {
 func (c *BackendBannerController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -280,7 +284,8 @@ func (c *BackendBannerController) Update() {
 func (c *BackendBannerController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -315,7 +320,8 @@ func (c *BackendBannerController) Delete() {
 func (c *BackendFriendlinkController) List() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -374,7 +380,8 @@ func (c *BackendFriendlinkController) List() {
 func (c *BackendFriendlinkController) ListAll() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -417,7 +424,8 @@ type cmsFriendlinkPayload struct {
 func (c *BackendFriendlinkController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -474,7 +482,8 @@ func (c *BackendFriendlinkController) Create() {
 func (c *BackendFriendlinkController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -557,7 +566,8 @@ func toFloat(v interface{}) float64 {
 func (c *BackendFriendlinkController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -590,7 +600,8 @@ func (c *BackendFriendlinkController) Delete() {
 func (c *BackendFriendlinkController) BatchDelete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -648,7 +659,8 @@ type cmsOnepagePayload struct {
 func (c *BackendOnepageController) ListAll() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -681,7 +693,8 @@ func (c *BackendOnepageController) ListAll() {
 func (c *BackendOnepageController) GetOnePageByPath() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -719,7 +732,8 @@ func (c *BackendOnepageController) GetOnePageByPath() {
 func (c *BackendOnepageController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -792,7 +806,8 @@ func (c *BackendOnepageController) Create() {
 func (c *BackendOnepageController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -865,7 +880,8 @@ func (c *BackendOnepageController) Update() {
 func (c *BackendOnepageController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
diff --git a/go/controllers/backend_login_log.go b/go/controllers/backend_login_log.go
index 53c8783..d251600 100644
--- a/go/controllers/backend_login_log.go
+++ b/go/controllers/backend_login_log.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -27,22 +28,7 @@ func (c *BackendLoginLogController) jsonErr(httpStatus, bizCode int, msg string)
 }
 
 func (c *BackendLoginLogController) backendClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 // RecordLoginLog 写入一条登录日志（登录成功/失败均记录，失败不影响登录流程）。
@@ -73,7 +59,8 @@ func RecordLoginLog(tid *uint64, userID uint64, account, userName, tenantName, l
 // List GET /backend/loginLogs?page=1&pageSize=20&keyword=&status=&loginType=&startTime=&endTime=
 func (c *BackendLoginLogController) List() {
 	if _, err := c.backendClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -181,7 +168,8 @@ func (c *BackendLoginLogController) List() {
 // Detail GET /backend/loginLogs/:id
 func (c *BackendLoginLogController) Detail() {
 	if _, err := c.backendClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -220,7 +208,8 @@ func (c *BackendLoginLogController) Detail() {
 // Delete DELETE /backend/loginLogs/:id
 func (c *BackendLoginLogController) Delete() {
 	if _, err := c.backendClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -253,7 +242,8 @@ type backendLoginLogBatchDeletePayload struct {
 // BatchDelete POST /backend/loginLogs/batchDelete
 func (c *BackendLoginLogController) BatchDelete() {
 	if _, err := c.backendClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	raw, err := io.ReadAll(c.Ctx.Request.Body)
diff --git a/go/controllers/backend_login_verify.go b/go/controllers/backend_login_verify.go
index 77142ef..2ac6799 100644
--- a/go/controllers/backend_login_verify.go
+++ b/go/controllers/backend_login_verify.go
@@ -1,226 +1,214 @@
-package controllers
-
-import (
-	"encoding/json"
-	"io"
-	"strings"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// BackendLoginVerifyController 后台登录验证配置
-// 对应前端 backend/src/api/sitesettings.js：
-// - GET  /backend/loginVerifyInfos
-// - POST /backend/saveloginVerifyInfos
-type BackendLoginVerifyController struct {
-	beego.Controller
-}
-
-func (c *BackendLoginVerifyController) backendLoginVerifyClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, errBackendLoginVerify("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, errBackendLoginVerify("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, errBackendLoginVerify("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, errBackendLoginVerify("无权访问")
-	}
-	return claims, nil
-}
-
-type backendLoginVerifyError string
-
-func (e backendLoginVerifyError) Error() string {
-	return string(e)
-}
-
-func errBackendLoginVerify(msg string) error {
-	return backendLoginVerifyError(msg)
-}
-
-func (c *BackendLoginVerifyController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-type backendLoginVerifyPayload struct {
-	OpenVerify       *bool   `json:"openVerify"`
-	OpenVerifyInt    *int8   `json:"openVerify_enabled"`
-	VerifyModel      string  `json:"verifyModel"`
-	UseGeetest       string  `json:"use_geetest"`
-	Geetest3ID       *string `json:"geetest3ID"`
-	Geetest3IDSnake  *string `json:"geetest3_id"`
-	Geetest3Key      *string `json:"geetest3KEY"`
-	Geetest3KeySnake *string `json:"geetest3_key"`
-	Geetest4ID       *string `json:"geetest4ID"`
-	Geetest4IDSnake  *string `json:"geetest4_id"`
-	Geetest4Key      *string `json:"geetest4KEY"`
-	Geetest4KeySnake *string `json:"geetest4_key"`
-}
-
-func backendVerifyTypeToModel(v string) string {
-	switch strings.TrimSpace(v) {
-	case "captcha":
-		return "1"
-	case "sms":
-		return "2"
-	case "email":
-		return "3"
-	case "geetest3":
-		return "4"
-	case "geetest", "geetest4":
-		return "5"
-	default:
-		return "1"
-	}
-}
-
-func backendVerifyModelToType(v string) string {
-	switch strings.TrimSpace(v) {
-	case "1":
-		return "captcha"
-	case "2":
-		return "sms"
-	case "3":
-		return "email"
-	case "4":
-		return "geetest3"
-	case "5":
-		return "geetest4"
-	default:
-		switch strings.TrimSpace(v) {
-		case "captcha", "sms", "email", "geetest", "geetest3", "geetest4":
-			return strings.TrimSpace(v)
-		default:
-			return "captcha"
-		}
-	}
-}
-
-func backendStringPtrValue(primary, fallback *string) string {
-	if primary != nil {
-		return *primary
-	}
-	if fallback != nil {
-		return *fallback
-	}
-	return ""
-}
-
-func backendStringPtrOrNil(primary, fallback *string) *string {
-	value := strings.TrimSpace(backendStringPtrValue(primary, fallback))
-	if value == "" {
-		return nil
-	}
-	return &value
-}
-
-// GetLoginVerifyInfos GET /backend/loginVerifyInfos
-func (c *BackendLoginVerifyController) GetLoginVerifyInfos() {
-	if _, err := c.backendLoginVerifyClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	cfg, err := models.GetPlatformLoginVerify()
-	if err != nil {
-		c.jsonErr(500, 500, "获取配置失败")
-		return
-	}
-
-	openVerify := "0"
-	if cfg.OpenVerifyEnabled == 1 {
-		openVerify = "1"
-	}
-
-	data := []map[string]string{
-		{"label": "openVerify", "value": openVerify},
-		{"label": "verifyModel", "value": backendVerifyTypeToModel(cfg.VerifyType)},
-		{"label": "geetest3ID", "value": backendStringPtrValue(cfg.Geetest3ID, nil)},
-		{"label": "geetest3KEY", "value": backendStringPtrValue(cfg.Geetest3Key, nil)},
-		{"label": "geetest4ID", "value": backendStringPtrValue(cfg.Geetest4ID, nil)},
-		{"label": "geetest4KEY", "value": backendStringPtrValue(cfg.Geetest4Key, nil)},
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
-	_ = c.ServeJSON()
-}
-
-// SaveLoginVerifyInfos POST /backend/saveloginVerifyInfos
-func (c *BackendLoginVerifyController) SaveLoginVerifyInfos() {
-	if _, err := c.backendLoginVerifyClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	var p backendLoginVerifyPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	openVerifyEnabled := int8(0)
-	if p.OpenVerify != nil && *p.OpenVerify {
-		openVerifyEnabled = 1
-	}
-	if p.OpenVerifyInt != nil {
-		openVerifyEnabled = *p.OpenVerifyInt
-	}
-
-	verifyModel := p.VerifyModel
-	if strings.TrimSpace(verifyModel) == "" {
-		verifyModel = p.UseGeetest
-	}
-	verifyType := backendVerifyModelToType(verifyModel)
-
-	geetest3ID := backendStringPtrOrNil(p.Geetest3ID, p.Geetest3IDSnake)
-	geetest3Key := backendStringPtrOrNil(p.Geetest3Key, p.Geetest3KeySnake)
-	geetest4ID := backendStringPtrOrNil(p.Geetest4ID, p.Geetest4IDSnake)
-	geetest4Key := backendStringPtrOrNil(p.Geetest4Key, p.Geetest4KeySnake)
-
-	if verifyType == "geetest3" {
-		if geetest3ID == nil || geetest3Key == nil {
-			c.jsonErr(400, 400, "极验3.0 ID和KEY不能为空")
-			return
-		}
-	}
-	if verifyType == "geetest4" || verifyType == "geetest" {
-		if geetest4ID == nil || geetest4Key == nil {
-			c.jsonErr(400, 400, "极验4.0 ID和KEY不能为空")
-			return
-		}
-	}
-
-	err = models.SavePlatformLoginVerify(&models.PlatformLoginVerify{
-		OpenVerifyEnabled: openVerifyEnabled,
-		VerifyType:        verifyType,
-		Geetest3ID:        geetest3ID,
-		Geetest3Key:       geetest3Key,
-		Geetest4ID:        geetest4ID,
-		Geetest4Key:       geetest4Key,
-	})
-	if err != nil {
-		c.jsonErr(500, 500, "保存失败")
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strings"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// BackendLoginVerifyController 后台登录验证配置
+// 对应前端 backend/src/api/sitesettings.js：
+// - GET  /backend/loginVerifyInfos
+// - POST /backend/saveloginVerifyInfos
+type BackendLoginVerifyController struct {
+	beego.Controller
+}
+
+func (c *BackendLoginVerifyController) backendLoginVerifyClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+}
+
+type backendLoginVerifyError string
+
+func (e backendLoginVerifyError) Error() string {
+	return string(e)
+}
+
+func errBackendLoginVerify(msg string) error {
+	return backendLoginVerifyError(msg)
+}
+
+func (c *BackendLoginVerifyController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+type backendLoginVerifyPayload struct {
+	OpenVerify       *bool   `json:"openVerify"`
+	OpenVerifyInt    *int8   `json:"openVerify_enabled"`
+	VerifyModel      string  `json:"verifyModel"`
+	UseGeetest       string  `json:"use_geetest"`
+	Geetest3ID       *string `json:"geetest3ID"`
+	Geetest3IDSnake  *string `json:"geetest3_id"`
+	Geetest3Key      *string `json:"geetest3KEY"`
+	Geetest3KeySnake *string `json:"geetest3_key"`
+	Geetest4ID       *string `json:"geetest4ID"`
+	Geetest4IDSnake  *string `json:"geetest4_id"`
+	Geetest4Key      *string `json:"geetest4KEY"`
+	Geetest4KeySnake *string `json:"geetest4_key"`
+}
+
+func backendVerifyTypeToModel(v string) string {
+	switch strings.TrimSpace(v) {
+	case "captcha":
+		return "1"
+	case "sms":
+		return "2"
+	case "email":
+		return "3"
+	case "geetest3":
+		return "4"
+	case "geetest", "geetest4":
+		return "5"
+	default:
+		return "1"
+	}
+}
+
+func backendVerifyModelToType(v string) string {
+	switch strings.TrimSpace(v) {
+	case "1":
+		return "captcha"
+	case "2":
+		return "sms"
+	case "3":
+		return "email"
+	case "4":
+		return "geetest3"
+	case "5":
+		return "geetest4"
+	default:
+		switch strings.TrimSpace(v) {
+		case "captcha", "sms", "email", "geetest", "geetest3", "geetest4":
+			return strings.TrimSpace(v)
+		default:
+			return "captcha"
+		}
+	}
+}
+
+func backendStringPtrValue(primary, fallback *string) string {
+	if primary != nil {
+		return *primary
+	}
+	if fallback != nil {
+		return *fallback
+	}
+	return ""
+}
+
+func backendStringPtrOrNil(primary, fallback *string) *string {
+	value := strings.TrimSpace(backendStringPtrValue(primary, fallback))
+	if value == "" {
+		return nil
+	}
+	return &value
+}
+
+// GetLoginVerifyInfos GET /backend/loginVerifyInfos
+func (c *BackendLoginVerifyController) GetLoginVerifyInfos() {
+	if _, err := c.backendLoginVerifyClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	cfg, err := models.GetPlatformLoginVerify()
+	if err != nil {
+		c.jsonErr(500, 500, "获取配置失败")
+		return
+	}
+
+	openVerify := "0"
+	if cfg.OpenVerifyEnabled == 1 {
+		openVerify = "1"
+	}
+
+	data := []map[string]string{
+		{"label": "openVerify", "value": openVerify},
+		{"label": "verifyModel", "value": backendVerifyTypeToModel(cfg.VerifyType)},
+		{"label": "geetest3ID", "value": backendStringPtrValue(cfg.Geetest3ID, nil)},
+		{"label": "geetest3KEY", "value": backendStringPtrValue(cfg.Geetest3Key, nil)},
+		{"label": "geetest4ID", "value": backendStringPtrValue(cfg.Geetest4ID, nil)},
+		{"label": "geetest4KEY", "value": backendStringPtrValue(cfg.Geetest4Key, nil)},
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+// SaveLoginVerifyInfos POST /backend/saveloginVerifyInfos
+func (c *BackendLoginVerifyController) SaveLoginVerifyInfos() {
+	if _, err := c.backendLoginVerifyClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	var p backendLoginVerifyPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	openVerifyEnabled := int8(0)
+	if p.OpenVerify != nil && *p.OpenVerify {
+		openVerifyEnabled = 1
+	}
+	if p.OpenVerifyInt != nil {
+		openVerifyEnabled = *p.OpenVerifyInt
+	}
+
+	verifyModel := p.VerifyModel
+	if strings.TrimSpace(verifyModel) == "" {
+		verifyModel = p.UseGeetest
+	}
+	verifyType := backendVerifyModelToType(verifyModel)
+
+	geetest3ID := backendStringPtrOrNil(p.Geetest3ID, p.Geetest3IDSnake)
+	geetest3Key := backendStringPtrOrNil(p.Geetest3Key, p.Geetest3KeySnake)
+	geetest4ID := backendStringPtrOrNil(p.Geetest4ID, p.Geetest4IDSnake)
+	geetest4Key := backendStringPtrOrNil(p.Geetest4Key, p.Geetest4KeySnake)
+
+	if verifyType == "geetest3" {
+		if geetest3ID == nil || geetest3Key == nil {
+			c.jsonErr(400, 400, "极验3.0 ID和KEY不能为空")
+			return
+		}
+	}
+	if verifyType == "geetest4" || verifyType == "geetest" {
+		if geetest4ID == nil || geetest4Key == nil {
+			c.jsonErr(400, 400, "极验4.0 ID和KEY不能为空")
+			return
+		}
+	}
+
+	err = models.SavePlatformLoginVerify(&models.PlatformLoginVerify{
+		OpenVerifyEnabled: openVerifyEnabled,
+		VerifyType:        verifyType,
+		Geetest3ID:        geetest3ID,
+		Geetest3Key:       geetest3Key,
+		Geetest4ID:        geetest4ID,
+		Geetest4Key:       geetest4Key,
+	})
+	if err != nil {
+		c.jsonErr(500, 500, "保存失败")
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/backend_mcp_server.go b/go/controllers/backend_mcp_server.go
index ea47f26..82ca121 100644
--- a/go/controllers/backend_mcp_server.go
+++ b/go/controllers/backend_mcp_server.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -21,22 +22,7 @@ type BackendMcpServerController struct {
 }
 
 func (c *BackendMcpServerController) mcpSrvClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendMcpServerController) mcpSrvErr(httpStatus, bizCode int, msg string) {
@@ -113,7 +99,8 @@ func (p *mcpServerPayload) toModel(claims *jwtutil.Claims) models.BackendMcpServ
 func (c *BackendMcpServerController) List() {
 	claims, err := c.mcpSrvClaims()
 	if err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	var list []models.BackendMcpServer
@@ -134,7 +121,8 @@ func (c *BackendMcpServerController) List() {
 func (c *BackendMcpServerController) Create() {
 	claims, err := c.mcpSrvClaims()
 	if err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	body, err := io.ReadAll(c.Ctx.Request.Body)
@@ -164,7 +152,8 @@ func (c *BackendMcpServerController) Create() {
 func (c *BackendMcpServerController) Update() {
 	claims, err := c.mcpSrvClaims()
 	if err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -225,7 +214,8 @@ func (c *BackendMcpServerController) Update() {
 func (c *BackendMcpServerController) Delete() {
 	claims, err := c.mcpSrvClaims()
 	if err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -257,7 +247,8 @@ func (c *BackendMcpServerController) Delete() {
 func (c *BackendMcpServerController) Toggle() {
 	claims, err := c.mcpSrvClaims()
 	if err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -306,7 +297,8 @@ func (c *BackendMcpServerController) Toggle() {
 func (c *BackendMcpServerController) Test() {
 	claims, err := c.mcpSrvClaims()
 	if err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	body, err := io.ReadAll(c.Ctx.Request.Body)
@@ -379,7 +371,8 @@ func (c *BackendMcpServerController) Test() {
 func (c *BackendMcpServerController) Tools() {
 	claims, err := c.mcpSrvClaims()
 	if err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -422,7 +415,8 @@ func (c *BackendMcpServerController) Tools() {
 // Market GET /backend/mcp/server/market
 func (c *BackendMcpServerController) Market() {
 	if _, err := c.mcpSrvClaims(); err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	c.mcpSrvOk(map[string]interface{}{"list": services.GetMcpMarket()})
@@ -433,7 +427,8 @@ func (c *BackendMcpServerController) Market() {
 func (c *BackendMcpServerController) AddFromMarket() {
 	claims, err := c.mcpSrvClaims()
 	if err != nil {
-		c.mcpSrvErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpSrvErr(code, code, err.Error())
 		return
 	}
 	body, err := io.ReadAll(c.Ctx.Request.Body)
diff --git a/go/controllers/backend_mcp_tool.go b/go/controllers/backend_mcp_tool.go
index 9729e68..3ae53a4 100644
--- a/go/controllers/backend_mcp_tool.go
+++ b/go/controllers/backend_mcp_tool.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -20,22 +21,7 @@ type BackendMcpToolController struct {
 }
 
 func (c *BackendMcpToolController) mcpClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendMcpToolController) mcpJsonErr(httpStatus, bizCode int, msg string) {
@@ -65,7 +51,8 @@ type mcpToolPayload struct {
 func (c *BackendMcpToolController) List() {
 	claims, err := c.mcpClaims()
 	if err != nil {
-		c.mcpJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -88,7 +75,8 @@ func (c *BackendMcpToolController) List() {
 func (c *BackendMcpToolController) Create() {
 	claims, err := c.mcpClaims()
 	if err != nil {
-		c.mcpJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -141,7 +129,8 @@ func (c *BackendMcpToolController) Create() {
 func (c *BackendMcpToolController) Update() {
 	claims, err := c.mcpClaims()
 	if err != nil {
-		c.mcpJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -197,7 +186,8 @@ func (c *BackendMcpToolController) Update() {
 func (c *BackendMcpToolController) Delete() {
 	claims, err := c.mcpClaims()
 	if err != nil {
-		c.mcpJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -233,7 +223,8 @@ func (c *BackendMcpToolController) Delete() {
 func (c *BackendMcpToolController) Test() {
 	// 验证用户登录状态
 	if _, err := c.mcpClaims(); err != nil {
-		c.mcpJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.mcpJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_menu.go b/go/controllers/backend_menu.go
index a32cc8c..c25507a 100644
--- a/go/controllers/backend_menu.go
+++ b/go/controllers/backend_menu.go
@@ -1,600 +1,636 @@
-package controllers
-
-import (
-	"encoding/json"
-	"strconv"
-	"strings"
-
-	"server/models"
-	"server/pkg/jwtutil"
-	"server/services"
-	authsvc "server/services/auth"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type BackendMenuController struct {
-	beego.Controller
-}
-
-type AdminMenuController = BackendMenuController
-
-type menuPayload struct {
-	Pid           *int64   `json:"pid"`
-	Title         *string  `json:"title"`
-	Path          *string  `json:"path"`
-	ComponentPath *string  `json:"component_path"`
-	Icon          *string  `json:"icon"`
-	Sort          *int64   `json:"sort"`
-	Status        *int8    `json:"status"`
-	IsVisible     *int8    `json:"is_visible"`
-	Views         []int    `json:"views"`
-	Platforms     []string `json:"platforms"` // 展示端：["web"] ["app"] ["web","app"]；空=继承所属模块
-	Type          *int8    `json:"type"`
-	Permission    *string  `json:"permission"`
-}
-
-func parseViews(raw *string) []int {
-	if raw == nil || strings.TrimSpace(*raw) == "" {
-		return nil
-	}
-	var arr []int
-	if err := json.Unmarshal([]byte(*raw), &arr); err != nil {
-		return nil
-	}
-	return arr
-}
-
-func hasView(arr []int, v int) bool {
-	for _, n := range arr {
-		if n == v {
-			return true
-		}
-	}
-	return false
-}
-
-func filterMenusByView(menus []models.SystemMenu, v int) []models.SystemMenu {
-	out := make([]models.SystemMenu, 0, len(menus))
-	for _, m := range menus {
-		views := parseViews(m.Views)
-		if v == 1 && len(views) == 0 {
-			out = append(out, m)
-			continue
-		}
-		if hasView(views, v) {
-			out = append(out, m)
-		}
-	}
-	return out
-}
-
-func (c *BackendMenuController) GetMenu() {
-	var menus []models.SystemMenu
-	_, err := models.Orm.QueryTable(new(models.SystemMenu)).Filter("status", 1).All(&menus)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": buildMenuTree(filterMenusByView(menus, 1), 0)}
-	_ = c.ServeJSON()
-}
-
-func (c *BackendMenuController) GetBackendMenu() {
-	var menus []models.SystemMenu
-	_, err := models.Orm.QueryTable(new(models.SystemMenu)).Filter("status", 1).All(&menus)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
-		_ = c.ServeJSON()
-		return
-	}
-	// 先按 views 过滤租户端，再按展示端过滤出 Web 端可见菜单。
-	// 菜单未单独配置 platforms 时继承所属模块，因此要传入全部模块。
-	allModules, _ := services.ListAllModulesForScope()
-	backendMenus := services.FilterMenusByPlatformWithModules(filterMenusByView(menus, 2), allModules, models.PlatformWeb)
-
-	// 按当前登录用户角色过滤可见功能菜单：
-	// 角色 rights 为空（或未分配角色）→ 全权限，返回全部后端菜单；
-	// 否则仅返回角色允许访问的菜单（含其祖先节点，保证树结构完整）。
-	idStr := c.Ctx.Input.Param(":id")
-	uid, _ := strconv.ParseUint(idStr, 10, 64)
-	tid := uint64(0)
-	groupID := uint64(0)
-	if uid > 0 {
-		// URL 参数是认证中心 identity_id，不能直接当 yz_system_tenant_user 主键查：
-		// 主键恰好与 identity_id 相同时会套用**别人**的角色权限——
-		// 如 identity_id=1（李增炎）命中主键 1（李志强 tid=1、group_id=0），
-		// 反而免过滤拿到全量菜单（越权）；identity_id=2 则命中李增炎的受限角色，
-		// 菜单被错误过滤（基础设置 404）。
-		// 解析顺序：认证绑定表（identity_id+tid → group_id，与 /auth/userinfo 同源）
-		// → 业务表身份解析链（identity_id 换算 → 主键 → 老 uid）。
-		jwtTid := backendJWTTenantID(c.Ctx.Request.Header.Get("Authorization"))
-		if bind, e := authsvc.GetTenantUser(uid, jwtTid); e == nil {
-			tid = bind.Tid
-			groupID = bind.GroupID
-		} else if tu, e := findBackendTenantUser(uid, jwtTid, false); e == nil {
-			tid = tu.Tid
-			groupID = tu.GroupID
-		}
-	}
-	if groupID > 0 {
-		var role models.AdminRole
-		if re := models.Orm.QueryTable(new(models.AdminRole)).
-			Filter("id", groupID).
-			Filter("cid", 2).
-			One(&role); re == nil {
-			backendMenus = filterMenusByRights(backendMenus, role.Rights)
-		}
-	}
-
-	// 套餐功能开通标记：未开通模块的菜单保留但标记 locked（前端展示锁定态与升级提示，不再 404）
-	backendMenus, lockedMenuIDs := filterMenusByTenantPackageLocked(c.Ctx.Request.Header.Get("Authorization"), backendMenus, tid, true)
-	menuTree := buildMenuTree(backendMenus, 0)
-	markTreeLocked(menuTree, lockedMenuIDs)
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": menuTree}
-	_ = c.ServeJSON()
-}
-
-// backendJWTTenantID 从 Authorization 的 Bearer Token 中解析租户ID；取不到时返回 0。
-// 说明：backend 端登录时 token 里写入了租户ID（GenerateToken 的 tenantId），
-// 用它做套餐功能过滤比依赖前端传参更可靠。
-func backendJWTTenantID(auth string) uint64 {
-	auth = strings.TrimSpace(auth)
-	if auth == "" {
-		return 0
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return 0
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil || claims == nil || claims.TenantId <= 0 {
-		return 0
-	}
-	return uint64(claims.TenantId)
-}
-
-// filterMenusByTenantPackage 按租户套餐包含的功能模块过滤菜单（剔除未开通模块，用于角色菜单分配等场景）。
-// tid 优先取 token 中的租户ID，其次用调用方传入的兜底值；两者都取不到时不处理（保持原行为）。
-func filterMenusByTenantPackage(authHeader string, menus []models.SystemMenu, tid uint64) []models.SystemMenu {
-	filtered, _ := filterMenusByTenantPackageLocked(authHeader, menus, tid, false)
-	return filtered
-}
-
-// filterMenusByTenantPackageLocked 按租户套餐处理菜单。
-// markLocked=false：剔除未开通模块的菜单（原行为）；markLocked=true：保留菜单并返回锁定菜单ID集合（含后代）。
-func filterMenusByTenantPackageLocked(authHeader string, menus []models.SystemMenu, tid uint64, markLocked bool) ([]models.SystemMenu, map[uint64]bool) {
-	if jwtTid := backendJWTTenantID(authHeader); jwtTid > 0 {
-		tid = jwtTid
-	}
-	if tid == 0 {
-		return menus, nil
-	}
-	allModules, err := services.ListEnabledModules()
-	if err != nil || len(allModules) == 0 {
-		return menus, nil
-	}
-	allowed := services.GetTenantModuleCodes(tid)
-	// 安全兜底：租户没有绑定套餐或套餐未配置任何功能模块时不做过滤，
-	// 避免因套餐数据缺失导致租户端菜单整体消失。
-	if len(allowed) == 0 {
-		return menus, nil
-	}
-	if markLocked {
-		return services.MarkMenusLockedByTenantModules(menus, allModules, allowed)
-	}
-	return services.FilterMenusByTenantModules(menus, allModules, allowed), nil
-}
-
-// markTreeLocked 将菜单树中位于锁定集合的节点标记为 locked
-func markTreeLocked(nodes []*menuNode, locked map[uint64]bool) {
-	if len(nodes) == 0 || len(locked) == 0 {
-		return
-	}
-	for _, n := range nodes {
-		if locked[n.ID] {
-			n.Locked = true
-		}
-		if len(n.Children) > 0 {
-			markTreeLocked(n.Children, locked)
-		}
-	}
-}
-
-// parseRightsToSet 将角色 rights 解析为菜单 ID 集合（兼容 JSON 数组 / 逗号分隔）
-func parseRightsToSet(raw string) map[uint64]bool {
-	set := map[uint64]bool{}
-	var arr []string
-	if err := json.Unmarshal([]byte(raw), &arr); err == nil {
-		for _, s := range arr {
-			s = strings.TrimSpace(s)
-			if s == "" {
-				continue
-			}
-			if n, e := strconv.ParseUint(s, 10, 64); e == nil {
-				set[n] = true
-			}
-		}
-		return set
-	}
-	for _, s := range strings.Split(raw, ",") {
-		s = strings.TrimSpace(s)
-		if s == "" {
-			continue
-		}
-		if n, e := strconv.ParseUint(s, 10, 64); e == nil {
-			set[n] = true
-		}
-	}
-	return set
-}
-
-// filterMenusByRights 按角色 rights（菜单 ID 集合）过滤菜单，并补全祖先节点，保证树结构完整。
-// rights 为空（nil / 空串）→ 原样返回（全权限）。
-func filterMenusByRights(menus []models.SystemMenu, rights *string) []models.SystemMenu {
-	if rights == nil || strings.TrimSpace(*rights) == "" {
-		return menus
-	}
-	allowed := parseRightsToSet(*rights)
-	if len(allowed) == 0 {
-		return menus
-	}
-
-	pidOf := make(map[uint64]int64, len(menus))
-	byID := make(map[uint64]models.SystemMenu, len(menus))
-	for _, m := range menus {
-		pidOf[m.ID] = m.Pid
-		byID[m.ID] = m
-	}
-
-	final := make(map[uint64]bool, len(allowed))
-	for id := range allowed {
-		cur := id
-		for {
-			if _, ok := byID[cur]; !ok {
-				break
-			}
-			if final[cur] {
-				break
-			}
-			final[cur] = true
-			p := pidOf[cur]
-			if p == 0 {
-				break
-			}
-			cur = uint64(p)
-		}
-	}
-
-	out := make([]models.SystemMenu, 0, len(final))
-	for id := range final {
-		out = append(out, byID[id])
-	}
-	return out
-}
-
-func (c *BackendMenuController) GetTenantList() {
-	var tid uint64
-	if jwtTid := c.Ctx.Input.GetData("tid"); jwtTid != nil {
-		tid = jwtTid.(uint64)
-	}
-	if tid == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "未登录或非法请求"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	var menus []models.SystemMenu
-	if _, err := models.Orm.QueryTable(new(models.SystemMenu)).Filter("status", 1).All(&menus); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取失败：" + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-
-	tree := buildMenuTree(filterMenusByView(menus, 2), 0)
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "获取成功",
-		"data": map[string]interface{}{"list": tree, "total": len(tree)},
-	}
-	_ = c.ServeJSON()
-}
-
-func (c *BackendMenuController) GetAllMenus() {
-	var menus []models.SystemMenu
-	cid, _ := c.GetInt("cid")
-
-	if _, err := models.Orm.QueryTable(new(models.SystemMenu)).All(&menus); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
-		_ = c.ServeJSON()
-		return
-	}
-	if cid == 1 {
-		menus = filterMenusByView(menus, 1)
-	} else if cid == 2 {
-		menus = filterMenusByView(menus, 2)
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": buildMenuTree(menus, 0)}
-	_ = c.ServeJSON()
-}
-
-// filterAssignableMenus 仅保留「已启用且已显示」的菜单。
-// 停用或隐藏的菜单不参与角色权限分配，直接在服务端屏蔽，不依赖前端过滤。
-func filterAssignableMenus(menus []models.SystemMenu) []models.SystemMenu {
-	out := make([]models.SystemMenu, 0, len(menus))
-	for _, m := range menus {
-		if m.Status != 1 {
-			continue
-		}
-		// is_visible 为空视为显示
-		if m.IsVisible != nil && *m.IsVisible == 0 {
-			continue
-		}
-		out = append(out, m)
-	}
-	return out
-}
-
-// GetAssignableMenus 获取可分配给角色的菜单树
-// 过滤规则（均在服务端完成）：
-//  1. cid：按菜单所属端过滤（1=平台端 2=租户端，不传则不过滤）
-//  2. status=1：仅已启用的菜单
-//  3. is_visible != 0：仅已显示的菜单（为空视为显示）
-//
-// 父级菜单被过滤时，其子菜单一并不可分配（菜单树按 pid 构建，父级缺失则整条分支不会返回）。
-// GET /backend/assignableMenus?cid=2
-func (c *BackendMenuController) GetAssignableMenus() {
-	var menus []models.SystemMenu
-	cid, _ := c.GetInt("cid")
-
-	if _, err := models.Orm.QueryTable(new(models.SystemMenu)).All(&menus); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
-		_ = c.ServeJSON()
-		return
-	}
-	if cid == 1 || cid == 2 {
-		menus = filterMenusByView(menus, cid)
-	}
-	menus = filterAssignableMenus(menus)
-	// 租户端：仅可分配当前租户套餐已开通的功能模块下的菜单
-	if cid == 2 {
-		menus = filterMenusByTenantPackage(c.Ctx.Request.Header.Get("Authorization"), menus, 0)
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": buildMenuTree(menus, 0)}
-	_ = c.ServeJSON()
-}
-
-func (c *BackendMenuController) GetAllBackendMenus() {
-	var menus []models.SystemMenu
-	if _, err := models.Orm.QueryTable(new(models.SystemMenu)).All(&menus); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": buildMenuTree(filterMenusByView(menus, 2), 0)}
-	_ = c.ServeJSON()
-}
-
-type menuNode struct {
-	ID            uint64      `json:"id"`
-	Pid           int64       `json:"pid"`
-	Title         string      `json:"title"`
-	Path          string      `json:"path,omitempty"`
-	ComponentPath string      `json:"component_path,omitempty"`
-	Icon          string      `json:"icon,omitempty"`
-	Sort          int64       `json:"sort"`
-	Status        int8        `json:"status"`
-	IsVisible     *int8       `json:"is_visible,omitempty"`
-	Views         []int       `json:"views,omitempty"`
-	Platforms     []string    `json:"platforms,omitempty"` // 展示端，空=继承所属模块
-	Type          int8        `json:"type"`
-	Permission    string      `json:"permission,omitempty"`
-	Locked        bool        `json:"locked,omitempty"`
-	Children      []*menuNode `json:"children,omitempty"`
-}
-
-func buildMenuTree(menus []models.SystemMenu, pid int64) []*menuNode {
-	var tree []*menuNode
-	for _, m := range menus {
-		if m.Pid == pid {
-			node := &menuNode{
-				ID:        m.ID,
-				Pid:       m.Pid,
-				Title:     m.Title,
-				Sort:      m.Sort,
-				Status:    m.Status,
-				IsVisible: m.IsVisible,
-				Views:     parseViews(m.Views),
-				Platforms: services.ParsePlatforms(m.Platforms),
-				Type:      m.Type,
-			}
-			if m.Path != nil {
-				node.Path = *m.Path
-			}
-			if m.ComponentPath != nil {
-				node.ComponentPath = *m.ComponentPath
-			}
-			if m.Icon != nil {
-				node.Icon = *m.Icon
-			}
-			if m.Permission != nil {
-				node.Permission = *m.Permission
-			}
-			if children := buildMenuTree(menus, int64(m.ID)); len(children) > 0 {
-				node.Children = children
-			}
-			tree = append(tree, node)
-		}
-	}
-	return tree
-}
-
-func (c *BackendMenuController) UpdateMenuStatus() {
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效菜单ID"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	var body struct {
-		Status *int8 `json:"status"`
-	}
-	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &body); err != nil || body.Status == nil {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	if _, err = models.Orm.QueryTable(new(models.SystemMenu)).Filter("id", id).Update(map[string]interface{}{"status": *body.Status}); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "success": true}
-	_ = c.ServeJSON()
-}
-
-func (c *BackendMenuController) CreateMenu() {
-	payload, ok := c.parseMenuPayload(true)
-	if !ok {
-		return
-	}
-
-	var viewsStr string
-	views := payload.Views
-	if len(views) == 0 {
-		views = []int{1}
-	}
-	if b, err := json.Marshal(views); err == nil {
-		viewsStr = string(b)
-	}
-
-	menu := models.SystemMenu{
-		Pid:           valueInt64(payload.Pid, 0),
-		Title:         strings.TrimSpace(valueString(payload.Title, "")),
-		Sort:          valueInt64(payload.Sort, 0),
-		Status:        valueInt8(payload.Status, 1),
-		IsVisible:     ptrInt8(valueInt8(payload.IsVisible, 1)),
-		Views:         &viewsStr,
-		Type:          valueInt8(payload.Type, 1),
-		Path:          ptrString(valueString(payload.Path, "")),
-		ComponentPath: ptrString(valueString(payload.ComponentPath, "")),
-		Icon:          ptrString(valueString(payload.Icon, "")),
-		Permission:    ptrString(valueString(payload.Permission, "")),
-		// 空串表示「继承所属模块的展示端」（模块也未配置则全端）
-		Platforms: ptrString(services.NormalizePlatforms(payload.Platforms)),
-	}
-
-	id, err := models.Orm.Insert(&menu)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "创建失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "创建成功", "data": map[string]interface{}{"id": id}}
-	_ = c.ServeJSON()
-}
-
-func (c *BackendMenuController) UpdateMenu() {
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效菜单ID"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	payload, ok := c.parseMenuPayload(false)
-	if !ok {
-		return
-	}
-
-	views := payload.Views
-	if len(views) == 0 {
-		views = []int{1}
-	}
-	viewsBytes, _ := json.Marshal(views)
-
-	update := map[string]interface{}{
-		"pid":            valueInt64(payload.Pid, 0),
-		"title":          strings.TrimSpace(valueString(payload.Title, "")),
-		"path":           valueString(payload.Path, ""),
-		"component_path": valueString(payload.ComponentPath, ""),
-		"icon":           valueString(payload.Icon, ""),
-		"sort":           valueInt64(payload.Sort, 0),
-		"status":         valueInt8(payload.Status, 1),
-		"is_visible":     valueInt8(payload.IsVisible, 1),
-		"views":          string(viewsBytes),
-		"platforms":      services.NormalizePlatforms(payload.Platforms),
-		"type":           valueInt8(payload.Type, 1),
-		"permission":     valueString(payload.Permission, ""),
-	}
-
-	if _, err = models.Orm.QueryTable(new(models.SystemMenu)).Filter("id", id).Update(update); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "更新成功"}
-	_ = c.ServeJSON()
-}
-
-func (c *BackendMenuController) DeleteMenu() {
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效菜单ID"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	if _, err = models.Orm.QueryTable(new(models.SystemMenu)).Filter("id", id).Delete(); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "删除失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功", "success": true}
-	_ = c.ServeJSON()
-}
-
-func (c *BackendMenuController) parseMenuPayload(needTitle bool) (*menuPayload, bool) {
-	var payload menuPayload
-	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &payload); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
-		_ = c.ServeJSON()
-		return nil, false
-	}
-	if needTitle && strings.TrimSpace(valueString(payload.Title, "")) == "" {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "菜单名称不能为空"}
-		_ = c.ServeJSON()
-		return nil, false
-	}
-	return &payload, true
-}
-
-func valueString(v *string, def string) string {
-	if v == nil {
-		return def
-	}
-	return *v
-}
-
-func valueInt8(v *int8, def int8) int8 {
-	if v == nil {
-		return def
-	}
-	return *v
-}
-
-func valueInt64(v *int64, def int64) int64 {
-	if v == nil {
-		return def
-	}
-	return *v
-}
-
-func ptrString(v string) *string { return &v }
-func ptrInt8(v int8) *int8       { return &v }
+package controllers
+
+import (
+	"encoding/json"
+	"strconv"
+	"strings"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/services"
+	authsvc "server/services/auth"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type BackendMenuController struct {
+	beego.Controller
+}
+
+type AdminMenuController = BackendMenuController
+
+// 菜单接口被平台端和租户端共用同一个控制器（AdminMenuController 是别名），
+// 所以按「调用者所属端」而不是路由前缀来定权限：
+//   - 写接口（增删改、改状态）只有平台端能用，租户端能改菜单等于给自己开功能；
+//   - 读接口两端都能用，但租户端只能读租户端那一份（cid 强制为 2）。
+func (c *BackendMenuController) denyMenu(code int, msg string) {
+	c.Data["json"] = map[string]interface{}{"code": code, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// requirePlatformCaller 菜单写操作专用：失败时已写好响应，调用方必须立即 return。
+func (c *BackendMenuController) requirePlatformCaller() bool {
+	if _, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform); err != nil {
+		code := identity.Status(err)
+		c.denyMenu(code, err.Error())
+		return false
+	}
+	return true
+}
+
+// menuCallerEnd 解析菜单读接口的调用端，同时放行平台端与租户端。
+// 取不到合法令牌时返回 ok=false，调用方必须立即 return。
+func (c *BackendMenuController) menuCallerEnd() (identity.End, bool) {
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform, identity.EndBackend)
+	if err != nil {
+		code := identity.Status(err)
+		c.denyMenu(code, err.Error())
+		return "", false
+	}
+	return identity.End(claims.UserType), true
+}
+
+// requireBackendCaller 仅租户端可用的读接口。
+func (c *BackendMenuController) requireBackendCaller() bool {
+	end, ok := c.menuCallerEnd()
+	if !ok {
+		return false
+	}
+	if end != identity.EndBackend {
+		c.denyMenu(403, identity.ErrWrongEnd.Error())
+		return false
+	}
+	return true
+}
+
+type menuPayload struct {
+	Pid           *int64   `json:"pid"`
+	Title         *string  `json:"title"`
+	Path          *string  `json:"path"`
+	ComponentPath *string  `json:"component_path"`
+	Icon          *string  `json:"icon"`
+	Sort          *int64   `json:"sort"`
+	Status        *int8    `json:"status"`
+	IsVisible     *int8    `json:"is_visible"`
+	Views         []int    `json:"views"`
+	Platforms     []string `json:"platforms"` // 展示端：["web"] ["app"] ["web","app"]；空=继承所属模块
+	Type          *int8    `json:"type"`
+	Permission    *string  `json:"permission"`
+}
+
+func parseViews(raw *string) []int {
+	if raw == nil || strings.TrimSpace(*raw) == "" {
+		return nil
+	}
+	var arr []int
+	if err := json.Unmarshal([]byte(*raw), &arr); err != nil {
+		return nil
+	}
+	return arr
+}
+
+func hasView(arr []int, v int) bool {
+	for _, n := range arr {
+		if n == v {
+			return true
+		}
+	}
+	return false
+}
+
+func filterMenusByView(menus []models.SystemMenu, v int) []models.SystemMenu {
+	out := make([]models.SystemMenu, 0, len(menus))
+	for _, m := range menus {
+		views := parseViews(m.Views)
+		if v == 1 && len(views) == 0 {
+			out = append(out, m)
+			continue
+		}
+		if hasView(views, v) {
+			out = append(out, m)
+		}
+	}
+	return out
+}
+
+// GetMenu 平台端菜单树（views=1），只归平台端。
+func (c *BackendMenuController) GetMenu() {
+	if !c.requirePlatformCaller() {
+		return
+	}
+	var menus []models.SystemMenu
+	_, err := models.Orm.QueryTable(new(models.SystemMenu)).Filter("status", 1).All(&menus)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": buildMenuTree(filterMenusByView(menus, 1), 0)}
+	_ = c.ServeJSON()
+}
+
+// GetBackendMenu 租户端当前用户的可见菜单树，只归租户端令牌。
+func (c *BackendMenuController) GetBackendMenu() {
+	if !c.requireBackendCaller() {
+		return
+	}
+	var menus []models.SystemMenu
+	_, err := models.Orm.QueryTable(new(models.SystemMenu)).Filter("status", 1).All(&menus)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
+		_ = c.ServeJSON()
+		return
+	}
+	// 先按 views 过滤租户端，再按展示端过滤出 Web 端可见菜单。
+	// 菜单未单独配置 platforms 时继承所属模块，因此要传入全部模块。
+	allModules, _ := services.ListAllModulesForScope()
+	backendMenus := services.FilterMenusByPlatformWithModules(filterMenusByView(menus, 2), allModules, models.PlatformWeb)
+
+	// 按当前登录用户角色过滤可见功能菜单：
+	// 角色 rights 为空（或未分配角色）→ 全权限，返回全部后端菜单；
+	// 否则仅返回角色允许访问的菜单（含其祖先节点，保证树结构完整）。
+	idStr := c.Ctx.Input.Param(":id")
+	uid, _ := strconv.ParseUint(idStr, 10, 64)
+	tid := uint64(0)
+	groupID := uint64(0)
+	if uid > 0 {
+		// URL 参数是认证中心 identity_id，不能直接当 yz_system_tenant_user 主键查：
+		// 主键恰好与 identity_id 相同时会套用**别人**的角色权限——
+		// 如 identity_id=1（李增炎）命中主键 1（李志强 tid=1、group_id=0），
+		// 反而免过滤拿到全量菜单（越权）；identity_id=2 则命中李增炎的受限角色，
+		// 菜单被错误过滤（基础设置 404）。
+		// 解析顺序：认证绑定表（identity_id+tid → group_id，与 /auth/userinfo 同源）
+		// → 业务表身份解析链（identity_id 换算 → 主键 → 老 uid）。
+		jwtTid := backendJWTTenantID(c.Ctx.Request.Header.Get("Authorization"))
+		if bind, e := authsvc.GetTenantUser(uid, jwtTid); e == nil {
+			tid = bind.Tid
+			groupID = bind.GroupID
+		} else if tu, e := findBackendTenantUser(uid, jwtTid, false); e == nil {
+			tid = tu.Tid
+			groupID = tu.GroupID
+		}
+	}
+	if groupID > 0 {
+		var role models.AdminRole
+		if re := models.Orm.QueryTable(new(models.AdminRole)).
+			Filter("id", groupID).
+			Filter("cid", 2).
+			One(&role); re == nil {
+			backendMenus = filterMenusByRights(backendMenus, role.Rights)
+		}
+	}
+
+	// 套餐功能开通标记：未开通模块的菜单保留但标记 locked（前端展示锁定态与升级提示，不再 404）
+	backendMenus, lockedMenuIDs := filterMenusByTenantPackageLocked(c.Ctx.Request.Header.Get("Authorization"), backendMenus, tid, true)
+	menuTree := buildMenuTree(backendMenus, 0)
+	markTreeLocked(menuTree, lockedMenuIDs)
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": menuTree}
+	_ = c.ServeJSON()
+}
+
+// backendJWTTenantID 从 Authorization 的 Bearer Token 中解析租户ID；取不到时返回 0。
+// 说明：backend 端登录时 token 里写入了租户ID（GenerateToken 的 tenantId），
+// 用它做套餐功能过滤比依赖前端传参更可靠。只认 backend 端令牌——
+// 平台令牌本就无租户，app 端令牌的租户也不能拿来决定 Web 端能看到哪些菜单。
+func backendJWTTenantID(auth string) uint64 {
+	claims, err := identity.Claims(auth, identity.EndBackend)
+	if err != nil || claims == nil || claims.TenantId <= 0 {
+		return 0
+	}
+	return uint64(claims.TenantId)
+}
+
+// filterMenusByTenantPackage 按租户套餐包含的功能模块过滤菜单（剔除未开通模块，用于角色菜单分配等场景）。
+// tid 优先取 token 中的租户ID，其次用调用方传入的兜底值；两者都取不到时不处理（保持原行为）。
+func filterMenusByTenantPackage(authHeader string, menus []models.SystemMenu, tid uint64) []models.SystemMenu {
+	filtered, _ := filterMenusByTenantPackageLocked(authHeader, menus, tid, false)
+	return filtered
+}
+
+// filterMenusByTenantPackageLocked 按租户套餐处理菜单。
+// markLocked=false：剔除未开通模块的菜单（原行为）；markLocked=true：保留菜单并返回锁定菜单ID集合（含后代）。
+func filterMenusByTenantPackageLocked(authHeader string, menus []models.SystemMenu, tid uint64, markLocked bool) ([]models.SystemMenu, map[uint64]bool) {
+	if jwtTid := backendJWTTenantID(authHeader); jwtTid > 0 {
+		tid = jwtTid
+	}
+	if tid == 0 {
+		return menus, nil
+	}
+	allModules, err := services.ListEnabledModules()
+	if err != nil || len(allModules) == 0 {
+		return menus, nil
+	}
+	allowed := services.GetTenantModuleCodes(tid)
+	// 安全兜底：租户没有绑定套餐或套餐未配置任何功能模块时不做过滤，
+	// 避免因套餐数据缺失导致租户端菜单整体消失。
+	if len(allowed) == 0 {
+		return menus, nil
+	}
+	if markLocked {
+		return services.MarkMenusLockedByTenantModules(menus, allModules, allowed)
+	}
+	return services.FilterMenusByTenantModules(menus, allModules, allowed), nil
+}
+
+// markTreeLocked 将菜单树中位于锁定集合的节点标记为 locked
+func markTreeLocked(nodes []*menuNode, locked map[uint64]bool) {
+	if len(nodes) == 0 || len(locked) == 0 {
+		return
+	}
+	for _, n := range nodes {
+		if locked[n.ID] {
+			n.Locked = true
+		}
+		if len(n.Children) > 0 {
+			markTreeLocked(n.Children, locked)
+		}
+	}
+}
+
+// filterMenusByRights 按角色 rights（菜单 ID 集合）过滤菜单，并补全祖先节点，保证树结构完整。
+// rights 为空（nil / 空串）→ 原样返回（全权限）。
+func filterMenusByRights(menus []models.SystemMenu, rights *string) []models.SystemMenu {
+	if rights == nil || strings.TrimSpace(*rights) == "" {
+		return menus
+	}
+	allowed := services.ParseMenuRights(*rights)
+	if len(allowed) == 0 {
+		return menus
+	}
+
+	pidOf := make(map[uint64]int64, len(menus))
+	byID := make(map[uint64]models.SystemMenu, len(menus))
+	for _, m := range menus {
+		pidOf[m.ID] = m.Pid
+		byID[m.ID] = m
+	}
+
+	final := make(map[uint64]bool, len(allowed))
+	for id := range allowed {
+		cur := id
+		for {
+			if _, ok := byID[cur]; !ok {
+				break
+			}
+			if final[cur] {
+				break
+			}
+			final[cur] = true
+			p := pidOf[cur]
+			if p == 0 {
+				break
+			}
+			cur = uint64(p)
+		}
+	}
+
+	out := make([]models.SystemMenu, 0, len(final))
+	for id := range final {
+		out = append(out, byID[id])
+	}
+	return out
+}
+
+func (c *BackendMenuController) GetTenantList() {
+	var tid uint64
+	if jwtTid := c.Ctx.Input.GetData("tid"); jwtTid != nil {
+		tid = jwtTid.(uint64)
+	}
+	if tid == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "未登录或非法请求"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	var menus []models.SystemMenu
+	if _, err := models.Orm.QueryTable(new(models.SystemMenu)).Filter("status", 1).All(&menus); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取失败：" + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+
+	tree := buildMenuTree(filterMenusByView(menus, 2), 0)
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "获取成功",
+		"data": map[string]interface{}{"list": tree, "total": len(tree)},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetAllMenus 两端共用：平台端可查任意端的菜单树，租户端只固定看自己那一份。
+// 此前 cid 完全由查询参数决定，租户传 ?cid=1 就能整棵拉走平台端菜单树。
+func (c *BackendMenuController) GetAllMenus() {
+	end, ok := c.menuCallerEnd()
+	if !ok {
+		return
+	}
+	var menus []models.SystemMenu
+	cid, _ := c.GetInt("cid")
+	if end != identity.EndPlatform {
+		cid = 2
+	}
+
+	if _, err := models.Orm.QueryTable(new(models.SystemMenu)).All(&menus); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
+		_ = c.ServeJSON()
+		return
+	}
+	if cid == 1 {
+		menus = filterMenusByView(menus, 1)
+	} else if cid == 2 {
+		menus = filterMenusByView(menus, 2)
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": buildMenuTree(menus, 0)}
+	_ = c.ServeJSON()
+}
+
+// filterAssignableMenus 仅保留「已启用且已显示」的菜单。
+// 停用或隐藏的菜单不参与角色权限分配，直接在服务端屏蔽，不依赖前端过滤。
+func filterAssignableMenus(menus []models.SystemMenu) []models.SystemMenu {
+	out := make([]models.SystemMenu, 0, len(menus))
+	for _, m := range menus {
+		if m.Status != 1 {
+			continue
+		}
+		// is_visible 为空视为显示
+		if m.IsVisible != nil && *m.IsVisible == 0 {
+			continue
+		}
+		out = append(out, m)
+	}
+	return out
+}
+
+// GetAssignableMenus 角色权限树（租户端角色编辑器用），只归租户端。
+// cid 同样固定为 2：平台端菜单不在租户可分配范围内，传 cid=1 会整棵泄露平台菜单。
+// GET /backend/assignableMenus?cid=2
+func (c *BackendMenuController) GetAssignableMenus() {
+	if !c.requireBackendCaller() {
+		return
+	}
+	var menus []models.SystemMenu
+	cid := 2
+
+	if _, err := models.Orm.QueryTable(new(models.SystemMenu)).All(&menus); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
+		_ = c.ServeJSON()
+		return
+	}
+	if cid == 1 || cid == 2 {
+		menus = filterMenusByView(menus, cid)
+	}
+	menus = filterAssignableMenus(menus)
+	// 租户端：仅可分配当前租户套餐已开通的功能模块下的菜单
+	if cid == 2 {
+		menus = filterMenusByTenantPackage(c.Ctx.Request.Header.Get("Authorization"), menus, 0)
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": buildMenuTree(menus, 0)}
+	_ = c.ServeJSON()
+}
+
+func (c *BackendMenuController) GetAllBackendMenus() {
+	var menus []models.SystemMenu
+	if _, err := models.Orm.QueryTable(new(models.SystemMenu)).All(&menus); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取菜单失败: " + err.Error(), "data": nil}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": buildMenuTree(filterMenusByView(menus, 2), 0)}
+	_ = c.ServeJSON()
+}
+
+type menuNode struct {
+	ID            uint64      `json:"id"`
+	Pid           int64       `json:"pid"`
+	Title         string      `json:"title"`
+	Path          string      `json:"path,omitempty"`
+	ComponentPath string      `json:"component_path,omitempty"`
+	Icon          string      `json:"icon,omitempty"`
+	Sort          int64       `json:"sort"`
+	Status        int8        `json:"status"`
+	IsVisible     *int8       `json:"is_visible,omitempty"`
+	Views         []int       `json:"views,omitempty"`
+	Platforms     []string    `json:"platforms,omitempty"` // 展示端，空=继承所属模块
+	Type          int8        `json:"type"`
+	Permission    string      `json:"permission,omitempty"`
+	Locked        bool        `json:"locked,omitempty"`
+	Children      []*menuNode `json:"children,omitempty"`
+}
+
+func buildMenuTree(menus []models.SystemMenu, pid int64) []*menuNode {
+	var tree []*menuNode
+	for _, m := range menus {
+		if m.Pid == pid {
+			node := &menuNode{
+				ID:        m.ID,
+				Pid:       m.Pid,
+				Title:     m.Title,
+				Sort:      m.Sort,
+				Status:    m.Status,
+				IsVisible: m.IsVisible,
+				Views:     parseViews(m.Views),
+				Platforms: services.ParsePlatforms(m.Platforms),
+				Type:      m.Type,
+			}
+			if m.Path != nil {
+				node.Path = *m.Path
+			}
+			if m.ComponentPath != nil {
+				node.ComponentPath = *m.ComponentPath
+			}
+			if m.Icon != nil {
+				node.Icon = *m.Icon
+			}
+			if m.Permission != nil {
+				node.Permission = *m.Permission
+			}
+			if children := buildMenuTree(menus, int64(m.ID)); len(children) > 0 {
+				node.Children = children
+			}
+			tree = append(tree, node)
+		}
+	}
+	return tree
+}
+
+func (c *BackendMenuController) UpdateMenuStatus() {
+	if !c.requirePlatformCaller() {
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效菜单ID"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	var body struct {
+		Status *int8 `json:"status"`
+	}
+	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &body); err != nil || body.Status == nil {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	if _, err = models.Orm.QueryTable(new(models.SystemMenu)).Filter("id", id).Update(map[string]interface{}{"status": *body.Status}); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "success": true}
+	_ = c.ServeJSON()
+}
+
+func (c *BackendMenuController) CreateMenu() {
+	if !c.requirePlatformCaller() {
+		return
+	}
+	payload, ok := c.parseMenuPayload(true)
+	if !ok {
+		return
+	}
+
+	var viewsStr string
+	views := payload.Views
+	if len(views) == 0 {
+		views = []int{1}
+	}
+	if b, err := json.Marshal(views); err == nil {
+		viewsStr = string(b)
+	}
+
+	menu := models.SystemMenu{
+		Pid:           valueInt64(payload.Pid, 0),
+		Title:         strings.TrimSpace(valueString(payload.Title, "")),
+		Sort:          valueInt64(payload.Sort, 0),
+		Status:        valueInt8(payload.Status, 1),
+		IsVisible:     ptrInt8(valueInt8(payload.IsVisible, 1)),
+		Views:         &viewsStr,
+		Type:          valueInt8(payload.Type, 1),
+		Path:          ptrString(valueString(payload.Path, "")),
+		ComponentPath: ptrString(valueString(payload.ComponentPath, "")),
+		Icon:          ptrString(valueString(payload.Icon, "")),
+		Permission:    ptrString(valueString(payload.Permission, "")),
+		// 空串表示「继承所属模块的展示端」（模块也未配置则全端）
+		Platforms: ptrString(services.NormalizePlatforms(payload.Platforms)),
+	}
+
+	id, err := models.Orm.Insert(&menu)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "创建失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "创建成功", "data": map[string]interface{}{"id": id}}
+	_ = c.ServeJSON()
+}
+
+func (c *BackendMenuController) UpdateMenu() {
+	if !c.requirePlatformCaller() {
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效菜单ID"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	payload, ok := c.parseMenuPayload(false)
+	if !ok {
+		return
+	}
+
+	views := payload.Views
+	if len(views) == 0 {
+		views = []int{1}
+	}
+	viewsBytes, _ := json.Marshal(views)
+
+	update := map[string]interface{}{
+		"pid":            valueInt64(payload.Pid, 0),
+		"title":          strings.TrimSpace(valueString(payload.Title, "")),
+		"path":           valueString(payload.Path, ""),
+		"component_path": valueString(payload.ComponentPath, ""),
+		"icon":           valueString(payload.Icon, ""),
+		"sort":           valueInt64(payload.Sort, 0),
+		"status":         valueInt8(payload.Status, 1),
+		"is_visible":     valueInt8(payload.IsVisible, 1),
+		"views":          string(viewsBytes),
+		"platforms":      services.NormalizePlatforms(payload.Platforms),
+		"type":           valueInt8(payload.Type, 1),
+		"permission":     valueString(payload.Permission, ""),
+	}
+
+	if _, err = models.Orm.QueryTable(new(models.SystemMenu)).Filter("id", id).Update(update); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "更新成功"}
+	_ = c.ServeJSON()
+}
+
+func (c *BackendMenuController) DeleteMenu() {
+	if !c.requirePlatformCaller() {
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效菜单ID"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	if _, err = models.Orm.QueryTable(new(models.SystemMenu)).Filter("id", id).Delete(); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "删除失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功", "success": true}
+	_ = c.ServeJSON()
+}
+
+func (c *BackendMenuController) parseMenuPayload(needTitle bool) (*menuPayload, bool) {
+	var payload menuPayload
+	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &payload); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
+		_ = c.ServeJSON()
+		return nil, false
+	}
+	if needTitle && strings.TrimSpace(valueString(payload.Title, "")) == "" {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "菜单名称不能为空"}
+		_ = c.ServeJSON()
+		return nil, false
+	}
+	return &payload, true
+}
+
+func valueString(v *string, def string) string {
+	if v == nil {
+		return def
+	}
+	return *v
+}
+
+func valueInt8(v *int8, def int8) int8 {
+	if v == nil {
+		return def
+	}
+	return *v
+}
+
+func valueInt64(v *int64, def int64) int64 {
+	if v == nil {
+		return def
+	}
+	return *v
+}
+
+func ptrString(v string) *string { return &v }
+func ptrInt8(v int8) *int8       { return &v }
diff --git a/go/controllers/backend_menu_front.go b/go/controllers/backend_menu_front.go
index e9e690d..547bdf1 100644
--- a/go/controllers/backend_menu_front.go
+++ b/go/controllers/backend_menu_front.go
@@ -3,9 +3,8 @@ package controllers
 import (
 	"encoding/json"
 	"server/models"
-	"server/pkg/jwtutil"
+	"server/pkg/identity"
 	"strconv"
-	"strings"
 	"time"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -15,22 +14,13 @@ type BackendMenuFrontController struct {
 	beego.Controller
 }
 
+// checkAuth 前台菜单只归租户自己维护：必须是 backend 端令牌，且令牌带上企业。
+// 此前只解令牌不判端，app/platform 的令牌也能增删别家的前台菜单。
 func (c *BackendMenuFrontController) checkAuth() (uint64, bool) {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "未提供认证信息"}
-		_ = c.ServeJSON()
-		return 0, false
-	}
-	authParts := strings.SplitN(authHeader, " ", 2)
-	if len(authParts) != 2 || authParts[0] != "Bearer" {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "认证信息格式错误"}
-		_ = c.ServeJSON()
-		return 0, false
-	}
-	claims, err := jwtutil.ParseToken(authParts[1])
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "token无效"}
+		code := identity.Status(err)
+		c.Data["json"] = map[string]interface{}{"code": code, "msg": err.Error()}
 		_ = c.ServeJSON()
 		return 0, false
 	}
diff --git a/go/controllers/backend_modules.go b/go/controllers/backend_modules.go
index d9b74cb..7f6f12c 100644
--- a/go/controllers/backend_modules.go
+++ b/go/controllers/backend_modules.go
@@ -1,154 +1,140 @@
-package controllers
-
-import (
-	"fmt"
-	"strings"
-
-	"server/models"
-	"server/pkg/jwtutil"
-	"server/services"
-	authsvc "server/services/auth"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// tenantModuleItem 模块列表返回项：在模块基础信息上补充套餐开通状态，
-// locked=true 表示该模块不在当前租户已购套餐内（前端置灰并提示购买套餐）。
-type tenantModuleItem struct {
-	models.SystemModules
-	Locked bool `json:"locked"`
-}
-
-// BackendModulesController backend 模块接口（yz_system_modules）
-type BackendModulesController struct {
-	beego.Controller
-}
-
-func (c *BackendModulesController) backendModulesClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *BackendModulesController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-// backendUserGroupID 解析当前登录者在当前租户的角色ID。
-// claims.UserID 是认证中心 identity_id，不能直接当 yz_system_tenant_user 主键用；
-// 优先按认证绑定表（identity_id+tid → group_id，与 /auth/userinfo 同源），
-// 查不到再走业务表身份解析链（identity_id 换算 → 主键 → 老 uid）。
-func (c *BackendModulesController) backendUserGroupID(claims *jwtutil.Claims, tid uint64) uint64 {
-	uid := uint64(claims.UserID)
-	if uid == 0 {
-		return 0
-	}
-	if bind, e := authsvc.GetTenantUser(uid, tid); e == nil {
-		return bind.GroupID
-	}
-	if tu, e := findBackendTenantUser(uid, tid, false); e == nil {
-		return tu.GroupID
-	}
-	return 0
-}
-
-// moduleWithEnabled 带套餐开通标记的模块输出
-type moduleWithEnabled struct {
-	models.SystemModules
-	Enabled bool `json:"enabled"`
-}
-
-// GetTenantList GET /backend/modules/getTenantList
-// 返回当前 backend 账号可见的模块（status=1 且 is_show=1），并根据租户绑定的套餐标记每个模块是否已开通。
-// 前端可据此排序（已开通在前）、置灰未开通卡片、阻止跳转。
-func (c *BackendModulesController) GetTenantList() {
-	claims, err := c.backendModulesClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	var rows []models.SystemModules
-	_, err = models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("delete_time__isnull", true).
-		Filter("status", 1).
-		Filter("is_show", 1).
-		OrderBy("sort", "id").
-		All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取失败："+err.Error())
-		return
-	}
-	// 租户后台是 Web 端：只保留 web 可见的模块（未配置视为全端）
-	rows = services.FilterModulesByPlatform(rows, models.PlatformWeb)
-
-	// 查询当前租户已开通的模块 code 集合（套餐模块 + 已开通产品订单关联模块，编码已规范化）
-	tid := uint64(claims.TenantId)
-	allowedCodes := services.GetTenantModuleCodes(tid)
-
-	enhanced := make([]moduleWithEnabled, 0, len(rows))
-	for _, m := range rows {
-		enabled := true
-		if len(allowedCodes) > 0 {
-			enabled = allowedCodes[services.NormalizeModuleCode(m.Code)]
-		}
-		enhanced = append(enhanced, moduleWithEnabled{SystemModules: m, Enabled: enabled})
-	}
-
-	// 角色权限过滤（与 /backend/menu/:id 同口径）：
-	// 未分配角色或角色 rights 为空 → 全部可见；
-	// 否则仅保留「名下至少有一个被授权菜单」的模块，未授权模块直接不返回，
-	// 避免首页出现可点击却进 404 的模块卡片。
-	if groupID := c.backendUserGroupID(claims, tid); groupID > 0 {
-		var role models.AdminRole
-		if re := models.Orm.QueryTable(new(models.AdminRole)).
-			Filter("id", groupID).
-			Filter("cid", 2).
-			One(&role); re == nil && role.Rights != nil && strings.TrimSpace(*role.Rights) != "" {
-			if len(parseRightsToSet(*role.Rights)) > 0 {
-				var allMenus []models.SystemMenu
-				if _, me := models.Orm.QueryTable(new(models.SystemMenu)).Filter("status", 1).All(&allMenus); me == nil {
-					allowedMenus := filterMenusByRights(allMenus, role.Rights)
-					owningAny := services.ModuleCodesOwningMenus(rows, allMenus)
-					owningAllowed := services.ModuleCodesOwningMenus(rows, allowedMenus)
-					visible := make([]moduleWithEnabled, 0, len(enhanced))
-					for _, item := range enhanced {
-						code := services.NormalizeModuleCode(item.Code)
-						// 模块名下有菜单但一个都没授权 → 隐藏；
-						// 名下没有菜单（无法判定）→ 保持原行为不隐藏
-						if owningAny[code] && !owningAllowed[code] {
-							continue
-						}
-						visible = append(visible, item)
-					}
-					enhanced = visible
-				}
-			}
-		}
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "获取成功",
-		"data": map[string]interface{}{
-			"list":  enhanced,
-			"total": len(enhanced),
-		},
-	}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"strings"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+	"server/services"
+	authsvc "server/services/auth"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// tenantModuleItem 模块列表返回项：在模块基础信息上补充套餐开通状态，
+// locked=true 表示该模块不在当前租户已购套餐内（前端置灰并提示购买套餐）。
+type tenantModuleItem struct {
+	models.SystemModules
+	Locked bool `json:"locked"`
+}
+
+// BackendModulesController backend 模块接口（yz_system_modules）
+type BackendModulesController struct {
+	beego.Controller
+}
+
+func (c *BackendModulesController) backendModulesClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+}
+
+func (c *BackendModulesController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// backendUserGroupID 解析当前登录者在当前租户的角色ID。
+// claims.UserID 是认证中心 identity_id，不能直接当 yz_system_tenant_user 主键用；
+// 优先按认证绑定表（identity_id+tid → group_id，与 /auth/userinfo 同源），
+// 查不到再走业务表身份解析链（identity_id 换算 → 主键 → 老 uid）。
+func (c *BackendModulesController) backendUserGroupID(claims *jwtutil.Claims, tid uint64) uint64 {
+	uid := uint64(claims.UserID)
+	if uid == 0 {
+		return 0
+	}
+	if bind, e := authsvc.GetTenantUser(uid, tid); e == nil {
+		return bind.GroupID
+	}
+	if tu, e := findBackendTenantUser(uid, tid, false); e == nil {
+		return tu.GroupID
+	}
+	return 0
+}
+
+// moduleWithEnabled 带套餐开通标记的模块输出
+type moduleWithEnabled struct {
+	models.SystemModules
+	Enabled bool `json:"enabled"`
+}
+
+// GetTenantList GET /backend/modules/getTenantList
+// 返回当前 backend 账号可见的模块（status=1 且 is_show=1），并根据租户绑定的套餐标记每个模块是否已开通。
+// 前端可据此排序（已开通在前）、置灰未开通卡片、阻止跳转。
+func (c *BackendModulesController) GetTenantList() {
+	claims, err := c.backendModulesClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	var rows []models.SystemModules
+	_, err = models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("delete_time__isnull", true).
+		Filter("status", 1).
+		Filter("is_show", 1).
+		OrderBy("sort", "id").
+		All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取失败："+err.Error())
+		return
+	}
+	// 租户后台是 Web 端：只保留 web 可见的模块（未配置视为全端）
+	rows = services.FilterModulesByPlatform(rows, models.PlatformWeb)
+
+	// 查询当前租户已开通的模块 code 集合（套餐模块 + 已开通产品订单关联模块，编码已规范化）
+	tid := uint64(claims.TenantId)
+	allowedCodes := services.GetTenantModuleCodes(tid)
+
+	enhanced := make([]moduleWithEnabled, 0, len(rows))
+	for _, m := range rows {
+		enabled := true
+		if len(allowedCodes) > 0 {
+			enabled = allowedCodes[services.NormalizeModuleCode(m.Code)]
+		}
+		enhanced = append(enhanced, moduleWithEnabled{SystemModules: m, Enabled: enabled})
+	}
+
+	// 角色权限过滤（与 /backend/menu/:id 同口径）：
+	// 未分配角色或角色 rights 为空 → 全部可见；
+	// 否则仅保留「名下至少有一个被授权菜单」的模块，未授权模块直接不返回，
+	// 避免首页出现可点击却进 404 的模块卡片。
+	if groupID := c.backendUserGroupID(claims, tid); groupID > 0 {
+		var role models.AdminRole
+		if re := models.Orm.QueryTable(new(models.AdminRole)).
+			Filter("id", groupID).
+			Filter("cid", 2).
+			One(&role); re == nil && role.Rights != nil && strings.TrimSpace(*role.Rights) != "" {
+			if len(services.ParseMenuRights(*role.Rights)) > 0 {
+				var allMenus []models.SystemMenu
+				if _, me := models.Orm.QueryTable(new(models.SystemMenu)).Filter("status", 1).All(&allMenus); me == nil {
+					allowedMenus := filterMenusByRights(allMenus, role.Rights)
+					owningAny := services.ModuleCodesOwningMenus(rows, allMenus)
+					owningAllowed := services.ModuleCodesOwningMenus(rows, allowedMenus)
+					visible := make([]moduleWithEnabled, 0, len(enhanced))
+					for _, item := range enhanced {
+						code := services.NormalizeModuleCode(item.Code)
+						// 模块名下有菜单但一个都没授权 → 隐藏；
+						// 名下没有菜单（无法判定）→ 保持原行为不隐藏
+						if owningAny[code] && !owningAllowed[code] {
+							continue
+						}
+						visible = append(visible, item)
+					}
+					enhanced = visible
+				}
+			}
+		}
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "获取成功",
+		"data": map[string]interface{}{
+			"list":  enhanced,
+			"total": len(enhanced),
+		},
+	}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/backend_notebook.go b/go/controllers/backend_notebook.go
index 57f7667..b49ef15 100644
--- a/go/controllers/backend_notebook.go
+++ b/go/controllers/backend_notebook.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"io"
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"strconv"
 	"strings"
@@ -18,22 +19,7 @@ type BackendNotebookController struct {
 }
 
 func (c *BackendNotebookController) backendNotebookClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendNotebookController) nbJsonErr(httpStatus, bizCode int, msg string) {
@@ -51,7 +37,8 @@ func (c *BackendNotebookController) nbOk(data interface{}) {
 func (c *BackendNotebookController) List() {
 	claims, err := c.backendNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.nbJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -96,7 +83,8 @@ func (c *BackendNotebookController) List() {
 func (c *BackendNotebookController) Detail() {
 	claims, err := c.backendNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.nbJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -125,7 +113,8 @@ func (c *BackendNotebookController) Detail() {
 func (c *BackendNotebookController) Create() {
 	claims, err := c.backendNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.nbJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -174,7 +163,8 @@ func (c *BackendNotebookController) Create() {
 func (c *BackendNotebookController) Update() {
 	claims, err := c.backendNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.nbJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -241,7 +231,8 @@ func (c *BackendNotebookController) Update() {
 func (c *BackendNotebookController) Delete() {
 	claims, err := c.backendNotebookClaims()
 	if err != nil {
-		c.nbJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.nbJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_notify_config.go b/go/controllers/backend_notify_config.go
index 1071561..b3d0ab3 100644
--- a/go/controllers/backend_notify_config.go
+++ b/go/controllers/backend_notify_config.go
@@ -2,12 +2,12 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -19,22 +19,7 @@ type BackendNotifyConfigController struct {
 }
 
 func (c *BackendNotifyConfigController) ncClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendNotifyConfigController) ncJsonErr(httpStatus, bizCode int, msg string) {
@@ -60,7 +45,8 @@ type notifyConfigPayload struct {
 func (c *BackendNotifyConfigController) GetConfig() {
 	claims, err := c.ncClaims()
 	if err != nil {
-		c.ncJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.ncJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -77,7 +63,8 @@ func (c *BackendNotifyConfigController) GetConfig() {
 func (c *BackendNotifyConfigController) UpdateConfig() {
 	claims, err := c.ncClaims()
 	if err != nil {
-		c.ncJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.ncJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_oa_compensation.go b/go/controllers/backend_oa_compensation.go
index 4de5e28..b221f58 100644
--- a/go/controllers/backend_oa_compensation.go
+++ b/go/controllers/backend_oa_compensation.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -24,13 +25,10 @@ type BackendOaCompensationController struct {
 }
 
 func (c *BackendOaCompensationController) compensationClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	parts := strings.SplitN(auth, " ", 2)
-	if auth == "" || len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil || claims.UserType != "backend" {
+	// 调用方一律用 orm.ErrNoRows 判「未登录/无权」，这里保持该约定，
+	// 只把令牌解析与判端交给 identity。
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+	if err != nil {
 		return nil, orm.ErrNoRows
 	}
 	return claims, nil
diff --git a/go/controllers/backend_oa_document.go b/go/controllers/backend_oa_document.go
index d6e3fc5..5f327c4 100644
--- a/go/controllers/backend_oa_document.go
+++ b/go/controllers/backend_oa_document.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -15,7 +16,6 @@ import (
 
 // 控制器层专用错误，仅用于响应转换
 var (
-	errOaDocUnauthorized = errors.New("未登录或无权限")
 	errOaDocBadID        = errors.New("无效ID")
 	errOaDocBadParam     = errors.New("参数错误")
 )
@@ -27,22 +27,7 @@ type BackendOaDocumentController struct {
 }
 
 func (c *BackendOaDocumentController) oaDocClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, errOaDocUnauthorized
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, errOaDocUnauthorized
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" {
-		return nil, errOaDocUnauthorized
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendOaDocumentController) oaDocOk(data interface{}) {
@@ -54,20 +39,23 @@ func (c *BackendOaDocumentController) oaDocOk(data interface{}) {
 func (c *BackendOaDocumentController) oaDocFail(err error) {
 	status, code, msg := 400, 400, "操作失败"
 	if err != nil {
-		switch err {
-		case errOaDocUnauthorized:
-			status, code, msg = 401, 401, "未登录或无权限"
-		case services.ErrDocNotFound, services.ErrDocLinkNotFound,
-			services.ErrDocCategoryNotFound, services.ErrDocCategoryInvalid,
-			services.ErrDocLinkTargetNotFound:
-			status, code, msg = 404, 404, err.Error()
-		case services.ErrDocLinkDuplicate:
-			status, code, msg = 409, 409, err.Error()
-		case services.ErrDocCategorySystem, services.ErrDocCategorySystemLocked,
-			services.ErrDocCategoryNameKept:
-			status, code, msg = 403, 403, err.Error()
-		default:
+		if identity.IsAuth(err) {
+			status, code = identity.Status(err), identity.Status(err)
 			msg = err.Error()
+		} else {
+			switch err {
+			case services.ErrDocNotFound, services.ErrDocLinkNotFound,
+				services.ErrDocCategoryNotFound, services.ErrDocCategoryInvalid,
+				services.ErrDocLinkTargetNotFound:
+				status, code, msg = 404, 404, err.Error()
+			case services.ErrDocLinkDuplicate:
+				status, code, msg = 409, 409, err.Error()
+			case services.ErrDocCategorySystem, services.ErrDocCategorySystemLocked,
+				services.ErrDocCategoryNameKept:
+				status, code, msg = 403, 403, err.Error()
+			default:
+				msg = err.Error()
+			}
 		}
 	}
 	c.Ctx.Output.SetStatus(status)
diff --git a/go/controllers/backend_oa_notice.go b/go/controllers/backend_oa_notice.go
index 181e2d1..4369609 100644
--- a/go/controllers/backend_oa_notice.go
+++ b/go/controllers/backend_oa_notice.go
@@ -9,6 +9,7 @@ import (
 	"unicode/utf8"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -22,22 +23,7 @@ type BackendOaNoticeController struct {
 }
 
 func (c *BackendOaNoticeController) oaNoticeClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendOaNoticeController) ontJsonErr(httpStatus, bizCode int, msg string) {
@@ -104,7 +90,8 @@ func noticeBase(tid int) orm.QuerySeter {
 func (c *BackendOaNoticeController) List() {
 	claims, err := c.oaNoticeClaims()
 	if err != nil {
-		c.ontJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.ontJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -156,7 +143,8 @@ func (c *BackendOaNoticeController) List() {
 func (c *BackendOaNoticeController) Portal() {
 	claims, err := c.oaNoticeClaims()
 	if err != nil {
-		c.ontJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.ontJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -187,7 +175,8 @@ func (c *BackendOaNoticeController) Portal() {
 func (c *BackendOaNoticeController) Detail() {
 	claims, err := c.oaNoticeClaims()
 	if err != nil {
-		c.ontJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.ontJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -216,7 +205,8 @@ func (c *BackendOaNoticeController) Detail() {
 func (c *BackendOaNoticeController) Create() {
 	claims, err := c.oaNoticeClaims()
 	if err != nil {
-		c.ontJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.ontJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -258,7 +248,8 @@ func (c *BackendOaNoticeController) Create() {
 func (c *BackendOaNoticeController) Update() {
 	claims, err := c.oaNoticeClaims()
 	if err != nil {
-		c.ontJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.ontJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -308,7 +299,8 @@ func (c *BackendOaNoticeController) Update() {
 func (c *BackendOaNoticeController) Delete() {
 	claims, err := c.oaNoticeClaims()
 	if err != nil {
-		c.ontJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.ontJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -338,7 +330,8 @@ func (c *BackendOaNoticeController) Delete() {
 func (c *BackendOaNoticeController) Publish() {
 	claims, err := c.oaNoticeClaims()
 	if err != nil {
-		c.ontJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.ontJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -377,7 +370,8 @@ func (c *BackendOaNoticeController) Publish() {
 func (c *BackendOaNoticeController) Top() {
 	claims, err := c.oaNoticeClaims()
 	if err != nil {
-		c.ontJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.ontJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_oa_schedule.go b/go/controllers/backend_oa_schedule.go
index b9f1499..431f800 100644
--- a/go/controllers/backend_oa_schedule.go
+++ b/go/controllers/backend_oa_schedule.go
@@ -12,6 +12,7 @@ import (
 
 	"server/models"
 	"server/pkg/holiday"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -25,22 +26,7 @@ type BackendOaScheduleController struct {
 }
 
 func (c *BackendOaScheduleController) oaScheduleClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "backend" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendOaScheduleController) oasJsonErr(httpStatus, bizCode int, msg string) {
@@ -147,7 +133,8 @@ func oaScheduleQS(tid int, userID int, f oaScheduleFilter) orm.QuerySeter {
 func (c *BackendOaScheduleController) List() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -268,7 +255,8 @@ func oaScheduleListData(tid, userID, page, pageSize int,
 // 响应里的 builtin_years 字段告知前端内置数据覆盖到哪一年。
 func (c *BackendOaScheduleController) Holidays() {
 	if _, err := c.oaScheduleClaims(); err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -416,7 +404,8 @@ func mergeOaHolidays(list []holiday.Day) []holiday.Day {
 func (c *BackendOaScheduleController) Stats() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -687,7 +676,8 @@ func parseOaSchedulePayloadBody(raw []byte) (oaSchedulePayload, string) {
 func (c *BackendOaScheduleController) Create() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -758,7 +748,8 @@ func oaScheduleCreateCore(claims *jwtutil.Claims, payload oaSchedulePayload) (*m
 func (c *BackendOaScheduleController) Update() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -845,7 +836,8 @@ func oaScheduleUpdateCore(claims *jwtutil.Claims, id uint64, payload oaScheduleP
 func (c *BackendOaScheduleController) SetImages() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -907,7 +899,8 @@ func oaScheduleSetImagesCore(claims *jwtutil.Claims, id uint64, images []oaSched
 func (c *BackendOaScheduleController) UpdateContent() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -953,7 +946,8 @@ func (c *BackendOaScheduleController) UpdateContent() {
 func (c *BackendOaScheduleController) Delete() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -1008,7 +1002,8 @@ func oaScheduleDeleteCore(claims *jwtutil.Claims, id uint64) (int, string) {
 func (c *BackendOaScheduleController) FinishSchedule() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -1148,7 +1143,8 @@ func carryOaSchedule(item *models.OaSchedule, targetDate string, claims *jwtutil
 func (c *BackendOaScheduleController) CarrySchedule() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -1204,7 +1200,8 @@ func (c *BackendOaScheduleController) CarrySchedule() {
 func (c *BackendOaScheduleController) CarryPending() {
 	claims, err := c.oaScheduleClaims()
 	if err != nil {
-		c.oasJsonErr(401, 401, "未登录或无权限")
+		code := identity.Status(err)
+		c.oasJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_operation_log.go b/go/controllers/backend_operation_log.go
index 56a619c..4e4aef0 100644
--- a/go/controllers/backend_operation_log.go
+++ b/go/controllers/backend_operation_log.go
@@ -2,13 +2,13 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -22,22 +22,7 @@ type BackendOperationLogController struct {
 }
 
 func (c *BackendOperationLogController) backendClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendOperationLogController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -50,7 +35,8 @@ func (c *BackendOperationLogController) jsonErr(httpStatus, bizCode int, msg str
 func (c *BackendOperationLogController) List() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	uid := uint64(claims.UserID)
@@ -182,7 +168,8 @@ func (c *BackendOperationLogController) List() {
 func (c *BackendOperationLogController) Detail() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	uid := uint64(claims.UserID)
@@ -232,7 +219,8 @@ func (c *BackendOperationLogController) Detail() {
 func (c *BackendOperationLogController) Delete() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	uid := uint64(claims.UserID)
@@ -270,7 +258,8 @@ type backendBatchDeletePayload struct {
 func (c *BackendOperationLogController) BatchDelete() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	uid := uint64(claims.UserID)
@@ -309,7 +298,8 @@ func (c *BackendOperationLogController) BatchDelete() {
 func (c *BackendOperationLogController) Statistics() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	uid := uint64(claims.UserID)
diff --git a/go/controllers/backend_organization.go b/go/controllers/backend_organization.go
index fc5ceac..147ed28 100644
--- a/go/controllers/backend_organization.go
+++ b/go/controllers/backend_organization.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -123,13 +124,8 @@ type positionDTO struct {
 
 // claims 解析 Authorization 头中的 JWT，要求是租户端（backend）用户且带有效租户ID。
 func (c *BackendOrganizationController) claims() (*jwtutil.Claims, bool) {
-	auth := strings.TrimSpace(c.Ctx.Request.Header.Get("Authorization"))
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, false
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil || claims.UserType != "backend" || claims.TenantId <= 0 {
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+	if err != nil || claims.TenantId <= 0 {
 		return nil, false
 	}
 	return claims, true
diff --git a/go/controllers/backend_payment.go b/go/controllers/backend_payment.go
index 0da67e5..f2922f7 100644
--- a/go/controllers/backend_payment.go
+++ b/go/controllers/backend_payment.go
@@ -3,13 +3,13 @@ package controllers
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services/payment"
 
@@ -24,22 +24,7 @@ type BackendPaymentController struct {
 }
 
 func (c *BackendPaymentController) backendClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendPaymentController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -80,7 +65,8 @@ func (c *BackendPaymentController) tenantName() string {
 // Channels GET /backend/payment/channels 收银台可用渠道（已启用且参数完整）
 func (c *BackendPaymentController) Channels() {
 	if _, err := c.backendClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var rows []models.PlatformPaymentChannel
@@ -119,7 +105,8 @@ func (c *BackendPaymentController) Channels() {
 func (c *BackendPaymentController) Create() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -191,7 +178,8 @@ func (c *BackendPaymentController) Create() {
 // Query GET /backend/payment/query/:payNo 查询支付单（仅本租户）
 func (c *BackendPaymentController) Query() {
 	if _, err := c.backendClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	payNo := c.Ctx.Input.Param(":payNo")
diff --git a/go/controllers/backend_product.go b/go/controllers/backend_product.go
index 8d9c65a..dd50ddc 100644
--- a/go/controllers/backend_product.go
+++ b/go/controllers/backend_product.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -77,7 +78,8 @@ func cmsProductCateToMap(row models.CmsProductCategory) map[string]interface{} {
 func (c *BackendProductController) List() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -142,7 +144,8 @@ type cmsProductPayload struct {
 func (c *BackendProductController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -194,7 +197,8 @@ func (c *BackendProductController) Create() {
 func (c *BackendProductController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -252,7 +256,8 @@ func (c *BackendProductController) Update() {
 func (c *BackendProductController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -285,7 +290,8 @@ func (c *BackendProductController) Delete() {
 func (c *BackendProductCategoryController) List() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -344,7 +350,8 @@ type cmsProductCategoryPayload struct {
 func (c *BackendProductCategoryController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -394,7 +401,8 @@ func (c *BackendProductCategoryController) Create() {
 func (c *BackendProductCategoryController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -453,7 +461,8 @@ func (c *BackendProductCategoryController) Update() {
 func (c *BackendProductCategoryController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
diff --git a/go/controllers/backend_product_purchase.go b/go/controllers/backend_product_purchase.go
index d633303..4545f1c 100644
--- a/go/controllers/backend_product_purchase.go
+++ b/go/controllers/backend_product_purchase.go
@@ -3,13 +3,13 @@ package controllers
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"io"
 	"strconv"
 	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services/payment"
 
@@ -24,22 +24,7 @@ type BackendProductPurchaseController struct {
 }
 
 func (c *BackendProductPurchaseController) claims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, errors.New("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, errors.New("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, errors.New("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, errors.New("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendProductPurchaseController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -78,7 +63,8 @@ func (c *BackendProductPurchaseController) tenantName(tid uint64) string {
 // 上架产品列表（含功能节点与启用档位），供购买页/产品列表展示
 func (c *BackendProductPurchaseController) GetProductList() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var rows []models.PlatformProduct
@@ -107,7 +93,8 @@ func (c *BackendProductPurchaseController) GetProductList() {
 // 按产品编码取详情（租户端 home 卡片按模块 code 跳转购买页时使用）
 func (c *BackendProductPurchaseController) GetProductDetailByCode() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	code := strings.TrimSpace(c.Ctx.Input.Param(":code"))
@@ -139,7 +126,8 @@ type createProductOrderPayload struct {
 func (c *BackendProductPurchaseController) CreateOrder() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -246,7 +234,8 @@ func (c *BackendProductPurchaseController) CreateOrder() {
 func (c *BackendProductPurchaseController) GetOrderStatus() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	orderNo := strings.TrimSpace(c.GetString("order_no"))
@@ -304,7 +293,8 @@ func (c *BackendProductPurchaseController) GetOrderStatus() {
 func (c *BackendProductPurchaseController) GetMyOrders() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var rows []models.PlatformProductOrder
@@ -327,7 +317,8 @@ func (c *BackendProductPurchaseController) GetMyOrders() {
 func (c *BackendProductPurchaseController) GetPackageList() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var rows []models.SystemTenantPackage
@@ -396,7 +387,8 @@ func (c *BackendProductPurchaseController) GetPackageList() {
 // 按套餐编码获取详情（租户端购买页使用）
 func (c *BackendProductPurchaseController) GetPackageDetailByCode() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	code := strings.TrimSpace(c.Ctx.Input.Param(":code"))
@@ -450,7 +442,8 @@ type createPackageOrderPayload struct {
 func (c *BackendProductPurchaseController) CreatePackageOrder() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
diff --git a/go/controllers/backend_reimburse.go b/go/controllers/backend_reimburse.go
index 8307140..00c63c8 100644
--- a/go/controllers/backend_reimburse.go
+++ b/go/controllers/backend_reimburse.go
@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"path"
@@ -12,6 +11,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 	approvalEngine "server/services/approval"
@@ -47,13 +47,8 @@ type reimbursementPayload struct {
 }
 
 func (c *BackendReimburseController) claims() (*jwtutil.Claims, bool) {
-	auth := strings.TrimSpace(c.Ctx.Request.Header.Get("Authorization"))
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, false
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil || claims.UserType != "backend" || claims.TenantId <= 0 || claims.UserID <= 0 {
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+	if err != nil || claims.TenantId <= 0 || claims.UserID <= 0 {
 		return nil, false
 	}
 	return claims, true
diff --git a/go/controllers/backend_reminder.go b/go/controllers/backend_reminder.go
index b638f14..c594d14 100644
--- a/go/controllers/backend_reminder.go
+++ b/go/controllers/backend_reminder.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -23,22 +24,7 @@ type BackendReminderController struct {
 }
 
 func (c *BackendReminderController) backendReminderClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendReminderController) brJsonErr(httpStatus, bizCode int, msg string) {
@@ -76,7 +62,8 @@ type backendReminderFormPayload struct {
 func (c *BackendReminderController) GetReminderList() {
 	claims, err := c.backendReminderClaims()
 	if err != nil {
-		c.brJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.brJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -169,7 +156,8 @@ func (c *BackendReminderController) GetReminderList() {
 func (c *BackendReminderController) GetReminderDetail() {
 	claims, err := c.backendReminderClaims()
 	if err != nil {
-		c.brJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.brJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -248,7 +236,8 @@ func (c *BackendReminderController) GetReminderDetail() {
 func (c *BackendReminderController) CreateReminder() {
 	claims, err := c.backendReminderClaims()
 	if err != nil {
-		c.brJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.brJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -350,7 +339,8 @@ func (c *BackendReminderController) CreateReminder() {
 func (c *BackendReminderController) UpdateReminder() {
 	claims, err := c.backendReminderClaims()
 	if err != nil {
-		c.brJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.brJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -488,7 +478,8 @@ func (c *BackendReminderController) UpdateReminder() {
 func (c *BackendReminderController) DeleteReminder() {
 	claims, err := c.backendReminderClaims()
 	if err != nil {
-		c.brJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.brJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -551,7 +542,8 @@ type backendReminderBatchDeletePayload struct {
 func (c *BackendReminderController) BatchDeleteReminder() {
 	claims, err := c.backendReminderClaims()
 	if err != nil {
-		c.brJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.brJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -612,7 +604,8 @@ func (c *BackendReminderController) BatchDeleteReminder() {
 func (c *BackendReminderController) FinishReminder() {
 	claims, err := c.backendReminderClaims()
 	if err != nil {
-		c.brJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.brJsonErr(code, code, err.Error())
 		return
 	}
 
@@ -674,7 +667,8 @@ type backendReminderTestPayload struct {
 func (c *BackendReminderController) TestReminder() {
 	claims, err := c.backendReminderClaims()
 	if err != nil {
-		c.brJsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.brJsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_role.go b/go/controllers/backend_role.go
index 993d7a4..9902790 100644
--- a/go/controllers/backend_role.go
+++ b/go/controllers/backend_role.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"server/models"
-	"server/pkg/jwtutil"
+	"server/pkg/identity"
 
 	beego "github.com/beego/beego/v2/server/web"
 )
@@ -111,29 +111,20 @@ func sanitizeTenantRights(v interface{}) *string {
 	return &s
 }
 
+// tenantRoleReadOnly 判定角色对租户端是否只读。
+// is_locked 是平台下发的显式开关；tenant_id==0 的全局角色不属于任何租户，天然只读。
+// 两者取并集，避免平台建全局角色时漏设 is_locked 就把写权限漏给租户。
+func tenantRoleReadOnly(role models.AdminRole) bool {
+	return role.IsLocked == 1 || role.TenantID == 0
+}
+
 // currentTenantID 从 Bearer Token 解析当前登录租户 ID。
 // 返回 (tid, true) 表示成功；失败时已写入 401/403 响应并返回 (0, false)。
 func (c *BackendRoleController) currentTenantID() (uint64, bool) {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "未登录"}
-		_ = c.ServeJSON()
-		return 0, false
-	}
-	authParts := strings.SplitN(authHeader, " ", 2)
-	if len(authParts) != 2 || authParts[0] != "Bearer" {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "认证信息格式错误"}
-		_ = c.ServeJSON()
-		return 0, false
-	}
-	claims, err := jwtutil.ParseToken(authParts[1])
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend, identity.EndApp)
 	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "无效的token"}
-		_ = c.ServeJSON()
-		return 0, false
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" {
-		c.Data["json"] = map[string]interface{}{"code": 403, "msg": "无权访问"}
+		code := identity.Status(err)
+		c.Data["json"] = map[string]interface{}{"code": code, "msg": err.Error()}
 		_ = c.ServeJSON()
 		return 0, false
 	}
@@ -297,13 +288,13 @@ func (c *BackendRoleController) UpdateRole() {
 		return
 	}
 
-	// 全局角色（tenant_id=0）由平台端统一维护，租户端只读
+	// 平台下发或全局共享的角色由平台端统一维护，租户端只读
 	var target models.AdminRole
 	if e := models.Orm.QueryTable(new(models.AdminRole)).
 		Filter("id", id).
 		Filter("cid", 2).
-		One(&target); e == nil && target.TenantID == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 403, "msg": "全局角色由平台端统一维护，租户端不能修改"}
+		One(&target); e == nil && tenantRoleReadOnly(target) {
+		c.Data["json"] = map[string]interface{}{"code": 403, "msg": "该角色由平台端统一下发，租户端不能修改"}
 		_ = c.ServeJSON()
 		return
 	}
@@ -328,22 +319,34 @@ func (c *BackendRoleController) UpdateRole() {
 		}
 	}
 
-	// 仅允许更新本租户名下的角色，防止越权改到其他租户
-	cnt, err := models.Orm.QueryTable(new(models.AdminRole)).
+	// 仅允许更新本租户名下的角色，防止越权改到其他租户。
+	// 先查存在性再更新：MySQL 的 affected rows 只算「真正变化」的行，
+	// 提交与库里完全一致的值会返回 0，直接用它判 404 会把「保存成功但没改动」误报成「角色不存在」。
+	exist, err := models.Orm.QueryTable(new(models.AdminRole)).
 		Filter("id", id).
 		Filter("cid", 2).
 		Filter("tenant_id", tid).
-		Update(update)
+		Count()
 	if err != nil {
 		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败"}
 		_ = c.ServeJSON()
 		return
 	}
-	if cnt == 0 {
+	if exist == 0 {
 		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "角色不存在"}
 		_ = c.ServeJSON()
 		return
 	}
+
+	if _, err := models.Orm.QueryTable(new(models.AdminRole)).
+		Filter("id", id).
+		Filter("cid", 2).
+		Filter("tenant_id", tid).
+		Update(update); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败"}
+		_ = c.ServeJSON()
+		return
+	}
 	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
 	_ = c.ServeJSON()
 }
@@ -362,13 +365,13 @@ func (c *BackendRoleController) DeleteRole() {
 		_ = c.ServeJSON()
 		return
 	}
-	// 全局角色（tenant_id=0）由平台端统一维护，租户端不能删除
+	// 平台下发或全局共享的角色由平台端统一维护，租户端不能删除
 	var target models.AdminRole
 	if e := models.Orm.QueryTable(new(models.AdminRole)).
 		Filter("id", id).
 		Filter("cid", 2).
-		One(&target); e == nil && target.TenantID == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 403, "msg": "全局角色由平台端统一维护，租户端不能删除"}
+		One(&target); e == nil && tenantRoleReadOnly(target) {
+		c.Data["json"] = map[string]interface{}{"code": 403, "msg": "该角色由平台端统一下发，租户端不能删除"}
 		_ = c.ServeJSON()
 		return
 	}
diff --git a/go/controllers/backend_site_settings.go b/go/controllers/backend_site_settings.go
index 0835e2a..ee3049f 100644
--- a/go/controllers/backend_site_settings.go
+++ b/go/controllers/backend_site_settings.go
@@ -2,13 +2,13 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -31,31 +31,7 @@ func (c *BackendSiteSettingsController) jsonErr(httpStatus, bizCode int, msg str
 }
 
 func (c *BackendSiteSettingsController) claimsByPath() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-
-	path := strings.ToLower(c.Ctx.Request.URL.Path)
-	if strings.HasPrefix(path, "/platform/") {
-		if claims.UserType != "platform" {
-			return nil, fmt.Errorf("无权访问")
-		}
-	} else if strings.HasPrefix(path, "/backend/") {
-		if claims.UserType != "backend" {
-			return nil, fmt.Errorf("无权访问")
-		}
-	}
-
-	return claims, nil
+	return identity.ClaimsByPath(c.Ctx.Request.Header.Get("Authorization"), c.Ctx.Request.URL.Path)
 }
 
 func parseBackendUint64Flexible(v interface{}) uint64 {
@@ -102,20 +78,13 @@ type backendNormalInfosOutput struct {
 func (c *BackendSiteSettingsController) GetNormalInfos() {
 	claims, err := c.claimsByPath()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
-	// 优先使用 token 中的租户 id；若为 0，则允许前端通过查询参数传入（兼容历史/平台端）。
-	tid := uint64(claims.TenantId)
-	if tid == 0 {
-		tidStr := strings.TrimSpace(c.GetString("tid"))
-		if tidStr != "" {
-			if n, err := strconv.ParseUint(tidStr, 10, 64); err == nil {
-				tid = n
-			}
-		}
-	}
+	// 归属租户由 resolveBackendTenantID 统一裁决（backend 端只认令牌）
+	tid := c.resolveBackendTenantID(claims, nil)
 
 	out := backendNormalInfosOutput{
 		Sitename:            "",
@@ -194,7 +163,8 @@ type backendNormalInfosPayload struct {
 func (c *BackendSiteSettingsController) SaveNormalInfos() {
 	claims, err := c.claimsByPath()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -210,10 +180,7 @@ func (c *BackendSiteSettingsController) SaveNormalInfos() {
 		return
 	}
 
-	tid := uint64(claims.TenantId)
-	if tid == 0 {
-		tid = parseBackendUint64Flexible(p.Tid)
-	}
+	tid := c.resolveBackendTenantID(claims, p.Tid)
 	if tid == 0 {
 		c.jsonErr(400, 400, "tid不能为空")
 		return
@@ -295,20 +262,20 @@ func (c *BackendSiteSettingsController) SaveNormalInfos() {
 	_ = c.ServeJSON()
 }
 
+// resolveBackendTenantID 取站点设置归属租户：
+//   - backend 路径只认登录态，忽略 ?tid= 与请求体里的 tid——否则改一个参数就能读写别的企业站点设置；
+//   - platform 路径下平台管理员令牌的 tenant_id 为 0，需要按参数指定要维护哪家企业。
 func (c *BackendSiteSettingsController) resolveBackendTenantID(claims *jwtutil.Claims, payloadTid interface{}) uint64 {
-	tid := uint64(claims.TenantId)
-	if tid == 0 {
-		tid = parseBackendUint64Flexible(payloadTid)
+	if claims != nil && claims.TenantId > 0 {
+		return uint64(claims.TenantId)
 	}
-	if tid == 0 {
-		tidStr := strings.TrimSpace(c.GetString("tid"))
-		if tidStr != "" {
-			if n, err := strconv.ParseUint(tidStr, 10, 64); err == nil {
-				tid = n
-			}
-		}
+	if !strings.HasPrefix(strings.ToLower(c.Ctx.Request.URL.Path), "/platform/") {
+		return 0
 	}
-	return tid
+	if tid := parseBackendUint64Flexible(payloadTid); tid > 0 {
+		return tid
+	}
+	return parseBackendUint64Flexible(strings.TrimSpace(c.GetString("tid")))
 }
 
 func (c *BackendSiteSettingsController) getBackendSettingItems(tid uint64, keys []string) (map[string]string, error) {
@@ -354,7 +321,8 @@ ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value), update_time = NOW
 func (c *BackendSiteSettingsController) GetLegalInfos() {
 	claims, err := c.claimsByPath()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -391,7 +359,8 @@ type backendLegalInfosPayload struct {
 func (c *BackendSiteSettingsController) SaveLegalInfos() {
 	claims, err := c.claimsByPath()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -429,7 +398,8 @@ func (c *BackendSiteSettingsController) SaveLegalInfos() {
 func (c *BackendSiteSettingsController) GetCompanyInfos() {
 	claims, err := c.claimsByPath()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -486,7 +456,8 @@ type backendCompanyInfosPayload struct {
 func (c *BackendSiteSettingsController) SaveCompanyInfos() {
 	claims, err := c.claimsByPath()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -530,7 +501,8 @@ func (c *BackendSiteSettingsController) SaveCompanyInfos() {
 func (c *BackendSiteSettingsController) GetCompanySeo() {
 	claims, err := c.claimsByPath()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -570,7 +542,8 @@ type backendCompanySeoPayload struct {
 func (c *BackendSiteSettingsController) SaveCompanySeo() {
 	claims, err := c.claimsByPath()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/backend_sitereminder.go b/go/controllers/backend_sitereminder.go
index 9a49462..e8697da 100644
--- a/go/controllers/backend_sitereminder.go
+++ b/go/controllers/backend_sitereminder.go
@@ -1,151 +1,139 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-
-	"server/pkg/jwtutil"
-	"server/services"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type BackendSiteReminderController struct {
-	beego.Controller
-}
-
-func (c *BackendSiteReminderController) backendClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *BackendSiteReminderController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-// GetMyList GET /backend/sitereminder/myList
-func (c *BackendSiteReminderController) GetMyList() {
-	claims, err := c.backendClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 10)
-	var isRead *int8
-	if isReadStr := c.GetString("isRead"); isReadStr != "" {
-		if val, err := strconv.Atoi(isReadStr); err == nil {
-			v := int8(val)
-			isRead = &v
-		}
-	}
-
-	list, total, err := services.ListReminders(uint64(claims.UserID), "tenant", page, pageSize, isRead)
-	if err != nil {
-		c.jsonErr(500, 500, "获取消息列表失败: "+err.Error())
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"list":  list,
-			"total": total,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// MarkRead POST /backend/sitereminder/read
-func (c *BackendSiteReminderController) MarkRead() {
-	claims, err := c.backendClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	err = services.MarkReminderRead(p.ID, uint64(claims.UserID), "tenant")
-	if err != nil {
-		c.jsonErr(500, 500, "操作失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// MarkAllRead POST /backend/sitereminder/readall
-func (c *BackendSiteReminderController) MarkAllRead() {
-	claims, err := c.backendClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	err = services.MarkAllRemindersRead(uint64(claims.UserID), "tenant")
-	if err != nil {
-		c.jsonErr(500, 500, "操作失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// Delete POST /backend/sitereminder/delete
-func (c *BackendSiteReminderController) Delete() {
-	claims, err := c.backendClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	err = services.DeleteReminder(p.ID, uint64(claims.UserID), "tenant")
-	if err != nil {
-		c.jsonErr(500, 500, "删除失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+	"server/services"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type BackendSiteReminderController struct {
+	beego.Controller
+}
+
+func (c *BackendSiteReminderController) backendClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
+}
+
+func (c *BackendSiteReminderController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// GetMyList GET /backend/sitereminder/myList
+func (c *BackendSiteReminderController) GetMyList() {
+	claims, err := c.backendClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 10)
+	var isRead *int8
+	if isReadStr := c.GetString("isRead"); isReadStr != "" {
+		if val, err := strconv.Atoi(isReadStr); err == nil {
+			v := int8(val)
+			isRead = &v
+		}
+	}
+
+	list, total, err := services.ListReminders(uint64(claims.UserID), "tenant", page, pageSize, isRead)
+	if err != nil {
+		c.jsonErr(500, 500, "获取消息列表失败: "+err.Error())
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"list":  list,
+			"total": total,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// MarkRead POST /backend/sitereminder/read
+func (c *BackendSiteReminderController) MarkRead() {
+	claims, err := c.backendClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	err = services.MarkReminderRead(p.ID, uint64(claims.UserID), "tenant")
+	if err != nil {
+		c.jsonErr(500, 500, "操作失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// MarkAllRead POST /backend/sitereminder/readall
+func (c *BackendSiteReminderController) MarkAllRead() {
+	claims, err := c.backendClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	err = services.MarkAllRemindersRead(uint64(claims.UserID), "tenant")
+	if err != nil {
+		c.jsonErr(500, 500, "操作失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// Delete POST /backend/sitereminder/delete
+func (c *BackendSiteReminderController) Delete() {
+	claims, err := c.backendClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	err = services.DeleteReminder(p.ID, uint64(claims.UserID), "tenant")
+	if err != nil {
+		c.jsonErr(500, 500, "删除失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/backend_solution.go b/go/controllers/backend_solution.go
index 6837d58..1d32b0d 100644
--- a/go/controllers/backend_solution.go
+++ b/go/controllers/backend_solution.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -77,7 +78,8 @@ func cmsSolutionCateToMap(row models.CmsSolutionCategory) map[string]interface{}
 func (c *BackendSolutionController) List() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -142,7 +144,8 @@ type cmsSolutionPayload struct {
 func (c *BackendSolutionController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -194,7 +197,8 @@ func (c *BackendSolutionController) Create() {
 func (c *BackendSolutionController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -252,7 +256,8 @@ func (c *BackendSolutionController) Update() {
 func (c *BackendSolutionController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -285,7 +290,8 @@ func (c *BackendSolutionController) Delete() {
 func (c *BackendSolutionCategoryController) List() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -344,7 +350,8 @@ type cmsSolutionCategoryPayload struct {
 func (c *BackendSolutionCategoryController) Create() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -394,7 +401,8 @@ func (c *BackendSolutionCategoryController) Create() {
 func (c *BackendSolutionCategoryController) Update() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -453,7 +461,8 @@ func (c *BackendSolutionCategoryController) Update() {
 func (c *BackendSolutionCategoryController) Delete() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
diff --git a/go/controllers/backend_tenant_apply.go b/go/controllers/backend_tenant_apply.go
index c27ae4f..77c3e97 100644
--- a/go/controllers/backend_tenant_apply.go
+++ b/go/controllers/backend_tenant_apply.go
@@ -2,12 +2,12 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 	authsvc "server/services/auth"
@@ -22,22 +22,7 @@ type BackendTenantApplyController struct {
 }
 
 func (c *BackendTenantApplyController) backendClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
 }
 
 func (c *BackendTenantApplyController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -80,7 +65,8 @@ func (c *BackendTenantApplyController) reviewerName(claims *jwtutil.Claims) stri
 func (c *BackendTenantApplyController) List() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -143,7 +129,8 @@ func (c *BackendTenantApplyController) List() {
 func (c *BackendTenantApplyController) Approve() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
@@ -164,7 +151,8 @@ func (c *BackendTenantApplyController) Approve() {
 func (c *BackendTenantApplyController) Reject() {
 	claims, err := c.backendClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := uint64(claims.TenantId)
diff --git a/go/controllers/backend_tenant_quota.go b/go/controllers/backend_tenant_quota.go
index c776e9e..bf0d073 100644
--- a/go/controllers/backend_tenant_quota.go
+++ b/go/controllers/backend_tenant_quota.go
@@ -15,13 +15,8 @@ type BackendTenantQuotaController struct {
 // GetQuotaInfo GET /backend/tenant/quotaInfo
 // 返回当前登录租户的用户数使用情况与生效套餐。
 func (c *BackendTenantQuotaController) GetQuotaInfo() {
+	// 只认令牌：?tid= 兜底会让未绑定企业的登录态改参数就去读别人的配额与套餐
 	tid := backendJWTTenantID(c.Ctx.Request.Header.Get("Authorization"))
-	if tid == 0 {
-		// 兜底：从 tid 参数取（部分历史调用未带 token 场景）
-		if v, err := c.GetUint64("tid"); err == nil {
-			tid = v
-		}
-	}
 	if tid == 0 {
 		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "未登录或非法请求"}
 		_ = c.ServeJSON()
diff --git a/go/controllers/backend_theme.go b/go/controllers/backend_theme.go
index 12b810e..f151ec4 100644
--- a/go/controllers/backend_theme.go
+++ b/go/controllers/backend_theme.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -35,7 +36,8 @@ var reThemeCode = regexp.MustCompile(`^[a-zA-Z0-9_\-]+$`)
 func (c *BackendThemeController) List() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -112,7 +114,8 @@ func cmsTenantTemplateCode(tid uint64) string {
 func (c *BackendThemeController) Switch() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -195,7 +198,8 @@ func cmsUpsertTenantTemplate(tid uint64, code string) error {
 func (c *BackendThemeController) GetData() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
@@ -238,7 +242,8 @@ func (c *BackendThemeController) GetData() {
 func (c *BackendThemeController) SaveData() {
 	claims, err := c.cmsClaims()
 	if err != nil {
-		c.cmsJSONErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.cmsJSONErr(code, code, err.Error())
 		return
 	}
 	tid := cmsEffectiveTid(&c.Controller, claims)
diff --git a/go/controllers/backend_wechat_mp.go b/go/controllers/backend_wechat_mp.go
index 5b19a90..303cc60 100644
--- a/go/controllers/backend_wechat_mp.go
+++ b/go/controllers/backend_wechat_mp.go
@@ -2,11 +2,11 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services/wechatmp"
 
@@ -25,22 +25,7 @@ type BackendWechatMpController struct {
 }
 
 func (c *BackendWechatMpController) claims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "backend" && claims.UserType != "app" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndApp, identity.EndBackend)
 }
 
 func (c *BackendWechatMpController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -80,7 +65,8 @@ func (c *BackendWechatMpController) readBody(out interface{}) bool {
 func (c *BackendWechatMpController) BindStart() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	uid := uint64(claims.UserID)
@@ -105,7 +91,8 @@ func (c *BackendWechatMpController) BindStart() {
 func (c *BackendWechatMpController) BindStatus() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	scene := strings.TrimSpace(c.GetString("scene"))
@@ -128,7 +115,8 @@ func (c *BackendWechatMpController) BindStatus() {
 func (c *BackendWechatMpController) BindConfirm() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -175,7 +163,8 @@ func (c *BackendWechatMpController) BindConfirm() {
 func (c *BackendWechatMpController) MyBinding() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	follower, err := wechatmp.GetFollowerByUser(models.WechatBindTypeTenantUser, uint64(claims.UserID))
@@ -202,7 +191,8 @@ func (c *BackendWechatMpController) MyBinding() {
 func (c *BackendWechatMpController) Unbind() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	if err := wechatmp.UnbindByUser(models.WechatBindTypeTenantUser, uint64(claims.UserID)); err != nil {
diff --git a/go/controllers/erp_archive_core.go b/go/controllers/erp_archive_core.go
new file mode 100644
index 0000000..ba965b7
--- /dev/null
+++ b/go/controllers/erp_archive_core.go
@@ -0,0 +1,300 @@
+package controllers
+
+import (
+	"strings"
+
+	"server/models"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// ERP 档案读取核心（两端共用）。
+//
+// 商品/分类/仓库/客商在 /backend/erp/** 与 /api/erp/** 各有独立 handler 与路由（接口隔离规范），
+// 但「按租户过滤 + 关键字命中字段 + 列表补库存与状态」的口径只能有一份实现，放在这里。
+// 返回值约定与 erp_*_core.go 一致：最后一个 string 为空表示成功，非空时配套 http 状态码。
+
+// ---- 商品 ----
+
+type erpProductFilter struct {
+	Keyword     string
+	CategoryID  uint64
+	Brand       string
+	Status      string
+	IsDraft     string
+	OnlyEnabled bool
+}
+
+// erpProductListCore 商品列表：出参已补分类名、全仓库存合计与预警状态。
+func erpProductListCore(a erpActor, f erpProductFilter, page, pageSize int) ([]models.ErpProduct, int64, int, string) {
+	qs := models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", a.Tid).Filter("delete_time__isnull", true)
+	if kw := strings.TrimSpace(f.Keyword); kw != "" {
+		cond := orm.NewCondition().
+			Or("product_name__contains", kw).
+			Or("product_code__contains", kw).
+			Or("barcode__contains", kw).
+			Or("spec__contains", kw).
+			Or("brand__contains", kw)
+		qs = qs.SetCond(qs.GetCond().AndCond(cond))
+	}
+	if f.CategoryID > 0 {
+		qs = qs.Filter("category_id", f.CategoryID)
+	}
+	if b := strings.TrimSpace(f.Brand); b != "" {
+		qs = qs.Filter("brand", b)
+	}
+	if st := strings.TrimSpace(f.Status); st != "" {
+		qs = qs.Filter("status", st)
+	}
+	if d := strings.TrimSpace(f.IsDraft); d != "" {
+		qs = qs.Filter("is_draft", d)
+	}
+	if f.OnlyEnabled {
+		qs = qs.Filter("status", 1).Filter("is_draft", 0)
+	}
+
+	total, _ := qs.Count()
+	var list []models.ErpProduct
+	if _, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&list); err != nil {
+		return nil, 0, 500, "查询失败: " + err.Error()
+	}
+
+	cats := erpCategoryMap(a.Tid)
+	ids := make([]uint64, 0, len(list))
+	for _, p := range list {
+		ids = append(ids, p.ID)
+	}
+	agg := erpStockAggregate(a.Tid, ids)
+	for i := range list {
+		list[i].CategoryName = cats[list[i].CategoryID]
+		list[i].TotalStock = agg[list[i].ID].qty
+		list[i].SafetyState = erpSafetyState(list[i].SafetyQty, list[i].TotalStock, list[i].MaxQty)
+	}
+	return list, total, 200, ""
+}
+
+// erpProductDetailCore 商品详情：含分类名与分仓/分批次结存。
+func erpProductDetailCore(a erpActor, id uint64) (*models.ErpProduct, int, string) {
+	if id == 0 {
+		return nil, 400, "无效的ID"
+	}
+	var p models.ErpProduct
+	if err := models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("id", id).Filter("tenant_id", a.Tid).
+		Filter("delete_time__isnull", true).One(&p); err != nil {
+		return nil, 404, "商品未找到"
+	}
+	p.CategoryName = erpCategoryMap(a.Tid)[p.CategoryID]
+	p.Stocks = erpProductStocks(a.Tid, id)
+	return &p, 200, ""
+}
+
+// ---- 商品分类 ----
+
+// erpCategoryListCore 分类列表 + 树，并统计每个分类下的商品数。
+func erpCategoryListCore(a erpActor) ([]map[string]interface{}, []map[string]interface{}, int, string) {
+	var list []models.ErpProductCategory
+	_, _ = models.Orm.QueryTable(new(models.ErpProductCategory)).
+		Filter("tenant_id", a.Tid).Filter("delete_time__isnull", true).
+		OrderBy("sort_order", "id").All(&list)
+
+	counts := map[uint64]int64{}
+	var ps []models.ErpProduct
+	_, _ = models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", a.Tid).Filter("delete_time__isnull", true).
+		All(&ps, "id", "category_id")
+	for _, p := range ps {
+		counts[p.CategoryID]++
+	}
+	rows := make([]map[string]interface{}, 0, len(list))
+	for _, r := range list {
+		rows = append(rows, map[string]interface{}{
+			"id": r.ID, "category_name": r.CategoryName, "parent_id": r.ParentID,
+			"sort_order": r.SortOrder, "status": r.Status, "remark": r.Remark,
+			"product_count": counts[r.ID],
+		})
+	}
+	return rows, erpCategoryTree(rows, 0), 200, ""
+}
+
+// ---- 仓库 ----
+
+// erpWarehouseListCore 仓库列表：每仓在库品种数与货值，列表直接反映仓库占用情况。
+func erpWarehouseListCore(a erpActor, keyword, status string, onlyEnabled bool) ([]map[string]interface{}, int, string) {
+	qs := models.Orm.QueryTable(new(models.ErpWarehouse)).
+		Filter("tenant_id", a.Tid).Filter("delete_time__isnull", true)
+	if kw := strings.TrimSpace(keyword); kw != "" {
+		qs = qs.Filter("warehouse_name__contains", kw)
+	}
+	if st := strings.TrimSpace(status); st != "" {
+		qs = qs.Filter("status", st)
+	}
+	if onlyEnabled {
+		qs = qs.Filter("status", 1)
+	}
+	var list []models.ErpWarehouse
+	if _, err := qs.OrderBy("-is_default", "id").All(&list); err != nil {
+		return nil, 500, "查询失败: " + err.Error()
+	}
+
+	type agg struct {
+		kinds int
+		value float64
+	}
+	amap := map[uint64]*agg{}
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", a.Tid).All(&stocks, "warehouse_id", "quantity", "cost_price")
+	for _, s := range stocks {
+		w := amap[s.WarehouseID]
+		if w == nil {
+			w = &agg{}
+			amap[s.WarehouseID] = w
+		}
+		if s.Quantity > 0.000001 {
+			w.kinds++
+		}
+		w.value += s.Quantity * s.CostPrice
+	}
+	rows := make([]map[string]interface{}, 0, len(list))
+	for _, wh := range list {
+		v := amap[wh.ID]
+		if v == nil {
+			v = &agg{}
+		}
+		rows = append(rows, map[string]interface{}{
+			"warehouse":   wh,
+			"stock_kinds": v.kinds,
+			"stock_value": round2f(v.value),
+		})
+	}
+	return rows, 200, ""
+}
+
+// ---- 客商（供应商/客户统一出参）----
+
+// erpPartnerRow 移动端开单/对账用的客商精简行：供应商与客户共用一套字段，
+// 前端按 partner_type 决定「应收/应付」口径，不必分别处理两张表。
+type erpPartnerRow struct {
+	PartnerID     uint64  `json:"partner_id"`
+	PartnerType   string  `json:"partner_type"`
+	PartnerName   string  `json:"partner_name"`
+	ContactPerson string  `json:"contact_person"`
+	ContactPhone  string  `json:"contact_phone"`
+	Level         string  `json:"level"`
+	PaymentDays   int     `json:"payment_days"`
+	CreditLimit   float64 `json:"credit_limit"`
+	OpenAmount    float64 `json:"open_amount"`
+}
+
+// erpPartnerListCore 客商列表（partner_type=supplier|customer），附带未结往来余额。
+func erpPartnerListCore(a erpActor, partnerType, keyword string, onlyEnabled bool, page, pageSize int) ([]erpPartnerRow, int64, int, string) {
+	nameField := "customer_name"
+	var qTable interface{} = new(models.TenantCrmCustomer)
+	if partnerType == "supplier" {
+		nameField = "supplier_name"
+		qTable = new(models.TenantCrmSupplier)
+	} else {
+		partnerType = "customer"
+	}
+
+	qs := models.Orm.QueryTable(qTable).
+		Filter("tenant_id", a.Tid).Filter("delete_time__isnull", true)
+	if kw := strings.TrimSpace(keyword); kw != "" {
+		qs = qs.Filter(nameField+"__contains", kw)
+	}
+	if onlyEnabled {
+		qs = qs.Filter("status", "1").Filter("is_draft", 0)
+	}
+	if partnerType == "customer" {
+		// 公海客户没有归属，不参与开单
+		qs = qs.Filter("in_pool", 0)
+	}
+	total, _ := qs.Count()
+
+	billType := int8(models.ErpBillReceivable)
+	if partnerType == "supplier" {
+		billType = models.ErpBillPayable
+	}
+
+	type brief struct {
+		id      uint64
+		name    string
+		contact string
+		phone   string
+		level   string
+		payDays int
+		credit  float64
+	}
+	var briefs []brief
+	if partnerType == "supplier" {
+		var list []models.TenantCrmSupplier
+		if _, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).
+			All(&list, "id", "supplier_name", "contact_person", "contact_phone", "supplier_level", "payment_days"); err != nil {
+			return nil, 0, 500, "查询失败: " + err.Error()
+		}
+		for _, s := range list {
+			briefs = append(briefs, brief{s.ID, s.SupplierName, s.ContactPerson, s.ContactPhone, s.SupplierLevel, s.PaymentDays, 0})
+		}
+	} else {
+		var list []models.TenantCrmCustomer
+		if _, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).
+			All(&list, "id", "customer_name", "contact_person", "contact_phone", "customer_level", "payment_days", "credit_limit"); err != nil {
+			return nil, 0, 500, "查询失败: " + err.Error()
+		}
+		for _, c := range list {
+			briefs = append(briefs, brief{c.ID, c.CustomerName, c.ContactPerson, c.ContactPhone, c.CustomerLevel, c.PaymentDays, c.CreditLimit})
+		}
+	}
+
+	ids := make([]uint64, 0, len(briefs))
+	for _, b := range briefs {
+		ids = append(ids, b.id)
+	}
+	open := map[uint64]float64{}
+	if len(ids) > 0 {
+		var bills []models.ErpPartnerBill
+		_, _ = models.Orm.QueryTable(new(models.ErpPartnerBill)).
+			Filter("tenant_id", a.Tid).Filter("bill_type", billType).
+			Filter("status__lt", 2).Filter("partner_id__in", ids).
+			All(&bills, "partner_id", "amount", "settled_amount")
+		for _, b := range bills {
+			open[b.PartnerID] += b.Amount - b.SettledAmount
+		}
+	}
+
+	out := make([]erpPartnerRow, 0, len(briefs))
+	for _, b := range briefs {
+		out = append(out, erpPartnerRow{
+			PartnerID: b.id, PartnerType: partnerType, PartnerName: strings.TrimSpace(b.name),
+			ContactPerson: b.contact, ContactPhone: b.phone, Level: b.level,
+			PaymentDays: b.payDays, CreditLimit: b.credit,
+			OpenAmount: round2f(open[b.id]),
+		})
+	}
+	return out, total, 200, ""
+}
+
+// erpPartnerDetailCore 客商详情（按 partner_type 回原始档案，字段与 Web 端一致）。
+func erpPartnerDetailCore(a erpActor, partnerType string, id uint64) (interface{}, int, string) {
+	if id == 0 {
+		return nil, 400, "无效的ID"
+	}
+	if partnerType == "supplier" {
+		var s models.TenantCrmSupplier
+		if err := models.Orm.QueryTable(new(models.TenantCrmSupplier)).
+			Filter("id", id).Filter("tenant_id", a.Tid).
+			Filter("delete_time__isnull", true).One(&s); err != nil {
+			return nil, 404, "供应商未找到"
+		}
+		return s, 200, ""
+	}
+	var c models.TenantCrmCustomer
+	if err := models.Orm.QueryTable(new(models.TenantCrmCustomer)).
+		Filter("id", id).Filter("tenant_id", a.Tid).
+		Filter("delete_time__isnull", true).One(&c); err != nil {
+		return nil, 404, "客户未找到"
+	}
+	return c, 200, ""
+}
diff --git a/go/controllers/erp_document_core.go b/go/controllers/erp_document_core.go
new file mode 100644
index 0000000..0672163
--- /dev/null
+++ b/go/controllers/erp_document_core.go
@@ -0,0 +1,652 @@
+package controllers
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/jwtutil"
+	approvalEngine "server/services/approval"
+	erp "server/services/erp"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// ERP 单据核心逻辑（两端共用）。
+//
+// 按项目的接口隔离约定，/backend/erp/document* 与 /api/erp/document* 必须各有独立的
+// handler 与路由，但单据的校验、明细装配、落库事务与审批提交口径只能有一份实现：
+// 这里就是那一份。两端 handler 只负责「解析自己的令牌 → 组装 erpActor → 调核心 →
+// 按各自的响应信封输出」，业务规则不在两端各写一遍，避免移动端口径慢慢跑偏。
+//
+// 返回约定沿用 reimburse*Core：最后一个 string 为空即成功，非空时给出处置状态码与文案，
+// 由调用方原样透出，保证抽取前后接口行为完全一致。
+
+// erpActor ERP 操作人：由各自端的 JWT 解析而来，核心层只认这个结构，不认 beego 上下文
+type erpActor struct {
+	Tid    string // 租户ID字符串口径（ERP 表的 tenant_id 是 VARCHAR）
+	TidNum uint64
+	UID    uint64
+	Name   string
+}
+
+func erpNewActor(claims *jwtutil.Claims) erpActor {
+	return erpActor{
+		Tid:    fmt.Sprintf("%d", claims.TenantId),
+		TidNum: uint64(claims.TenantId),
+		UID:    uint64(claims.UserID),
+		Name:   resolveUserName(claims),
+	}
+}
+
+// erpDocFilter 单据列表筛选条件（与 Web 端查询参数一一对应）
+type erpDocFilter struct {
+	DocType     string
+	DocTypes    string // 逗号分隔的多类型
+	Status      string
+	Keyword     string
+	PartnerID   uint64
+	WarehouseID uint64
+	SourceDocID uint64
+	DateFrom    string
+	DateTo      string
+}
+
+// erpDocListCore 单据分页查询
+func erpDocListCore(a erpActor, f erpDocFilter, page, pageSize int) ([]models.ErpDocument, int64, int, string) {
+	if f.DocType != "" && !erpDocTypes[f.DocType] {
+		return nil, 0, 400, "未知的单据类型"
+	}
+	qs := models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("tenant_id", a.Tid).Filter("delete_time__isnull", true)
+	if f.DocType != "" {
+		qs = qs.Filter("doc_type", f.DocType)
+	}
+	if types := strings.TrimSpace(f.DocTypes); types != "" {
+		list := make([]string, 0, 4)
+		for _, t := range strings.Split(types, ",") {
+			if erpDocTypes[strings.TrimSpace(t)] {
+				list = append(list, strings.TrimSpace(t))
+			}
+		}
+		if len(list) > 0 {
+			qs = qs.Filter("doc_type__in", list)
+		}
+	}
+	if st := strings.TrimSpace(f.Status); st != "" {
+		qs = qs.Filter("status", st)
+	}
+	if kw := strings.TrimSpace(f.Keyword); kw != "" {
+		cond := orm.NewCondition().
+			Or("doc_no__contains", kw).
+			Or("partner_name__contains", kw).
+			Or("remark__contains", kw)
+		qs = qs.SetCond(qs.GetCond().AndCond(cond))
+	}
+	if f.PartnerID > 0 {
+		qs = qs.Filter("partner_id", f.PartnerID)
+	}
+	if f.WarehouseID > 0 {
+		qs = qs.Filter("warehouse_id", f.WarehouseID)
+	}
+	if f.SourceDocID > 0 {
+		qs = qs.Filter("source_doc_id", f.SourceDocID)
+	}
+	for _, d := range []struct {
+		raw  string
+		cond string
+	}{{f.DateFrom, "biz_date__gte"}, {f.DateTo, "biz_date__lte"}} {
+		if strings.TrimSpace(d.raw) == "" {
+			continue
+		}
+		if t, e := time.ParseInLocation("2006-01-02", strings.TrimSpace(d.raw), time.Local); e == nil {
+			qs = qs.Filter(d.cond, t)
+		}
+	}
+
+	total, _ := qs.Count()
+	var list []models.ErpDocument
+	if _, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&list); err != nil {
+		return nil, 0, 500, "查询失败: " + err.Error()
+	}
+	erpFillDocNames(list)
+	for i := range list {
+		list[i].StatusLabel = models.ErpDocStatusLabel(list[i].Status)
+	}
+	return list, total, 200, ""
+}
+
+// erpDocDetailCore 单据详情（含明细、库存快照与审批实例摘要）
+func erpDocDetailCore(a erpActor, id uint64) (*models.ErpDocument, int, string) {
+	if id == 0 {
+		return nil, 400, "无效的ID"
+	}
+	doc, err := erpLoadDoc(id, a.Tid)
+	if err != nil {
+		return nil, 404, "单据未找到"
+	}
+	doc.Items = erpDocItems(models.Orm, id)
+	erpFillItemStock(a.Tid, doc.Items, doc.WarehouseID)
+	single := []models.ErpDocument{*doc}
+	erpFillDocNames(single)
+	single[0].StatusLabel = models.ErpDocStatusLabel(single[0].Status)
+	if doc.InstanceID > 0 {
+		single[0].Instance = approvalEngine.InstanceBrief(doc.InstanceID)
+	}
+	return &single[0], 200, ""
+}
+
+// erpValidateDocHead 校验表头：仓库归属、往来单位匹配、调拨/盘点的仓库约束
+func erpValidateDocHead(tid string, p *erpDocPayload) string {
+	needWh := models.ErpDocAffectsStock(p.DocType)
+	if needWh && p.WarehouseID == 0 && p.DocType != models.ErpDocStockTake {
+		return "请选择仓库"
+	}
+	if p.WarehouseID > 0 && !erpWarehouseOwned(tid, p.WarehouseID) {
+		return "仓库不存在或不属于当前租户"
+	}
+	if p.DocType == models.ErpDocTransfer {
+		if p.ToWarehouseID == 0 {
+			return "请选择调入仓库"
+		}
+		if p.ToWarehouseID == p.WarehouseID {
+			return "调入仓库不能与调出仓库相同"
+		}
+		if !erpWarehouseOwned(tid, p.ToWarehouseID) {
+			return "调入仓库不存在或不属于当前租户"
+		}
+	}
+	if pt := docTypePartner(p.DocType); pt != "" {
+		if p.PartnerID == 0 {
+			return "请选择" + erpPartnerLabel(pt)
+		}
+	}
+	if p.SourceDocID > 0 {
+		src, e := erpLoadDoc(p.SourceDocID, tid)
+		if e != nil {
+			return "来源单据不存在"
+		}
+		wants := docTypeSources(p.DocType)
+		if len(wants) > 0 {
+			allowed := false
+			labels := make([]string, 0, len(wants))
+			for _, w := range wants {
+				labels = append(labels, docTypeLabelOf(w))
+				if src.DocType == w {
+					allowed = true
+				}
+			}
+			if !allowed {
+				return "来源单据类型应为" + strings.Join(labels, "或")
+			}
+			if src.Status != models.ErpDocStatusApproved {
+				return "来源单据「" + src.DocNo + "」尚未生效，不能引用"
+			}
+		}
+	}
+	if p.DiscountAmount < 0 {
+		return "优惠金额不能为负"
+	}
+	return ""
+}
+
+// refItemIDs 收集明细行引用的来源单据行ID
+func refItemIDs(raw []erpDocItemPayload) []uint64 {
+	out := make([]uint64, 0, len(raw))
+	for _, r := range raw {
+		if r.RefItemID > 0 {
+			out = append(out, r.RefItemID)
+		}
+	}
+	return out
+}
+
+// erpBuildItems 明细行规范化：补商品快照/单价（价格体系）、算金额、校验限价与批次
+func erpBuildItems(tid string, doc *models.ErpDocument, raw []erpDocItemPayload) ([]models.ErpDocumentItem, string) {
+	ids := make([]uint64, 0, len(raw))
+	for _, r := range raw {
+		if r.ProductID > 0 {
+			ids = append(ids, r.ProductID)
+		}
+	}
+	pmap := erpProductMap(tid, ids)
+	// 来源订单明细行归属：草稿覆盖保存会重建明细（行 ID 变化），前端若仍拿着旧行 ID，
+	// 不在开单时就拦下，脏引用要拖到审核生效才报错，移动端更难定位。
+	refOwner := map[uint64]uint64{}
+	if refIDs := refItemIDs(raw); len(refIDs) > 0 {
+		var refs []models.ErpDocumentItem
+		_, _ = models.Orm.QueryTable(new(models.ErpDocumentItem)).
+			Filter("id__in", refIDs).Filter("tenant_id", tid).All(&refs, "id", "doc_id")
+		for _, r := range refs {
+			refOwner[r.ID] = r.DocID
+		}
+	}
+	settings := erp.GetSettings(tid)
+	out := make([]models.ErpDocumentItem, 0, len(raw))
+	for i, r := range raw {
+		p, okm := pmap[r.ProductID]
+		if !okm {
+			return nil, fmt.Sprintf("第%d行商品不存在", i+1)
+		}
+		if p.IsDraft == 1 || p.Status != 1 {
+			return nil, fmt.Sprintf("商品「%s」未启用，不能开单", p.ProductName)
+		}
+		if r.Quantity <= 0 {
+			return nil, fmt.Sprintf("商品「%s」数量必须大于0", p.ProductName)
+		}
+		unitPrice := r.UnitPrice
+		if unitPrice <= 0 {
+			unitPrice = erpPickPrice(p, doc.DocType, settings.SalesPriceType)
+		}
+		// 限价控制：低于最低售价直接拦截（除管理员放行的场景，这里不做例外）
+		if strings.HasPrefix(doc.DocType, "sales") && p.MinPrice > 0 && unitPrice < p.MinPrice-0.005 {
+			return nil, fmt.Sprintf("商品「%s」售价 %.2f 低于最低售价 %.2f", p.ProductName, unitPrice, p.MinPrice)
+		}
+		if doc.DocType == models.ErpDocPurchaseOrder || doc.DocType == models.ErpDocPurchaseIn {
+			if p.EnableBatch == 1 && strings.TrimSpace(r.BatchNo) == "" && doc.DocType == models.ErpDocPurchaseIn {
+				return nil, fmt.Sprintf("商品「%s」启用批次管理，请填写批次号", p.ProductName)
+			}
+		}
+		unit := strings.TrimSpace(r.Unit)
+		if unit == "" {
+			unit = p.BaseUnit
+		}
+		amount := r.Amount
+		if amount <= 0 {
+			amount = round2f(r.Quantity * unitPrice)
+		}
+		wh := r.WarehouseID
+		if wh > 0 && !erpWarehouseOwned(tid, wh) {
+			return nil, fmt.Sprintf("第%d行仓库无效", i+1)
+		}
+		if r.RefItemID > 0 && refOwner[r.RefItemID] != doc.SourceDocID {
+			return nil, fmt.Sprintf("第%d行关联的来源单据明细已失效，请重新选择来源单据", i+1)
+		}
+		it := models.ErpDocumentItem{
+			ProductID: p.ID, ProductName: p.ProductName, Spec: p.Spec, Unit: unit,
+			WarehouseID: wh, BatchNo: strings.TrimSpace(r.BatchNo),
+			Quantity: round4f(r.Quantity), BookQty: round4f(r.BookQty),
+			RefItemID: r.RefItemID, UnitPrice: unitPrice, Amount: round2f(amount),
+			Remark: r.Remark, SortOrder: r.SortOrder,
+		}
+		if it.SortOrder == 0 {
+			it.SortOrder = i + 1
+		}
+		if r.ProductionDate != "" {
+			if t, e := time.ParseInLocation("2006-01-02", r.ProductionDate, time.Local); e == nil {
+				it.ProductionDate = &t
+				if p.ShelfLifeDays > 0 {
+					ed := t.AddDate(0, 0, p.ShelfLifeDays)
+					it.ExpireDate = &ed
+				}
+			}
+		}
+		if r.ExpireDate != "" {
+			if t, e := time.ParseInLocation("2006-01-02", r.ExpireDate, time.Local); e == nil {
+				it.ExpireDate = &t
+			}
+		}
+		// 盘点行未带账面数时按当前结存补齐
+		if doc.DocType == models.ErpDocStockTake && it.BookQty == 0 && it.WarehouseID == 0 {
+			it.BookQty = erpStockQty(tid, p.ID, doc.WarehouseID, it.BatchNo)
+			if it.UnitPrice == 0 {
+				it.UnitPrice = erpStockCost(tid, p.ID, doc.WarehouseID, it.BatchNo)
+			}
+		}
+		if msg := erpLinePreCheck(tid, doc, settings, &it); msg != "" {
+			return nil, msg
+		}
+		out = append(out, it)
+	}
+	return out, ""
+}
+
+// erpDocSaveCore 新建或覆盖保存草稿（payload 带 id 即为编辑）。已生效/审批中的单据不允许改动。
+func erpDocSaveCore(a erpActor, p erpDocPayload) (uint64, string, int, string) {
+	tid := a.Tid
+	if !erpDocTypes[p.DocType] {
+		return 0, "", 400, "未知的单据类型"
+	}
+	if len(p.Items) == 0 {
+		return 0, "", 400, "请至少添加一行明细"
+	}
+	if errMsg := erpValidateDocHead(tid, &p); errMsg != "" {
+		return 0, "", 400, errMsg
+	}
+
+	doc := &models.ErpDocument{TenantID: tid}
+	if p.ID > 0 {
+		exist, e := erpLoadDoc(p.ID, tid)
+		if e != nil {
+			return 0, "", 404, "单据未找到"
+		}
+		if exist.Status == models.ErpDocStatusApproved || exist.Status == models.ErpDocStatusPending {
+			return 0, "", 400, "审批中或已生效的单据不可编辑，请先撤回或作废"
+		}
+		if exist.Status == models.ErpDocStatusCancelled {
+			return 0, "", 400, "已作废单据不可编辑"
+		}
+		doc = exist
+	}
+	if doc.DocNo == "" {
+		no, e := erp.GenerateDocNo(nil, tid, p.DocType)
+		if e != nil {
+			return 0, "", 500, e.Error()
+		}
+		doc.DocNo = no
+	}
+	bizDate := time.Now()
+	if p.BizDate != "" {
+		if t, e := time.ParseInLocation("2006-01-02", p.BizDate, time.Local); e == nil {
+			bizDate = t
+		}
+	}
+	doc.DocType = p.DocType
+	doc.BizDate = bizDate
+	doc.WarehouseID = p.WarehouseID
+	doc.ToWarehouseID = p.ToWarehouseID
+	doc.SourceDocID = p.SourceDocID
+	doc.DiscountAmount = p.DiscountAmount
+	doc.Remark = p.Remark
+	doc.Status = models.ErpDocStatusDraft
+	if pt := docTypePartner(p.DocType); pt != "" {
+		doc.PartnerType = pt
+		doc.PartnerID = p.PartnerID
+		doc.PartnerName = erpPartnerName(pt, p.PartnerID)
+		if doc.PartnerName == "" {
+			return 0, "", 400, erpPartnerLabel(pt) + "未选择或不存在"
+		}
+	} else {
+		doc.PartnerType, doc.PartnerID, doc.PartnerName = "", 0, ""
+	}
+	if doc.CreateUserID == "" {
+		doc.CreateUserID = fmt.Sprintf("%d", a.UID)
+		doc.CreateUserName = a.Name
+	}
+
+	items, errMsg := erpBuildItems(tid, doc, p.Items)
+	if errMsg != "" {
+		return 0, "", 400, errMsg
+	}
+	doc.TotalQty = 0
+	doc.TotalAmount = 0
+	for _, it := range items {
+		doc.TotalQty += it.Quantity
+		doc.TotalAmount += it.Amount
+	}
+	doc.TotalQty = round4f(doc.TotalQty)
+	doc.TotalAmount = round2f(doc.TotalAmount)
+	doc.ActualAmount = round2f(doc.TotalAmount - doc.DiscountAmount)
+	if doc.ActualAmount < 0 {
+		return 0, "", 400, "优惠金额不能大于单据金额"
+	}
+
+	o := models.Orm
+	tx, err := o.Begin()
+	if err != nil {
+		return 0, "", 500, "保存失败"
+	}
+	rollback := true
+	defer func() { if rollback { _ = tx.Rollback() } }()
+
+	now := time.Now()
+	doc.UpdateTime = now
+	if doc.ID == 0 {
+		doc.CreateTime = now
+		id, e := tx.Insert(doc)
+		if e != nil {
+			return 0, "", 500, "保存失败: " + e.Error()
+		}
+		doc.ID = uint64(id)
+	} else {
+		if _, e := tx.QueryTable(new(models.ErpDocument)).Filter("id", doc.ID).
+			Update(orm.Params{
+				"doc_type": doc.DocType, "biz_date": doc.BizDate, "warehouse_id": doc.WarehouseID,
+				"to_warehouse_id": doc.ToWarehouseID, "partner_type": doc.PartnerType,
+				"partner_id": doc.PartnerID, "partner_name": doc.PartnerName,
+				"source_doc_id": doc.SourceDocID, "total_qty": doc.TotalQty,
+				"total_amount": doc.TotalAmount, "discount_amount": doc.DiscountAmount,
+				"actual_amount": doc.ActualAmount, "status": models.ErpDocStatusDraft,
+				"instance_id": 0, "remark": doc.Remark, "update_time": now,
+			}); e != nil {
+			return 0, "", 500, "保存失败: " + e.Error()
+		}
+		if _, e := tx.QueryTable(new(models.ErpDocumentItem)).Filter("doc_id", doc.ID).Delete(); e != nil {
+			return 0, "", 500, "保存失败: " + e.Error()
+		}
+	}
+	for i := range items {
+		items[i].DocID = doc.ID
+		items[i].TenantID = tid
+		items[i].ID = 0
+		if _, e := tx.Insert(&items[i]); e != nil {
+			return 0, "", 500, "保存明细失败: " + e.Error()
+		}
+	}
+	if err := tx.Commit(); err != nil {
+		return 0, "", 500, "保存失败: " + err.Error()
+	}
+	rollback = false
+	return doc.ID, doc.DocNo, 200, ""
+}
+
+// erpDocDeleteCore 删除单据（软删主表、硬删明细），仅草稿/驳回可删
+func erpDocDeleteCore(a erpActor, id uint64) (int, string) {
+	doc, errMsg := erpLoadEditable(id, a.Tid, []int8{models.ErpDocStatusDraft, models.ErpDocStatusRejected})
+	if errMsg != "" {
+		return 400, errMsg
+	}
+	now := time.Now()
+	tx, err := models.Orm.Begin()
+	if err != nil {
+		return 500, "删除失败"
+	}
+	rollback := true
+	defer func() { if rollback { _ = tx.Rollback() } }()
+	if _, err = tx.QueryTable(new(models.ErpDocument)).Filter("id", doc.ID).
+		Update(orm.Params{"delete_time": now, "update_time": now}); err != nil {
+		return 500, "删除失败: " + err.Error()
+	}
+	// 明细随主表硬删：主表只软删，历史仍可追溯；明细无独立查询价值
+	if _, err = tx.QueryTable(new(models.ErpDocumentItem)).Filter("doc_id", doc.ID).Delete(); err != nil {
+		return 500, "删除失败: " + err.Error()
+	}
+	if err = tx.Commit(); err != nil {
+		return 500, "删除失败"
+	}
+	rollback = false
+	return 200, ""
+}
+
+// erpDocCancelCore 作废：草稿/驳回/审批中均可作废；已生效单据不做反向单据，直接拒绝，
+// 保证「已生效=流水已入账」这一不可篡改前提。
+func erpDocCancelCore(a erpActor, id uint64) (int, string) {
+	doc, errMsg := erpLoadEditable(id, a.Tid, []int8{
+		models.ErpDocStatusDraft, models.ErpDocStatusRejected, models.ErpDocStatusPending,
+	})
+	if errMsg != "" {
+		return 400, errMsg
+	}
+	now := time.Now()
+	params := orm.Params{"status": models.ErpDocStatusCancelled, "instance_id": 0, "update_time": now}
+	if _, err := models.Orm.QueryTable(new(models.ErpDocument)).Filter("id", doc.ID).Update(params); err != nil {
+		return 500, "作废失败: " + err.Error()
+	}
+	if doc.InstanceID > 0 {
+		approvalEngine.CancelInstance(doc.InstanceID, "单据已作废")
+	}
+	return 200, ""
+}
+
+// erpDocApproveCore 直接审核生效（未走审批流时使用）。库存/往来账效果在同一事务内落地。
+func erpDocApproveCore(a erpActor, id uint64) (int, string) {
+	if id == 0 {
+		return 400, "无效的ID"
+	}
+	if err := erp.ApproveDocument(id, a.Tid, fmt.Sprintf("%d", a.UID), a.Name); err != nil {
+		return 400, err.Error()
+	}
+	return 200, ""
+}
+
+// erpDocSubmitCore 提交审批：flowID 为 0 时按单据类型自动选流。
+// 流程未配置人工节点时引擎会直接结束实例，此时同步单据终态。
+func erpDocSubmitCore(a erpActor, id, flowID uint64) (uint64, int, string) {
+	if id == 0 {
+		return 0, 400, "无效的ID"
+	}
+	doc, errMsg := erpLoadEditable(id, a.Tid, []int8{models.ErpDocStatusDraft, models.ErpDocStatusRejected})
+	if errMsg != "" {
+		return 0, 400, errMsg
+	}
+	if len(erpDocItems(models.Orm, doc.ID)) == 0 {
+		return 0, 400, "单据没有明细行，无法提交"
+	}
+	bizType := models.ErpDocApprovalBizType(doc.DocType)
+	deptID := erpUserOrgID(a.TidNum, a.UID)
+	if flowID == 0 {
+		flowID = erpPickFlowID(a.TidNum, deptID, bizType)
+	}
+	if flowID == 0 {
+		return 0, 400, "该单据类型尚未配置审批流程，可直接审核或到「审批流配置」中新增"
+	}
+	instID, err := approvalEngine.Submit(approvalEngine.SubmitInput{
+		Scope:      models.ApprovalScopeTenant,
+		Tid:        a.TidNum,
+		FlowID:     flowID,
+		BizType:    bizType,
+		BizID:      doc.ID,
+		BizTitle:   fmt.Sprintf("[%s] %s %s", docTypeLabelOf(doc.DocType), doc.DocNo, doc.PartnerName),
+		SubmitUID:  a.UID,
+		SubmitName: a.Name,
+		DeptID:     deptID,
+		FormData: map[string]interface{}{
+			"doc_type":      doc.DocType,
+			"doc_no":        doc.DocNo,
+			"total_amount":  doc.TotalAmount,
+			"actual_amount": doc.ActualAmount,
+			"total_qty":     doc.TotalQty,
+			"warehouse_id":  doc.WarehouseID,
+			"partner_id":    doc.PartnerID,
+			"partner_type":  doc.PartnerType,
+		},
+	})
+	if err != nil {
+		return 0, 400, err.Error()
+	}
+	now := time.Now()
+	if _, err := models.Orm.QueryTable(new(models.ErpDocument)).Filter("id", doc.ID).
+		Update(orm.Params{"status": models.ErpDocStatusPending, "instance_id": instID, "update_time": now}); err != nil {
+		return 0, 500, "提交失败: " + err.Error()
+	}
+	approvalEngine.SyncBizResult(instID, approvalEngine.InstanceStatusOf(instID))
+	return instID, 200, ""
+}
+
+type erpFlowRow struct {
+	FlowID   uint64 `json:"flow_id"`
+	FlowCode string `json:"flow_code"`
+	FlowName string `json:"flow_name"`
+	BizType  string `json:"biz_type"`
+}
+
+// erpDocFlowsCore 该单据类型可用的审批流（先精确匹配 erp_xxx，再回落到模块级 erp）
+func erpDocFlowsCore(a erpActor, docType string) (string, []erpFlowRow, int, string) {
+	if !erpDocTypes[docType] {
+		return "", nil, 400, "未知的单据类型"
+	}
+	bizType := models.ErpDocApprovalBizType(docType)
+	deptID := erpUserOrgID(a.TidNum, a.UID)
+	flows, err := approvalEngine.ListAvailableFlows(models.ApprovalScopeTenant, a.TidNum, bizType, deptID)
+	if err != nil {
+		return bizType, nil, 500, err.Error()
+	}
+	if len(flows) == 0 {
+		flows, _ = approvalEngine.ListAvailableFlows(models.ApprovalScopeTenant, a.TidNum, "erp", deptID)
+	}
+	out := make([]erpFlowRow, 0, len(flows))
+	for _, f := range flows {
+		out = append(out, erpFlowRow{f.FlowID, f.FlowCode, f.FlowName, f.BizType})
+	}
+	return bizType, out, 200, ""
+}
+
+// erpDocExecutableCore 取来源订单中尚可执行的明细行（入库/出库/退货按行带出，避免超收超发）
+func erpDocExecutableCore(a erpActor, id uint64) (map[string]interface{}, int, string) {
+	doc, e := erpLoadDoc(id, a.Tid)
+	if e != nil {
+		return nil, 404, "单据未找到"
+	}
+	isReturn := doc.DocType == models.ErpDocPurchaseReturn || doc.DocType == models.ErpDocSalesReturn
+	items := erpDocItems(models.Orm, doc.ID)
+	out := make([]map[string]interface{}, 0, len(items))
+	for _, it := range items {
+		basis := it.Quantity
+		used := it.ExecutedQty
+		if isReturn {
+			used = erpReturnedQty(a.Tid, it.ID, 0)
+		}
+		remain := basis - used
+		if remain < -0.000001 {
+			remain = 0
+		}
+		out = append(out, map[string]interface{}{
+			"item_id": it.ID, "product_id": it.ProductID, "product_name": it.ProductName,
+			"spec": it.Spec, "unit": it.Unit, "batch_no": it.BatchNo,
+			"quantity": it.Quantity, "unit_price": it.UnitPrice, "amount": it.Amount,
+			"executed_qty": round4f(used), "remain_qty": round4f(remain),
+		})
+	}
+	return map[string]interface{}{"doc": doc, "items": out}, 200, ""
+}
+
+// erpTakeSheetCore 盘点表初始化：带出当前账面数量与加权成本，盘点员只改实盘数
+func erpTakeSheetCore(a erpActor, warehouseID uint64) ([]map[string]interface{}, int, string) {
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", a.Tid).Filter("warehouse_id", warehouseID).
+		OrderBy("product_id", "batch_no").All(&stocks)
+	ids := make([]uint64, 0, len(stocks))
+	for _, s := range stocks {
+		ids = append(ids, s.ProductID)
+	}
+	pmap := erpProductMap(a.Tid, ids)
+	out := make([]map[string]interface{}, 0, len(stocks))
+	for _, s := range stocks {
+		p := pmap[s.ProductID]
+		out = append(out, map[string]interface{}{
+			"product_id": s.ProductID, "product_name": p.ProductName, "product_code": p.ProductCode,
+			"spec": p.Spec, "unit": p.BaseUnit, "batch_no": s.BatchNo,
+			"book_qty": s.Quantity, "cost_price": s.CostPrice,
+		})
+	}
+	return out, 200, ""
+}
+
+// erpDocMetaDict 开单页所需字典与默认值（两端共用同一份口径）
+func erpDocMetaDict(a erpActor) map[string]interface{} {
+	s := erp.GetSettings(a.Tid)
+	types := make([]map[string]interface{}, 0, len(models.ErpDocTypeLabel))
+	for _, k := range []string{
+		models.ErpDocPurchaseOrder, models.ErpDocPurchaseIn, models.ErpDocPurchaseReturn,
+		models.ErpDocSalesOrder, models.ErpDocSalesOut, models.ErpDocSalesReturn,
+		models.ErpDocOtherIn, models.ErpDocOtherOut, models.ErpDocTransfer, models.ErpDocStockTake,
+	} {
+		types = append(types, map[string]interface{}{
+			"value": k, "label": models.ErpDocTypeLabel[k],
+			"affects_stock": models.ErpDocAffectsStock(k),
+			"partner_type":  docTypePartner(k),
+		})
+	}
+	return map[string]interface{}{
+		"doc_types": types,
+		"statuses": []map[string]interface{}{
+			{"value": 0, "label": "草稿"}, {"value": 1, "label": "审批中"},
+			{"value": 2, "label": "已生效"}, {"value": 3, "label": "已驳回"}, {"value": 4, "label": "已作废"},
+		},
+		"default_warehouse_id": s.DefaultWarehouseID,
+		"sales_price_type":     s.SalesPriceType,
+		"negative_stock":       s.NegativeAllowed,
+	}
+}
diff --git a/go/controllers/erp_finance_core.go b/go/controllers/erp_finance_core.go
new file mode 100644
index 0000000..eb0d621
--- /dev/null
+++ b/go/controllers/erp_finance_core.go
@@ -0,0 +1,529 @@
+package controllers
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+	"time"
+
+	"server/models"
+	erp "server/services/erp"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// ERP 往来账/收付款核心（两端共用）：/backend/erp/finance* 与 /api/erp/finance* 都调这里，
+// 未收未付、账龄、核销余额等口径只算一次，手机端不会看到与 Web 端不一致的应收应付。
+
+// erpBillFilter 往来账查询条件
+type erpBillFilter struct {
+	BillType    string
+	PartnerID   uint64
+	PartnerType string
+	SourceDocID uint64
+	SettleState string // open|part|done
+	Keyword     string
+	DateFrom    string
+	DateTo      string
+}
+
+// erpBillListCore 往来账列表 + 未结余额合计
+func erpBillListCore(a erpActor, f erpBillFilter, page, pageSize int) ([]map[string]interface{}, int64, map[string]float64, int, string) {
+	qs := models.Orm.QueryTable(new(models.ErpPartnerBill)).Filter("tenant_id", a.Tid)
+	if f.BillType != "" {
+		qs = qs.Filter("bill_type", f.BillType)
+	}
+	if f.PartnerID > 0 {
+		qs = qs.Filter("partner_id", f.PartnerID)
+	}
+	if f.PartnerType != "" {
+		qs = qs.Filter("partner_type", f.PartnerType)
+	}
+	if f.SourceDocID > 0 {
+		qs = qs.Filter("source_doc_id", f.SourceDocID)
+	}
+	switch f.SettleState {
+	case "open":
+		qs = qs.Filter("status__lt", 2)
+	case "part":
+		qs = qs.Filter("status", 1)
+	case "done":
+		qs = qs.Filter("status", 2)
+	}
+	if f.Keyword != "" {
+		cond := orm.NewCondition().
+			Or("partner_name__contains", f.Keyword).
+			Or("source_doc_no__contains", f.Keyword)
+		qs = qs.SetCond(qs.GetCond().AndCond(cond))
+	}
+	for _, d := range []struct {
+		raw  string
+		cond string
+	}{{f.DateFrom, "bill_date__gte"}, {f.DateTo, "bill_date__lte"}} {
+		if strings.TrimSpace(d.raw) == "" {
+			continue
+		}
+		if t, e := time.ParseInLocation("2006-01-02", strings.TrimSpace(d.raw), time.Local); e == nil {
+			qs = qs.Filter(d.cond, t)
+		}
+	}
+
+	total, _ := qs.Count()
+	var rows []models.ErpPartnerBill
+	if _, err := qs.OrderBy("-bill_date", "-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
+		return nil, 0, nil, 500, "查询失败: " + err.Error()
+	}
+	// 摘要区合计：未收/未付总额与本页余额
+	var openRecv, openPay float64
+	var allRows []models.ErpPartnerBill
+	_, _ = models.Orm.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", a.Tid).Filter("status__lt", 2).
+		All(&allRows, "bill_type", "amount", "settled_amount")
+	for _, b := range allRows {
+		bal := b.Amount - b.SettledAmount
+		if b.BillType == models.ErpBillReceivable {
+			openRecv += bal
+		} else {
+			openPay += bal
+		}
+	}
+	out := make([]map[string]interface{}, 0, len(rows))
+	now := time.Now()
+	for _, b := range rows {
+		bal := round2f(b.Amount - b.SettledAmount)
+		overdue := 0
+		if b.DueDate != nil && b.Status < 2 {
+			d := int(b.DueDate.Sub(now).Hours() / 24)
+			if d < 0 {
+				overdue = -d
+			}
+		}
+		out = append(out, map[string]interface{}{
+			"bill": b, "balance": bal, "overdue_days": overdue,
+			"status_label": erpBillStatusLabel(b.Status),
+		})
+	}
+	return out, total, map[string]float64{
+		"open_receivable": round2f(openRecv), "open_payable": round2f(openPay),
+	}, 200, ""
+}
+
+// erpBillDetailCore 往来账详情（含核销记录与原单据）
+func erpBillDetailCore(a erpActor, id uint64) (map[string]interface{}, int, string) {
+	if id == 0 {
+		return nil, 400, "无效的ID"
+	}
+	var bill models.ErpPartnerBill
+	if err := models.Orm.QueryTable(new(models.ErpPartnerBill)).
+		Filter("id", id).Filter("tenant_id", a.Tid).One(&bill); err != nil {
+		return nil, 404, "往来账未找到"
+	}
+	var settles []models.ErpFundSettle
+	_, _ = models.Orm.QueryTable(new(models.ErpFundSettle)).
+		Filter("tenant_id", a.Tid).Filter("partner_bill_id", id).OrderBy("-id").All(&settles)
+	fundIDs := make([]uint64, 0, len(settles))
+	for _, s := range settles {
+		fundIDs = append(fundIDs, s.FundBillID)
+	}
+	fundMap := map[uint64]models.ErpFundBill{}
+	if len(fundIDs) > 0 {
+		var funds []models.ErpFundBill
+		_, _ = models.Orm.QueryTable(new(models.ErpFundBill)).
+			Filter("id__in", fundIDs).All(&funds, "id", "fund_no", "fund_type", "biz_date", "pay_method")
+		for _, fn := range funds {
+			fundMap[fn.ID] = fn
+		}
+	}
+	items := erpDocItems(models.Orm, bill.SourceDocID)
+	return map[string]interface{}{
+		"bill":      bill,
+		"balance":   round2f(bill.Amount - bill.SettledAmount),
+		"settles":   settles,
+		"funds":     fundMap,
+		"doc_items": items,
+	}, 200, ""
+}
+
+// erpPartnerAging 单个往来单位的账龄分布
+type erpPartnerAging struct {
+	PartnerID   uint64             `json:"partner_id"`
+	PartnerName string             `json:"partner_name"`
+	BillType    int8               `json:"bill_type"`
+	Total       float64            `json:"total"`
+	Buckets     map[string]float64 `json:"buckets"`
+}
+
+// erpAgingCore 账龄分析（按未结余额分桶）
+func erpAgingCore(a erpActor) (map[string]interface{}, int, string) {
+	buckets := []struct {
+		Label string `json:"label"`
+		Min   int    `json:"min"`
+		Max   int    `json:"max"`
+	}{
+		{"未到期", -99999, 0}, {"1-30天", 1, 30}, {"31-60天", 31, 60},
+		{"61-90天", 61, 90}, {"90天以上", 91, 99999},
+	}
+	agg := map[string]*erpPartnerAging{}
+	var bills []models.ErpPartnerBill
+	_, _ = models.Orm.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", a.Tid).Filter("status__lt", 2).
+		All(&bills, "partner_id", "partner_name", "bill_type", "amount", "settled_amount", "due_date", "bill_date")
+	now := time.Now()
+	sum := map[string]map[string]float64{}
+	for _, b := range bills {
+		// 分组必须带上 bill_type：同一客商既挂应收又挂应付时，只按 partner 归并
+		// 会把两种账期混进行里，导致 list 合计与 summary（按单据类型分）对不上。
+		key := b.PartnerType + ":" + fmt.Sprintf("%d:%d", b.PartnerID, b.BillType)
+		pa := agg[key]
+		if pa == nil {
+			pa = &erpPartnerAging{
+				PartnerID: b.PartnerID, PartnerName: b.PartnerName, BillType: b.BillType,
+				Buckets: map[string]float64{},
+			}
+			agg[key] = pa
+		}
+		ref := b.DueDate
+		if ref == nil {
+			ref = &b.BillDate
+		}
+		days := int(now.Sub(*ref).Hours() / 24)
+		label := buckets[0].Label
+		for _, bk := range buckets {
+			if days >= bk.Min && days <= bk.Max {
+				label = bk.Label
+				break
+			}
+		}
+		bal := round2f(b.Amount - b.SettledAmount)
+		pa.Total = round2f(pa.Total + bal)
+		pa.Buckets[label] = round2f(pa.Buckets[label] + bal)
+		bt := "receivable"
+		if b.BillType == models.ErpBillPayable {
+			bt = "payable"
+		}
+		if sum[bt] == nil {
+			sum[bt] = map[string]float64{}
+		}
+		sum[bt][label] = round2f(sum[bt][label] + bal)
+	}
+	list := make([]*erpPartnerAging, 0, len(agg))
+	for _, pa := range agg {
+		list = append(list, pa)
+	}
+	return map[string]interface{}{"list": list, "summary": sum, "buckets": buckets}, 200, ""
+}
+
+// erpFundFilter 收付款单查询条件
+type erpFundFilter struct {
+	FundType  string
+	Status    string
+	PartnerID uint64
+	Keyword   string
+	DateFrom  string
+	DateTo    string
+}
+
+// erpFundListCore 收付款单列表
+func erpFundListCore(a erpActor, f erpFundFilter, page, pageSize int) ([]models.ErpFundBill, int64, int, string) {
+	qs := models.Orm.QueryTable(new(models.ErpFundBill)).
+		Filter("tenant_id", a.Tid).Filter("delete_time__isnull", true)
+	if f.FundType != "" {
+		qs = qs.Filter("fund_type", f.FundType)
+	}
+	if f.Status != "" {
+		qs = qs.Filter("status", f.Status)
+	}
+	if f.PartnerID > 0 {
+		qs = qs.Filter("partner_id", f.PartnerID)
+	}
+	if f.Keyword != "" {
+		cond := orm.NewCondition().
+			Or("fund_no__contains", f.Keyword).
+			Or("partner_name__contains", f.Keyword)
+		qs = qs.SetCond(qs.GetCond().AndCond(cond))
+	}
+	for _, d := range []struct {
+		raw  string
+		cond string
+	}{{f.DateFrom, "biz_date__gte"}, {f.DateTo, "biz_date__lte"}} {
+		if strings.TrimSpace(d.raw) == "" {
+			continue
+		}
+		if t, e := time.ParseInLocation("2006-01-02", strings.TrimSpace(d.raw), time.Local); e == nil {
+			qs = qs.Filter(d.cond, t)
+		}
+	}
+	total, _ := qs.Count()
+	var rows []models.ErpFundBill
+	if _, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
+		return nil, 0, 500, "查询失败: " + err.Error()
+	}
+	return rows, total, 200, ""
+}
+
+// erpFundDetailCore 收付款单详情（含核销明细与对应往来账）
+func erpFundDetailCore(a erpActor, id uint64) (map[string]interface{}, int, string) {
+	if id == 0 {
+		return nil, 400, "无效的ID"
+	}
+	var fund models.ErpFundBill
+	if err := models.Orm.QueryTable(new(models.ErpFundBill)).
+		Filter("id", id).Filter("tenant_id", a.Tid).
+		Filter("delete_time__isnull", true).One(&fund); err != nil {
+		return nil, 404, "收付款单未找到"
+	}
+	var settles []models.ErpFundSettle
+	_, _ = models.Orm.QueryTable(new(models.ErpFundSettle)).
+		Filter("fund_bill_id", id).OrderBy("id").All(&settles)
+	billIDs := make([]uint64, 0, len(settles))
+	for _, s := range settles {
+		billIDs = append(billIDs, s.PartnerBillID)
+	}
+	bills := []models.ErpPartnerBill{}
+	if len(billIDs) > 0 {
+		_, _ = models.Orm.QueryTable(new(models.ErpPartnerBill)).
+			Filter("id__in", billIDs).All(&bills)
+	}
+	fund.Settles = settles
+	return map[string]interface{}{"fund": fund, "bills": bills}, 200, ""
+}
+
+// erpFundSaveCore 新建/修改收付款草稿（草稿态才可改，确认后只能作废重开）
+func erpFundSaveCore(a erpActor, p erpFundPayload) (uint64, string, int, string) {
+	tid := a.Tid
+	if p.FundType < models.ErpFundReceive || p.FundType > models.ErpFundExpense {
+		return 0, "", 400, "收付款方式无效"
+	}
+	if p.Amount <= 0 {
+		return 0, "", 400, "金额必须大于0"
+	}
+	if (p.FundType == models.ErpFundReceive || p.FundType == models.ErpFundPay) && p.PartnerID == 0 {
+		return 0, "", 400, "收款/付款必须选择往来单位"
+	}
+	partnerType := ""
+	if p.FundType == models.ErpFundReceive {
+		partnerType = "customer"
+	} else if p.FundType == models.ErpFundPay {
+		partnerType = "supplier"
+	}
+	name := erpPartnerName(partnerType, p.PartnerID)
+	if p.PartnerID > 0 && name == "" {
+		return 0, "", 400, erpPartnerLabel(partnerType) + "不存在"
+	}
+	bizDate := time.Now()
+	if p.BizDate != "" {
+		if t, e := time.ParseInLocation("2006-01-02", p.BizDate, time.Local); e == nil {
+			bizDate = t
+		}
+	}
+	method := strings.TrimSpace(p.PayMethod)
+	if method == "" {
+		method = "cash"
+	}
+	now := time.Now()
+	if p.ID > 0 {
+		var fund models.ErpFundBill
+		if err := models.Orm.QueryTable(new(models.ErpFundBill)).
+			Filter("id", p.ID).Filter("tenant_id", tid).
+			Filter("delete_time__isnull", true).One(&fund); err != nil {
+			return 0, "", 404, "收付款单未找到"
+		}
+		if fund.Status != 0 {
+			return 0, "", 400, "已确认的收付款单不可修改"
+		}
+		if _, err := models.Orm.QueryTable(new(models.ErpFundBill)).Filter("id", p.ID).
+			Update(orm.Params{
+				"fund_type": p.FundType, "partner_type": partnerType, "partner_id": p.PartnerID,
+				"partner_name": name, "amount": p.Amount, "pay_method": method,
+				"pay_account": p.PayAccount, "biz_date": bizDate, "remark": p.Remark,
+				"update_time": now,
+			}); err != nil {
+			return 0, "", 500, "保存失败: " + err.Error()
+		}
+		return p.ID, fund.FundNo, 200, ""
+	}
+	no, e := erp.GenerateFundNo(tid, p.FundType)
+	if e != nil {
+		return 0, "", 500, e.Error()
+	}
+	fund := models.ErpFundBill{
+		TenantID: tid, FundNo: no, FundType: p.FundType,
+		PartnerType: partnerType, PartnerID: p.PartnerID, PartnerName: name,
+		Amount: p.Amount, PayMethod: method, PayAccount: p.PayAccount,
+		BizDate: bizDate, Status: 0, Remark: p.Remark,
+		CreateUserID: fmt.Sprintf("%d", a.UID), CreateUserName: a.Name,
+		CreateTime: now, UpdateTime: now,
+	}
+	id, err := models.Orm.Insert(&fund)
+	if err != nil {
+		return 0, "", 500, "创建失败: " + err.Error()
+	}
+	return uint64(id), no, 200, ""
+}
+
+// erpFundConfirmCore 确认收付款并核销；settles 为空时按到期日自动 FIFO
+func erpFundConfirmCore(a erpActor, id uint64, settles []erp.SettleItem) (int, string) {
+	if id == 0 {
+		return 400, "无效的ID"
+	}
+	if err := erp.ConfirmFundBill(id, a.Tid, settles, a.Name); err != nil {
+		return 400, err.Error()
+	}
+	return 200, ""
+}
+
+// erpFundVoidCore 作废收付款单（已核销的往来账余额同步回滚）
+func erpFundVoidCore(a erpActor, id uint64) (int, string) {
+	if id == 0 {
+		return 400, "无效的ID"
+	}
+	if err := erp.VoidFundBill(id, a.Tid); err != nil {
+		return 400, err.Error()
+	}
+	return 200, ""
+}
+
+// erpFundDeleteCore 删除收付款单，仅草稿可删
+func erpFundDeleteCore(a erpActor, id uint64) (int, string) {
+	if id == 0 {
+		return 400, "无效的ID"
+	}
+	var fund models.ErpFundBill
+	if err := models.Orm.QueryTable(new(models.ErpFundBill)).
+		Filter("id", id).Filter("tenant_id", a.Tid).
+		Filter("delete_time__isnull", true).One(&fund); err != nil {
+		return 404, "收付款单未找到"
+	}
+	if fund.Status != 0 {
+		return 400, "只有草稿状态的收付款单可以删除"
+	}
+	now := time.Now()
+	if _, err := models.Orm.QueryTable(new(models.ErpFundBill)).Filter("id", id).
+		Update(orm.Params{"delete_time": now, "update_time": now}); err != nil {
+		return 500, "删除失败: " + err.Error()
+	}
+	return 200, ""
+}
+
+// erpFundOpenBillsCore 收款/付款时可核销的往来账（前端据此勾选）
+func erpFundOpenBillsCore(a erpActor, fundType int8, partnerID uint64) ([]map[string]interface{}, int, string) {
+	billType := int8(models.ErpBillReceivable)
+	if fundType == 2 {
+		billType = models.ErpBillPayable
+	}
+	qs := models.Orm.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", a.Tid).Filter("bill_type", billType).
+		Filter("status__lt", 2).Filter("amount__gt", 0)
+	if partnerID > 0 {
+		qs = qs.Filter("partner_id", partnerID)
+	}
+	var rows []models.ErpPartnerBill
+	_, _ = qs.OrderBy("due_date", "bill_date", "id").Limit(200).All(&rows)
+	out := make([]map[string]interface{}, 0, len(rows))
+	for _, b := range rows {
+		out = append(out, map[string]interface{}{
+			"id": b.ID, "source_doc_no": b.SourceDocNo, "bill_date": b.BillDate,
+			"due_date": b.DueDate, "amount": b.Amount, "settled_amount": b.SettledAmount,
+			"balance": round2f(b.Amount - b.SettledAmount), "partner_name": b.PartnerName,
+		})
+	}
+	return out, 200, ""
+}
+
+// erpCashDayRow 按日汇总的资金流水
+type erpCashDayRow struct {
+	Date string  `json:"date"`
+	In   float64 `json:"in"`
+	Out  float64 `json:"out"`
+	Net  float64 `json:"net"`
+}
+
+// erpCashFlowCore 资金流水（只统计实际收付，不含单据生成的往来账）
+func erpCashFlowCore(a erpActor, from, to time.Time) (map[string]interface{}, int, string) {
+	var rows []models.ErpFundBill
+	_, _ = models.Orm.QueryTable(new(models.ErpFundBill)).
+		Filter("tenant_id", a.Tid).Filter("status", 1).
+		Filter("biz_date__gte", from).Filter("biz_date__lte", to).
+		OrderBy("biz_date", "id").All(&rows)
+
+	days := map[string]*erpCashDayRow{}
+	var totalIn, totalOut float64
+	for _, f := range rows {
+		d := f.BizDate.Format("2006-01-02")
+		if days[d] == nil {
+			days[d] = &erpCashDayRow{Date: d}
+		}
+		if f.FundType == models.ErpFundReceive || f.FundType == models.ErpFundOtherIn {
+			days[d].In = round2f(days[d].In + f.Amount)
+			totalIn += f.Amount
+		} else {
+			days[d].Out = round2f(days[d].Out + f.Amount)
+			totalOut += f.Amount
+		}
+	}
+	list := make([]*erpCashDayRow, 0, len(days))
+	keys := make([]string, 0, len(days))
+	for k := range days {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		r := days[k]
+		r.Net = round2f(r.In - r.Out)
+		list = append(list, r)
+	}
+	return map[string]interface{}{
+		"list": list, "total_in": round2f(totalIn), "total_out": round2f(totalOut),
+		"net": round2f(totalIn - totalOut),
+	}, 200, ""
+}
+
+// erpPartnerSumRow 往来单位对账汇总行
+type erpPartnerSumRow struct {
+	PartnerID    uint64  `json:"partner_id"`
+	PartnerType  string  `json:"partner_type"`
+	PartnerName  string  `json:"partner_name"`
+	RecvTotal    float64 `json:"recv_total"`
+	RecvOpen     float64 `json:"recv_open"`
+	PayTotal     float64 `json:"pay_total"`
+	PayOpen      float64 `json:"pay_open"`
+	LastBillDate string  `json:"last_bill_date"`
+}
+
+// erpPartnerSummaryCore 往来单位对账汇总（partnerType 为空=不限）
+func erpPartnerSummaryCore(a erpActor, partnerType string) (map[string]interface{}, int, string) {
+	var bills []models.ErpPartnerBill
+	_, _ = models.Orm.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", a.Tid).All(&bills)
+	m := map[string]*erpPartnerSumRow{}
+	for _, b := range bills {
+		k := b.PartnerType + ":" + fmt.Sprintf("%d", b.PartnerID)
+		r := m[k]
+		if r == nil {
+			r = &erpPartnerSumRow{PartnerID: b.PartnerID, PartnerType: b.PartnerType, PartnerName: b.PartnerName}
+			m[k] = r
+		}
+		if b.BillDate.Format("2006-01-02") > r.LastBillDate {
+			r.LastBillDate = b.BillDate.Format("2006-01-02")
+		}
+		if b.BillType == models.ErpBillReceivable {
+			r.RecvTotal = round2f(r.RecvTotal + b.Amount)
+			if b.Status < 2 {
+				r.RecvOpen = round2f(r.RecvOpen + b.Amount - b.SettledAmount)
+			}
+		} else {
+			r.PayTotal = round2f(r.PayTotal + b.Amount)
+			if b.Status < 2 {
+				r.PayOpen = round2f(r.PayOpen + b.Amount - b.SettledAmount)
+			}
+		}
+	}
+	list := make([]*erpPartnerSumRow, 0, len(m))
+	for _, r := range m {
+		if partnerType != "" && r.PartnerType != partnerType {
+			continue
+		}
+		list = append(list, r)
+	}
+	return map[string]interface{}{"list": list}, 200, ""
+}
diff --git a/go/controllers/erp_report_core.go b/go/controllers/erp_report_core.go
new file mode 100644
index 0000000..94382b4
--- /dev/null
+++ b/go/controllers/erp_report_core.go
@@ -0,0 +1,568 @@
+package controllers
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+	"time"
+
+	"server/models"
+)
+
+// ERP 报表/看板核心（两端共用）：统计口径只认「已生效」单据与库存流水，
+// 草稿/审批中/作废一律不参与，这样 Web 端与手机端看到的金额、毛利、库存预警数完全一致。
+
+// erpReportDimension 归一购销汇总维度：只认 product|supplier|customer|month，
+// 其它一律回落到商品，出参的 dimension 字段即后端真实使用的分组。
+func erpReportDimension(raw string) string {
+	switch g := strings.TrimSpace(raw); g {
+	case "supplier", "customer", "month":
+		return g
+	default:
+		return "product"
+	}
+}
+
+// erpWarningCounts 库存预警各类计数（看板角标用，不含明细）
+func erpWarningCounts(tid string) map[string]int {
+	var products []models.ErpProduct
+	_, _ = models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", tid).Filter("status", 1).Filter("is_draft", 0).
+		Filter("delete_time__isnull", true).All(&products, "id", "safety_qty", "max_qty")
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).Filter("tenant_id", tid).
+		All(&stocks, "product_id", "quantity")
+	qtyMap := map[uint64]float64{}
+	for _, s := range stocks {
+		qtyMap[s.ProductID] += s.Quantity
+	}
+	low, over, out := 0, 0, 0
+	for _, p := range products {
+		q := qtyMap[p.ID]
+		if p.SafetyQty > 0 && q < p.SafetyQty {
+			low++
+			if q <= 0.000001 {
+				out++
+			}
+		}
+		if p.MaxQty > 0 && q > p.MaxQty {
+			over++
+		}
+	}
+	return map[string]int{"low": low, "over": over, "out": out, "expiring": len(erpExpiringBatches(tid, 30))}
+}
+
+// erpDocAmount 区间内已生效单据的金额合计与单数
+func erpDocAmount(tid string, docTypes []string, from, to time.Time) (float64, int64) {
+	ids := erpApprovedDocIDs(tid, docTypes, from, to, 0)
+	if len(ids) == 0 {
+		return 0, 0
+	}
+	var docs []models.ErpDocument
+	_, _ = models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("id__in", ids).All(&docs, "id", "actual_amount")
+	var sum float64
+	for _, d := range docs {
+		sum += d.ActualAmount
+	}
+	return round2f(sum), int64(len(docs))
+}
+
+// erpDashboardTrend 近 6 个月采购/销售趋势
+type erpDashboardTrend struct {
+	Month string  `json:"month"`
+	Buy   float64 `json:"buy"`
+	Sale  float64 `json:"sale"`
+}
+
+// erpDashboardCore 经营看板：本月购销/毛利、今日销售、库存价值、往来余额、待办、趋势、预警
+func erpDashboardCore(a erpActor) map[string]interface{} {
+	tid := a.Tid
+	monthFrom, monthTo := erpMonthRange(0)
+	// 不能用 time.Now().Truncate(24*time.Hour)：它按「自零时起算的绝对时长」取整，
+	// 在东八区得到的是 UTC 零点（本地 08:00），会把当天 00:00–08:00 的单据漏掉。
+	now := time.Now()
+	todayFrom := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local)
+
+	buyAmt, buyCnt := erpDocAmount(tid, []string{models.ErpDocPurchaseIn}, monthFrom, monthTo)
+	saleAmt, saleCnt := erpDocAmount(tid, []string{models.ErpDocSalesOut}, monthFrom, monthTo)
+	backAmt, _ := erpDocAmount(tid, []string{models.ErpDocSalesReturn}, monthFrom, monthTo)
+	todaySale, todayCnt := erpDocAmount(tid, []string{models.ErpDocSalesOut}, todayFrom, todayFrom.AddDate(0, 0, 1))
+
+	// 本月毛利（出库流水成本口径）
+	var ledgers []models.ErpStockLedger
+	_, _ = models.Orm.QueryTable(new(models.ErpStockLedger)).
+		Filter("tenant_id", tid).
+		Filter("doc_type__in", []string{models.ErpDocSalesOut, models.ErpDocSalesReturn}).
+		Filter("create_time__gte", monthFrom).Filter("create_time__lt", monthTo).
+		All(&ledgers, "direction", "total_cost")
+	var cost float64
+	for _, l := range ledgers {
+		if l.Direction == models.ErpStockOut {
+			cost += l.TotalCost
+		} else {
+			cost -= l.TotalCost
+		}
+	}
+	profit := saleAmt - backAmt - cost
+
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).Filter("tenant_id", tid).
+		All(&stocks, "quantity", "cost_price")
+	var stockValue, stockQty float64
+	for _, s := range stocks {
+		stockValue += s.Quantity * s.CostPrice
+		stockQty += s.Quantity
+	}
+
+	var bills []models.ErpPartnerBill
+	_, _ = models.Orm.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", tid).Filter("status__lt", 2).
+		All(&bills, "bill_type", "amount", "settled_amount")
+	var recv, pay float64
+	for _, b := range bills {
+		if b.BillType == models.ErpBillReceivable {
+			recv += b.Amount - b.SettledAmount
+		} else {
+			pay += b.Amount - b.SettledAmount
+		}
+	}
+
+	// 待办：待我审批的进销存单据 + 草稿单据数
+	pendingTasks := erpErpPendingTaskCount(a.TidNum, a.UID)
+	var draftCnt int64
+	if n, e := models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("tenant_id", tid).Filter("status", models.ErpDocStatusDraft).
+		Filter("delete_time__isnull", true).Count(); e == nil {
+		draftCnt = n
+	}
+
+	trendList := make([]erpDashboardTrend, 0, 6)
+	for i := 5; i >= 0; i-- {
+		f, t := erpMonthRange(-i)
+		b, _ := erpDocAmount(tid, []string{models.ErpDocPurchaseIn}, f, t)
+		s, _ := erpDocAmount(tid, []string{models.ErpDocSalesOut}, f, t)
+		trendList = append(trendList, erpDashboardTrend{Month: f.Format("2006-01"), Buy: b, Sale: s})
+	}
+
+	return map[string]interface{}{
+		"month": map[string]interface{}{
+			"purchase_amount": buyAmt, "purchase_count": buyCnt,
+			"sales_amount": saleAmt, "sales_count": saleCnt,
+			"return_amount": backAmt, "cost": round2f(cost),
+			"profit": round2f(profit),
+			"profit_rate": func() float64 {
+				if saleAmt-backAmt > 0.005 {
+					return round2f(profit / (saleAmt - backAmt) * 100)
+				}
+				return 0
+			}(),
+		},
+		"today": map[string]interface{}{"sales_amount": todaySale, "sales_count": todayCnt},
+		"stock": map[string]interface{}{"value": round2f(stockValue), "qty": round4f(stockQty)},
+		"partner_bill": map[string]interface{}{
+			"receivable": round2f(recv), "payable": round2f(pay), "net": round2f(recv - pay),
+		},
+		"todo":    map[string]interface{}{"approval_pending": pendingTasks, "draft_docs": draftCnt},
+		"trend":   trendList,
+		"warning": erpWarningCounts(tid),
+	}
+}
+
+// erpReportRow 汇总报表行（按商品/往来单位/月份聚合后的结果）
+type erpReportRow struct {
+	Key    string  `json:"key"`
+	Label  string  `json:"label"`
+	Qty    float64 `json:"qty"`
+	Amount float64 `json:"amount"`
+	Lines  int64   `json:"lines"`
+}
+
+// erpSummaryReportData 购销汇总：按商品/往来单位/月份三种维度聚合，退货行做负向冲减
+func erpSummaryReportData(group string, items []models.ErpDocumentItem,
+	docPartner map[uint64]models.ErpDocument, returnItems []models.ErpDocumentItem) map[string]interface{} {
+
+	agg := map[string]*erpReportRow{}
+	add := func(key, label string, qty, amount float64) {
+		r := agg[key]
+		if r == nil {
+			r = &erpReportRow{Key: key, Label: label}
+			agg[key] = r
+		}
+		r.Qty += qty
+		r.Amount += amount
+		r.Lines++
+	}
+	bucket := func(it models.ErpDocumentItem) (string, string) {
+		d := docPartner[it.DocID]
+		switch group {
+		case "supplier", "customer":
+			return fmt.Sprintf("%d", d.PartnerID), d.PartnerName
+		case "month":
+			return d.BizDate.Format("2006-01"), d.BizDate.Format("2006-01")
+		default:
+			return fmt.Sprintf("%d", it.ProductID), it.ProductName + " " + it.Spec
+		}
+	}
+	for _, it := range items {
+		k, lb := bucket(it)
+		add(k, lb, it.Quantity, it.Amount)
+	}
+	// 退货按同维度负向冲减，净额与往来账口径一致
+	for _, it := range returnItems {
+		k, lb := bucket(it)
+		if group == "supplier" || group == "customer" {
+			d := docPartner[it.DocID]
+			if d.PartnerID == 0 {
+				continue
+			}
+		}
+		add(k, lb, -it.Quantity, -it.Amount)
+	}
+	list := make([]*erpReportRow, 0, len(agg))
+	var tQty, tAmount float64
+	for _, r := range agg {
+		r.Qty = round4f(r.Qty)
+		r.Amount = round2f(r.Amount)
+		if absFloat(r.Amount) < 0.005 && absFloat(r.Qty) < 0.000001 {
+			continue
+		}
+		list = append(list, r)
+		tQty += r.Qty
+		tAmount += r.Amount
+	}
+	sort.Slice(list, func(i, j int) bool {
+		if list[i].Amount != list[j].Amount {
+			return list[i].Amount > list[j].Amount
+		}
+		return list[i].Key < list[j].Key // 金额相同（如对冲后同为 0）时按维度键定序，避免两次请求行序抖动
+	})
+	return map[string]interface{}{
+		"list": list, "dimension": group,
+		"summary": map[string]interface{}{"qty": round4f(tQty), "amount": round2f(tAmount)},
+	}
+}
+
+// erpSalesRankRow 热销/滞销排行行
+type erpSalesRankRow struct {
+	ProductID   uint64  `json:"product_id"`
+	ProductName string  `json:"product_name"`
+	ProductCode string  `json:"product_code"`
+	Spec        string  `json:"spec"`
+	Unit        string  `json:"unit"`
+	Qty         float64 `json:"qty"`
+	Amount      float64 `json:"amount"`
+}
+
+// erpSalesRankCore 热销（desc）/滞销（asc）排行；滞销榜需要把「一件没卖」的在售商品也排进来
+func erpSalesRankCore(a erpActor, from, to time.Time, top int, asc bool) (map[string]interface{}, int, string) {
+	if top < 1 || top > 50 {
+		top = 10
+	}
+	tid := a.Tid
+	ids := erpApprovedDocIDs(tid, []string{models.ErpDocSalesOut}, from, to, 0)
+	items := erpItemsByDocs(tid, ids)
+	agg := map[uint64]*erpSalesRankRow{}
+	for _, it := range items {
+		r := agg[it.ProductID]
+		if r == nil {
+			r = &erpSalesRankRow{ProductID: it.ProductID, ProductName: it.ProductName, Spec: it.Spec, Unit: it.Unit}
+			agg[it.ProductID] = r
+		}
+		r.Qty += it.Quantity
+		r.Amount += it.Amount
+	}
+	if asc {
+		var ps []models.ErpProduct
+		_, _ = models.Orm.QueryTable(new(models.ErpProduct)).
+			Filter("tenant_id", tid).Filter("status", 1).Filter("is_draft", 0).
+			Filter("delete_time__isnull", true).All(&ps, "id", "product_name", "spec", "base_unit")
+		for _, p := range ps {
+			if agg[p.ID] == nil {
+				agg[p.ID] = &erpSalesRankRow{ProductID: p.ID, ProductName: p.ProductName, Spec: p.Spec, Unit: p.BaseUnit}
+			}
+		}
+	}
+	pmap := erpProductMap(tid, keysOfU64(agg))
+	list := make([]*erpSalesRankRow, 0, len(agg))
+	for _, r := range agg {
+		r.ProductCode = pmap[r.ProductID].ProductCode
+		r.Qty = round4f(r.Qty)
+		r.Amount = round2f(r.Amount)
+		list = append(list, r)
+	}
+	sort.Slice(list, func(i, j int) bool {
+		if asc {
+			if list[i].Amount != list[j].Amount {
+				return list[i].Amount < list[j].Amount
+			}
+			if list[i].Qty != list[j].Qty {
+				return list[i].Qty < list[j].Qty
+			}
+		} else {
+			if list[i].Amount != list[j].Amount {
+				return list[i].Amount > list[j].Amount
+			}
+			if list[i].Qty != list[j].Qty {
+				return list[i].Qty > list[j].Qty
+			}
+		}
+		return list[i].ProductID < list[j].ProductID
+	})
+	if len(list) > top {
+		list = list[:top]
+	}
+	return map[string]interface{}{
+		"list": list, "order": map[bool]string{true: "asc", false: "desc"}[asc],
+		"range": []string{from.Format("2006-01-02"), to.AddDate(0, 0, -1).Format("2006-01-02")},
+	}, 200, ""
+}
+
+// erpSummaryPurchaseCore / erpSummarySalesCore 购销汇总取数：两端按维度调用同一份聚合
+func erpSummaryDocs(tid, docType, returnType string, from, to time.Time, partnerID uint64) (
+	[]models.ErpDocumentItem, map[uint64]models.ErpDocument, []models.ErpDocumentItem) {
+	ids := erpApprovedDocIDs(tid, []string{docType}, from, to, partnerID)
+	rids := erpApprovedDocIDs(tid, []string{returnType}, from, to, partnerID)
+	items := erpItemsByDocs(tid, ids)
+	returnItems := erpItemsByDocs(tid, rids)
+	return items, erpDocPartnerMap(append(append([]uint64{}, ids...), rids...)), returnItems
+}
+
+// erpStockMoveRow 收发存汇总行：期末取自库存结存，本期收发取自库存流水，
+// 期初=期末-(入-出)，保证与账实一致。
+type erpStockMoveRow struct {
+	ProductID     uint64  `json:"product_id"`
+	ProductCode   string  `json:"product_code"`
+	ProductName   string  `json:"product_name"`
+	Spec          string  `json:"spec"`
+	Unit          string  `json:"unit"`
+	CategoryName  string  `json:"category_name"`
+	WarehouseID   uint64  `json:"warehouse_id"`
+	WarehouseName string  `json:"warehouse_name"`
+	OpenQty       float64 `json:"open_qty"`
+	OpenAmount    float64 `json:"open_amount"`
+	InQty         float64 `json:"in_qty"`
+	InAmount      float64 `json:"in_amount"`
+	OutQty        float64 `json:"out_qty"`
+	OutAmount     float64 `json:"out_amount"`
+	EndQty        float64 `json:"end_qty"`
+	EndCost       float64 `json:"end_cost"`
+	EndAmount     float64 `json:"end_amount"`
+}
+
+// erpStockMoveCore 收发存汇总表（分页 + 全量合计）
+func erpStockMoveCore(a erpActor, from, to time.Time, warehouseID uint64, keyword string,
+	page, pageSize int) ([]erpStockMoveRow, int64, map[string]float64, int, string) {
+
+	tid := a.Tid
+	var stocks []models.ErpStock
+	qs := models.Orm.QueryTable(new(models.ErpStock)).Filter("tenant_id", tid)
+	if warehouseID > 0 {
+		qs = qs.Filter("warehouse_id", warehouseID)
+	}
+	_, _ = qs.All(&stocks)
+
+	var ledgers []models.ErpStockLedger
+	lqs := models.Orm.QueryTable(new(models.ErpStockLedger)).
+		Filter("tenant_id", tid).
+		Filter("create_time__gte", from).Filter("create_time__lt", to)
+	if warehouseID > 0 {
+		lqs = lqs.Filter("warehouse_id", warehouseID)
+	}
+	_, _ = lqs.All(&ledgers)
+
+	type key struct {
+		productID, warehouseID uint64
+	}
+	endQty := map[key]float64{}
+	endCost := map[key]float64{}
+	endValue := map[key]float64{}
+	keys := make([]key, 0, len(stocks))
+	for _, s := range stocks {
+		k := key{s.ProductID, s.WarehouseID}
+		if _, hit := endQty[k]; !hit {
+			keys = append(keys, k)
+		}
+		endQty[k] += s.Quantity
+		endValue[k] += s.Quantity * s.CostPrice
+		endCost[k] = s.CostPrice
+	}
+	inQty := map[key]float64{}
+	inAmt := map[key]float64{}
+	outQty := map[key]float64{}
+	outAmt := map[key]float64{}
+	for _, l := range ledgers {
+		k := key{l.ProductID, l.WarehouseID}
+		if l.Direction == models.ErpStockIn {
+			inQty[k] += l.Quantity
+			inAmt[k] += l.TotalCost
+		} else {
+			outQty[k] += l.Quantity
+			outAmt[k] += l.TotalCost
+		}
+		// 区间内有流水但当前无结存的组合也要出现在表里（已全部出库）
+		found := false
+		for _, e := range keys {
+			if e == k {
+				found = true
+				break
+			}
+		}
+		if !found {
+			keys = append(keys, k)
+			endQty[k] = 0
+		}
+	}
+
+	ids := make([]uint64, 0, len(keys))
+	for _, k := range keys {
+		ids = append(ids, k.productID)
+	}
+	pmap := erpProductMap(tid, ids)
+	wmap := erpWarehouseNameMap(tid)
+	cats := erpCategoryMap(tid)
+
+	list := make([]erpStockMoveRow, 0, len(keys))
+	for _, k := range keys {
+		p := pmap[k.productID]
+		openQty := endQty[k] - (inQty[k] - outQty[k])
+		openAmt := endValue[k] - (inAmt[k] - outAmt[k])
+		cost := endCost[k]
+		if endQty[k] > 0.000001 {
+			cost = endValue[k] / endQty[k]
+		}
+		list = append(list, erpStockMoveRow{
+			ProductID: k.productID, ProductCode: p.ProductCode, ProductName: p.ProductName,
+			Spec: p.Spec, Unit: p.BaseUnit, CategoryName: cats[p.CategoryID],
+			WarehouseID: k.warehouseID, WarehouseName: wmap[k.warehouseID],
+			OpenQty: round4f(openQty), OpenAmount: round2f(openAmt),
+			InQty: round4f(inQty[k]), InAmount: round2f(inAmt[k]),
+			OutQty: round4f(outQty[k]), OutAmount: round2f(outAmt[k]),
+			EndQty: round4f(endQty[k]), EndCost: round2f(cost), EndAmount: round2f(endValue[k]),
+		})
+	}
+	if kw := strings.TrimSpace(keyword); kw != "" {
+		list = erpFilterRows(list, func(r erpStockMoveRow) bool {
+			return strings.Contains(r.ProductName, kw) || strings.Contains(r.ProductCode, kw)
+		})
+	}
+	sort.Slice(list, func(i, j int) bool {
+		if list[i].ProductName != list[j].ProductName {
+			return list[i].ProductName < list[j].ProductName
+		}
+		if list[i].WarehouseName != list[j].WarehouseName {
+			return list[i].WarehouseName < list[j].WarehouseName
+		}
+		if list[i].ProductID != list[j].ProductID {
+			return list[i].ProductID < list[j].ProductID
+		}
+		return list[i].WarehouseID < list[j].WarehouseID
+	})
+
+	sum := erpStockMoveRow{}
+	for _, r := range list {
+		sum.InQty += r.InQty
+		sum.InAmount += r.InAmount
+		sum.OutQty += r.OutQty
+		sum.OutAmount += r.OutAmount
+		sum.EndAmount += r.EndAmount
+	}
+	summary := map[string]float64{
+		"in_qty": round4f(sum.InQty), "in_amount": round2f(sum.InAmount),
+		"out_qty": round4f(sum.OutQty), "out_amount": round2f(sum.OutAmount),
+		"end_amount": round2f(sum.EndAmount),
+	}
+	start, end := erpPageWindow(len(list), page, pageSize)
+	return list[start:end], int64(len(list)), summary, 200, ""
+}
+
+// erpProfitRow 毛利分析行：收入=销售出库金额-销售退货金额，
+// 成本取库存流水的实际出库成本（移动加权），不受手工录入影响。
+type erpProfitRow struct {
+	ProductID   uint64  `json:"product_id"`
+	ProductCode string  `json:"product_code"`
+	ProductName string  `json:"product_name"`
+	Spec        string  `json:"spec"`
+	Unit        string  `json:"unit"`
+	Qty         float64 `json:"qty"`
+	Revenue     float64 `json:"revenue"`
+	Cost        float64 `json:"cost"`
+	Profit      float64 `json:"profit"`
+	ProfitRate  float64 `json:"profit_rate"`
+}
+
+// erpProfitCore 毛利分析（按商品）
+func erpProfitCore(a erpActor, from, to time.Time) (map[string]interface{}, int, string) {
+	tid := a.Tid
+	outIDs := erpApprovedDocIDs(tid, []string{models.ErpDocSalesOut}, from, to, 0)
+	backIDs := erpApprovedDocIDs(tid, []string{models.ErpDocSalesReturn}, from, to, 0)
+	revenue := map[uint64]float64{}
+	qty := map[uint64]float64{}
+	names := map[uint64]models.ErpDocumentItem{}
+	for _, it := range erpItemsByDocs(tid, outIDs) {
+		revenue[it.ProductID] += it.Amount
+		qty[it.ProductID] += it.Quantity
+		names[it.ProductID] = it
+	}
+	for _, it := range erpItemsByDocs(tid, backIDs) {
+		revenue[it.ProductID] -= it.Amount
+		qty[it.ProductID] -= it.Quantity
+		if _, hit := names[it.ProductID]; !hit {
+			names[it.ProductID] = it
+		}
+	}
+
+	var ledgers []models.ErpStockLedger
+	_, _ = models.Orm.QueryTable(new(models.ErpStockLedger)).
+		Filter("tenant_id", tid).
+		Filter("doc_type__in", []string{models.ErpDocSalesOut, models.ErpDocSalesReturn}).
+		Filter("create_time__gte", from).Filter("create_time__lt", to).
+		All(&ledgers)
+	cost := map[uint64]float64{}
+	for _, l := range ledgers {
+		if l.Direction == models.ErpStockOut {
+			cost[l.ProductID] += l.TotalCost
+		} else {
+			cost[l.ProductID] -= l.TotalCost
+		}
+	}
+
+	pmap := erpProductMap(tid, keysOfU64(revenue))
+	list := make([]erpProfitRow, 0, len(revenue))
+	var tRev, tCost, tQty float64
+	for pid, rv := range revenue {
+		p := pmap[pid]
+		cst := cost[pid]
+		prof := rv - cst
+		rate := 0.0
+		if rv > 0.005 {
+			rate = round2f(prof / rv * 100)
+		}
+		list = append(list, erpProfitRow{
+			ProductID: pid, ProductCode: p.ProductCode, ProductName: p.ProductName,
+			Spec: p.Spec, Unit: p.BaseUnit, Qty: round4f(qty[pid]),
+			Revenue: round2f(rv), Cost: round2f(cst), Profit: round2f(prof), ProfitRate: rate,
+		})
+		tRev += rv
+		tCost += cst
+		tQty += qty[pid]
+	}
+	sort.Slice(list, func(i, j int) bool {
+		if list[i].Profit != list[j].Profit {
+			return list[i].Profit > list[j].Profit
+		}
+		return list[i].ProductID < list[j].ProductID
+	})
+	totalProfit := tRev - tCost
+	rate := 0.0
+	if tRev > 0.005 {
+		rate = round2f(totalProfit / tRev * 100)
+	}
+	return map[string]interface{}{
+		"list": list,
+		"summary": map[string]interface{}{
+			"revenue": round2f(tRev), "cost": round2f(tCost),
+			"profit": round2f(totalProfit), "profit_rate": rate, "qty": round4f(tQty),
+		},
+	}, 200, ""
+}
diff --git a/go/controllers/erp_stock_core.go b/go/controllers/erp_stock_core.go
new file mode 100644
index 0000000..03e323e
--- /dev/null
+++ b/go/controllers/erp_stock_core.go
@@ -0,0 +1,371 @@
+package controllers
+
+import (
+	"strings"
+	"time"
+
+	"server/models"
+)
+
+// ERP 库存查询核心（两端共用）：结存、流水、批次、预警、补货建议的算法只在这里实现一份，
+// /backend/erp/stock* 与 /api/erp/stock* 的 handler 只负责取参数与输出各自的响应信封，
+// 保证「手机上看到的库存数」和「Web 端看到的」永远是同一套口径。
+
+// erpStockFilter 结存查询条件
+type erpStockFilter struct {
+	WarehouseID    uint64
+	ProductID      uint64
+	BatchNo        string
+	OnlyStock      bool
+	GroupByProduct bool
+	Keyword        string
+	CategoryID     uint64
+	SafetyState    string
+}
+
+// erpStockListCore 库存结存列表（可按商品聚合），返回当前页、总数与金额合计
+func erpStockListCore(a erpActor, f erpStockFilter, page, pageSize int) ([]erpStockRow, int64, float64, int, string) {
+	qs := models.Orm.QueryTable(new(models.ErpStock)).Filter("tenant_id", a.Tid)
+	if f.WarehouseID > 0 {
+		qs = qs.Filter("warehouse_id", f.WarehouseID)
+	}
+	if f.ProductID > 0 {
+		qs = qs.Filter("product_id", f.ProductID)
+	}
+	if f.BatchNo != "" {
+		qs = qs.Filter("batch_no", f.BatchNo)
+	}
+	if f.OnlyStock {
+		qs = qs.Filter("quantity__gt", 0)
+	}
+
+	var rows []models.ErpStock
+	if _, err := qs.OrderBy("product_id", "warehouse_id", "batch_no").All(&rows); err != nil {
+		return nil, 0, 0, 500, "查询失败: " + err.Error()
+	}
+	pmap := erpProductMap(a.Tid, erpStockProductIDs(rows))
+	wmap := erpWarehouseNameMap(a.Tid)
+	cats := erpCategoryMap(a.Tid)
+
+	list := make([]erpStockRow, 0, len(rows))
+	agg := map[uint64]int{} // 按商品聚合时的数量合计
+	for _, s := range rows {
+		p := pmap[s.ProductID]
+		amount := round2f(s.Quantity * s.CostPrice)
+		if f.GroupByProduct {
+			if i, hit := agg[s.ProductID]; hit {
+				r := &list[i]
+				r.Quantity = round4f(r.Quantity + s.Quantity)
+				// 加权成本 = 合计金额 / 合计数量
+				base := r.Amount
+				r.Amount = round2f(base + amount)
+				if r.Quantity > 0.000001 {
+					r.CostPrice = round2f(r.Amount / r.Quantity)
+				}
+				r.SafetyState = erpSafetyState(r.SafetyQty, r.Quantity, r.MaxQty)
+				continue
+			}
+			agg[s.ProductID] = len(list)
+		}
+		row := erpStockRow{
+			ProductID: s.ProductID, ProductCode: p.ProductCode, ProductName: p.ProductName,
+			Spec: p.Spec, Unit: p.BaseUnit, CategoryName: cats[p.CategoryID],
+			WarehouseID: s.WarehouseID, WarehouseName: wmap[s.WarehouseID], BatchNo: s.BatchNo,
+			Quantity: round4f(s.Quantity), CostPrice: round2f(s.CostPrice), Amount: amount,
+			SafetyQty: p.SafetyQty, MaxQty: p.MaxQty,
+		}
+		row.SafetyState = erpSafetyState(row.SafetyQty, row.Quantity, row.MaxQty)
+		list = append(list, row)
+	}
+
+	// 商品维度过滤（关键字/分类）在聚合后做，避免 SQL 里 JOIN 档案表
+	if f.Keyword != "" {
+		kw := f.Keyword
+		list = erpFilterRows(list, func(r erpStockRow) bool {
+			return strings.Contains(r.ProductName, kw) || strings.Contains(r.ProductCode, kw) ||
+				strings.Contains(r.Spec, kw) || strings.Contains(r.BatchNo, kw)
+		})
+	}
+	if f.CategoryID > 0 {
+		list = erpFilterRows(list, func(r erpStockRow) bool {
+			return pmap[r.ProductID].CategoryID == f.CategoryID
+		})
+	}
+	if f.SafetyState != "" {
+		list = erpFilterRows(list, func(r erpStockRow) bool { return r.SafetyState == f.SafetyState })
+	}
+
+	total := int64(len(list))
+	start, end := erpPageWindow(len(list), page, pageSize)
+	var sumAmount float64
+	for _, r := range list {
+		sumAmount += r.Amount
+	}
+	return list[start:end], total, round2f(sumAmount), 200, ""
+}
+
+// erpLedgerFilter 库存流水查询条件
+type erpLedgerFilter struct {
+	ProductID   uint64
+	WarehouseID uint64
+	DocType     string
+	BatchNo     string
+	DocNo       string
+	DateFrom    string
+	DateTo      string
+}
+
+// erpLedgerCore 库存流水（收发存明细追溯）
+func erpLedgerCore(a erpActor, f erpLedgerFilter, page, pageSize int) ([]models.ErpStockLedger, int64, int, string) {
+	qs := models.Orm.QueryTable(new(models.ErpStockLedger)).Filter("tenant_id", a.Tid)
+	if f.ProductID > 0 {
+		qs = qs.Filter("product_id", f.ProductID)
+	}
+	if f.WarehouseID > 0 {
+		qs = qs.Filter("warehouse_id", f.WarehouseID)
+	}
+	if f.DocType != "" && erpDocTypes[f.DocType] {
+		qs = qs.Filter("doc_type", f.DocType)
+	}
+	if f.BatchNo != "" {
+		qs = qs.Filter("batch_no", f.BatchNo)
+	}
+	if f.DocNo != "" {
+		qs = qs.Filter("doc_no__contains", f.DocNo)
+	}
+	if f.DateFrom != "" {
+		if t, e := time.ParseInLocation("2006-01-02", f.DateFrom, time.Local); e == nil {
+			qs = qs.Filter("create_time__gte", t)
+		}
+	}
+	if f.DateTo != "" {
+		if t, e := time.ParseInLocation("2006-01-02", f.DateTo, time.Local); e == nil {
+			qs = qs.Filter("create_time__lt", t.AddDate(0, 0, 1))
+		}
+	}
+
+	total, _ := qs.Count()
+	var rows []models.ErpStockLedger
+	if _, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
+		return nil, 0, 500, "查询失败: " + err.Error()
+	}
+	pmap := erpProductMap(a.Tid, erpLedgerProductIDs(rows))
+	wmap := erpWarehouseNameMap(a.Tid)
+	for i := range rows {
+		p := pmap[rows[i].ProductID]
+		rows[i].ProductName = p.ProductName
+		rows[i].ProductCode = p.ProductCode
+		rows[i].Spec = p.Spec
+		rows[i].BaseUnit = p.BaseUnit
+		rows[i].WarehouseName = wmap[rows[i].WarehouseID]
+	}
+	return rows, total, 200, ""
+}
+
+// erpWarningCore 库存预警：低于安全库存 / 超储 / 零库存 / 效期临近
+func erpWarningCore(a erpActor) (map[string]interface{}, int, string) {
+	tid := a.Tid
+	var products []models.ErpProduct
+	_, _ = models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", tid).Filter("status", 1).Filter("is_draft", 0).
+		Filter("delete_time__isnull", true).All(&products)
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).All(&stocks)
+	qtyMap := map[uint64]float64{}
+	for _, s := range stocks {
+		qtyMap[s.ProductID] += s.Quantity
+	}
+	// 在途量：已生效未执行完的采购订单剩余数量，用于判断"缺货但已在途"
+	inTransit := erpPurchaseInTransit(tid)
+	cats := erpCategoryMap(tid)
+
+	low, over, out := make([]erpWarnRow, 0), make([]erpWarnRow, 0), make([]erpWarnRow, 0)
+	for _, p := range products {
+		q := qtyMap[p.ID]
+		row := erpWarnRow{
+			ProductID: p.ID, ProductCode: p.ProductCode, ProductName: p.ProductName,
+			Spec: p.Spec, Unit: p.BaseUnit, CategoryName: cats[p.CategoryID],
+			Quantity: round4f(q), SafetyQty: p.SafetyQty, MaxQty: p.MaxQty,
+			InTransit: round4f(inTransit[p.ID]),
+		}
+		switch {
+		case p.SafetyQty > 0 && q < p.SafetyQty:
+			row.Type, row.TypeLabel = "low", "低于安全库存"
+			// 补货建议：补到安全库存的1.5倍，扣除在途
+			target := round4f(p.SafetyQty * 1.5)
+			if p.MaxQty > target {
+				target = round4f(p.MaxQty)
+			}
+			sug := target - q - inTransit[p.ID]
+			if sug > 0 {
+				row.SuggestQty = round4f(sug)
+			}
+			low = append(low, row)
+			if q <= 0.000001 {
+				o := row
+				o.Type, o.TypeLabel = "out", "缺货"
+				out = append(out, o)
+			}
+		case p.MaxQty > 0 && q > p.MaxQty:
+			row.Type, row.TypeLabel = "over", "库存积压"
+			row.SuggestQty = round4f(q - p.MaxQty)
+			over = append(over, row)
+		}
+	}
+
+	// 效期预警：按批次结存取最近一次流水的到期日
+	expiring := erpExpiringBatches(tid, 30)
+
+	return map[string]interface{}{
+		"low": low, "over": over, "out": out, "expiring": expiring,
+		"counts": map[string]int{
+			"low": len(low), "over": len(over), "out": len(out), "expiring": len(expiring),
+		},
+	}, 200, ""
+}
+
+// erpReplenishCore 智能补货建议（按供应商分组，可一键生成采购订单）
+func erpReplenishCore(a erpActor) ([]erpReplenishRow, int, string) {
+	tid := a.Tid
+	var products []models.ErpProduct
+	_, _ = models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", tid).Filter("status", 1).Filter("is_draft", 0).
+		Filter("delete_time__isnull", true).Filter("safety_qty__gt", 0).All(&products)
+	var stocks []models.ErpStock
+	_, _ = models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", tid).All(&stocks)
+	qtyMap := map[uint64]float64{}
+	for _, s := range stocks {
+		qtyMap[s.ProductID] += s.Quantity
+	}
+	inTransit := erpPurchaseInTransit(tid)
+	// 近期销量（30天销售出库）作为动态补货依据
+	sold := erpSoldQty(tid, 30)
+
+	rows := make([]erpReplenishRow, 0)
+	for _, p := range products {
+		q := qtyMap[p.ID]
+		target := p.SafetyQty * 1.5
+		if p.MaxQty > target {
+			target = p.MaxQty
+		}
+		// 有销量数据时按「月销 + 安全库存」定目标，更贴近实际周转
+		if s := sold[p.ID]; s > 0 && s > target {
+			target = s + p.SafetyQty*0.5
+		}
+		sug := target - q - inTransit[p.ID]
+		if sug <= 0.000001 {
+			continue
+		}
+		sug = round4f(sug)
+		rows = append(rows, erpReplenishRow{
+			ProductID: p.ID, ProductCode: p.ProductCode, ProductName: p.ProductName,
+			Spec: p.Spec, Unit: p.BaseUnit, Quantity: round4f(q), SafetyQty: p.SafetyQty,
+			InTransit: round4f(inTransit[p.ID]), Sold30: round4f(sold[p.ID]),
+			SuggestQty: sug, UnitPrice: p.PurchasePrice, Amount: round2f(sug * p.PurchasePrice),
+		})
+	}
+	return rows, 200, ""
+}
+
+// erpBatchFilter 批次台账查询条件
+type erpBatchFilter struct {
+	WarehouseID  uint64
+	ProductID    uint64
+	OnlyPositive bool
+	Keyword      string
+	ExpireState  string
+}
+
+// erpBatchCore 批次与效期台账
+func erpBatchCore(a erpActor, f erpBatchFilter, page, pageSize int) ([]erpBatchRow, int64, int, string) {
+	qs := models.Orm.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", a.Tid).Exclude("batch_no", "")
+	if f.WarehouseID > 0 {
+		qs = qs.Filter("warehouse_id", f.WarehouseID)
+	}
+	if f.ProductID > 0 {
+		qs = qs.Filter("product_id", f.ProductID)
+	}
+	if f.OnlyPositive {
+		qs = qs.Filter("quantity__gt", 0)
+	}
+	var rows []models.ErpStock
+	if _, err := qs.OrderBy("product_id", "warehouse_id", "batch_no").All(&rows); err != nil {
+		return nil, 0, 500, "查询失败: " + err.Error()
+	}
+
+	// 批次效期来自入库流水（同批次取最早到期日）
+	ids := erpStockProductIDs(rows)
+	pmap := erpProductMap(a.Tid, ids)
+	expireMap := erpBatchExpiry(a.Tid, ids, pmap)
+	wmap := erpWarehouseNameMap(a.Tid)
+	all := make([]erpBatchRow, 0, len(rows))
+	today := erpToday()
+	for _, s := range rows {
+		p := pmap[s.ProductID]
+		row := erpBatchRow{
+			ProductID: s.ProductID, ProductCode: p.ProductCode, ProductName: p.ProductName,
+			Spec: p.Spec, Unit: p.BaseUnit, WarehouseID: s.WarehouseID,
+			WarehouseName: wmap[s.WarehouseID], BatchNo: s.BatchNo,
+			Quantity: round4f(s.Quantity), CostPrice: round2f(s.CostPrice),
+			Amount: round2f(s.Quantity * s.CostPrice),
+		}
+		if t, hit := expireMap[erpBatchKey(s.ProductID, s.BatchNo)]; hit {
+			d := int(t.Sub(today).Hours() / 24)
+			row.ExpireDate = t.Format("2006-01-02")
+			row.ExpireInDays = &d
+			row.Expired = d < 0
+		}
+		all = append(all, row)
+	}
+
+	list := make([]erpBatchRow, 0, len(all))
+	for _, r := range all {
+		if f.Keyword != "" && !strings.Contains(r.ProductName, f.Keyword) &&
+			!strings.Contains(r.ProductCode, f.Keyword) &&
+			!strings.Contains(r.BatchNo, f.Keyword) &&
+			!strings.Contains(r.Spec, f.Keyword) {
+			continue
+		}
+		if f.ExpireState != "" {
+			d := r.ExpireInDays
+			switch f.ExpireState {
+			case "expired":
+				if d == nil || *d >= 0 {
+					continue
+				}
+			case "expiring":
+				if d == nil || *d < 0 || *d > 30 {
+					continue
+				}
+			case "normal":
+				if d != nil && *d <= 30 {
+					continue
+				}
+			}
+		}
+		list = append(list, r)
+	}
+
+	total := int64(len(list))
+	start, end := erpPageWindow(len(list), page, pageSize)
+	return list[start:end], total, 200, ""
+}
+
+// erpPageWindow 内存分页的取页区间，越界时收敛到末尾
+func erpPageWindow(length, page, pageSize int) (int, int) {
+	start := (page - 1) * pageSize
+	if start > length {
+		start = length
+	}
+	if start < 0 {
+		start = 0
+	}
+	end := start + pageSize
+	if end > length {
+		end = length
+	}
+	return start, end
+}
diff --git a/go/controllers/password_store.go b/go/controllers/password_store.go
index 56d87d0..a30ecd0 100644
--- a/go/controllers/password_store.go
+++ b/go/controllers/password_store.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -73,15 +74,13 @@ func accountsFromJSON(raw string) []models.PasswordAccountItem {
 }
 
 func passwordClaims(c *beego.Controller, kind string) (*jwtutil.Claims, error) {
-	p := strings.SplitN(c.Ctx.Request.Header.Get("Authorization"), " ", 2)
-	if len(p) != 2 || p[0] != "Bearer" {
+	// 口令保险柜按端隔离：平台账号存的口令和租户账号存的口令互不可见，
+	// 所以 kind（platform/backend）必须由令牌证实，而不只是形参对得上。
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.End(kind))
+	if err != nil || claims.UserID <= 0 {
 		return nil, orm.ErrNoRows
 	}
-	cl, e := jwtutil.ParseToken(p[1])
-	if e != nil || cl.UserType != kind || cl.UserID <= 0 {
-		return nil, orm.ErrNoRows
-	}
-	return cl, nil
+	return claims, nil
 }
 
 func parsePassword(c *beego.Controller) (passwordPayload, error) {
diff --git a/go/controllers/platform_account_pool.go b/go/controllers/platform_account_pool.go
index 541534c..b85d52a 100644
--- a/go/controllers/platform_account_pool.go
+++ b/go/controllers/platform_account_pool.go
@@ -1,1453 +1,1451 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-	"server/pkg/tokenprobe"
-
-	"github.com/beego/beego/v2/client/orm"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type PlatformAccountPoolCursorController struct{ beego.Controller }
-type PlatformAccountPoolWindsurfController struct{ beego.Controller }
-type PlatformAccountPoolKrioController struct{ beego.Controller }
-type PlatformAccountPoolCodexController struct{ beego.Controller }
-
-type accountPoolCreateRow struct {
-	DataType string `json:"type"`
-	Account  string `json:"account"`
-	Password string `json:"password"`
-	Token    string `json:"token"`
-	Remark   string `json:"remark"`
-}
-
-func requirePlatformAuth(c *beego.Controller) (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func poolJSONErr(c *beego.Controller, httpStatus, code int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": code, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-func isValidPoolType(t string) bool {
-	return t == "account" || t == "tk" || t == "account_tk"
-}
-
-func validateCreateRow(row accountPoolCreateRow) error {
-	if !isValidPoolType(row.DataType) {
-		return fmt.Errorf("账号类型不正确")
-	}
-	row.Account = strings.TrimSpace(row.Account)
-	row.Password = strings.TrimSpace(row.Password)
-	row.Token = strings.TrimSpace(row.Token)
-	if row.DataType == "account" && (row.Account == "" || row.Password == "") {
-		return fmt.Errorf("账号密码类型必须填写账号和密码")
-	}
-	if row.DataType == "tk" && row.Token == "" {
-		return fmt.Errorf("token类型必须填写token")
-	}
-	if row.DataType == "account_tk" && (row.Account == "" || row.Token == "") {
-		return fmt.Errorf("账号密码+token类型必须填写账号和token，密码可为空")
-	}
-	return nil
-}
-
-// accountPoolListWhere 列表筛选（与各号池表字段一致）
-func accountPoolListWhere(dataType, status, platform, keyword, account, token, remark string) (where string, args []interface{}) {
-	var parts []string
-	if dataType != "" && isValidPoolType(dataType) {
-		parts = append(parts, "data_type = ?")
-		args = append(args, dataType)
-	}
-	switch status {
-	case "unused":
-		parts = append(parts, "is_extracted = ?")
-		args = append(args, int8(0))
-	case "extracted":
-		parts = append(parts, "is_extracted = ?")
-		args = append(args, int8(1))
-	case "replenished":
-		parts = append(parts, "is_extracted = ?")
-		args = append(args, int8(2))
-	case "renewed":
-		parts = append(parts, "is_extracted = ?")
-		args = append(args, int8(3))
-	}
-	if p := strings.TrimSpace(platform); p != "" {
-		parts = append(parts, "extracted_platform = ?")
-		args = append(args, p)
-	}
-	if acc := strings.TrimSpace(account); acc != "" {
-		parts = append(parts, "account LIKE ?")
-		args = append(args, "%"+acc+"%")
-	}
-	if tk := strings.TrimSpace(token); tk != "" {
-		parts = append(parts, "token LIKE ?")
-		args = append(args, "%"+tk+"%")
-	}
-	if rm := strings.TrimSpace(remark); rm != "" {
-		parts = append(parts, "remark LIKE ?")
-		args = append(args, "%"+rm+"%")
-	}
-	// 兼容旧版前端 keyword 参数：仅作为账号查询，不再合并 token/备注。
-	if kw := strings.TrimSpace(keyword); kw != "" {
-		parts = append(parts, "account LIKE ?")
-		args = append(args, "%"+kw+"%")
-	}
-	if len(parts) == 0 {
-		return "1=1", args
-	}
-	return strings.Join(parts, " AND "), args
-}
-
-func accountPoolCountMySQL(table, where string, whereArgs []interface{}) (int64, error) {
-	sqlStr := fmt.Sprintf("SELECT COUNT(*) AS cnt FROM `%s` WHERE %s", table, where)
-	var maps []orm.Params
-	_, err := models.Orm.Raw(sqlStr, whereArgs...).Values(&maps)
-	if err != nil {
-		return 0, err
-	}
-	if len(maps) == 0 {
-		return 0, nil
-	}
-	return paramsCellToInt64(maps[0]["cnt"]), nil
-}
-
-func paramsCellToInt64(v interface{}) int64 {
-	if v == nil {
-		return 0
-	}
-	switch x := v.(type) {
-	case []byte:
-		n, _ := strconv.ParseInt(strings.TrimSpace(string(x)), 10, 64)
-		return n
-	case int64:
-		return x
-	case int32:
-		return int64(x)
-	case int:
-		return int64(x)
-	default:
-		n, _ := strconv.ParseInt(strings.TrimSpace(fmt.Sprint(x)), 10, 64)
-		return n
-	}
-}
-
-func listPoolRows(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 30)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 30
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-	keyword := strings.TrimSpace(c.GetString("keyword"))
-	account := strings.TrimSpace(c.GetString("account"))
-	token := strings.TrimSpace(c.GetString("token"))
-	remark := strings.TrimSpace(c.GetString("remark"))
-	dataType := strings.TrimSpace(c.GetString("type"))
-	status := strings.TrimSpace(c.GetString("status"))
-	platform := strings.TrimSpace(c.GetString("platform"))
-
-	where, whereArgs := accountPoolListWhere(dataType, status, platform, keyword, account, token, remark)
-	if module == "cursor" {
-		u := strings.TrimSpace(c.GetString("usable"))
-		if u == "1" || u == "0" {
-			if v, err := strconv.ParseInt(u, 10, 8); err == nil {
-				where = "(" + where + ") AND is_used = ?"
-				whereArgs = append(whereArgs, int8(v))
-			}
-		}
-	}
-	offset := (page - 1) * pageSize
-
-	var list interface{}
-	var total int64
-	var err error
-
-	switch module {
-	case "cursor":
-		table := (&models.PlatformAccountPoolCursor{}).TableName()
-		total, err = accountPoolCountMySQL(table, where, whereArgs)
-		if err != nil {
-			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
-			return
-		}
-		sqlStr := fmt.Sprintf(
-			"SELECT * FROM `%s` WHERE %s ORDER BY FIELD(is_extracted, 0, 2, 3, 1) ASC, id DESC LIMIT ? OFFSET ?",
-			table, where,
-		)
-		args := append(append([]interface{}{}, whereArgs...), pageSize, offset)
-		var rows []models.PlatformAccountPoolCursor
-		_, err = models.Orm.Raw(sqlStr, args...).QueryRows(&rows)
-		if err != nil && err != orm.ErrNoRows {
-			poolJSONErr(c, 500, 500, "cursor查询失败: "+err.Error())
-			return
-		}
-		if rows == nil {
-			rows = []models.PlatformAccountPoolCursor{}
-		}
-		list = rows
-	case "windsurf":
-		table := (&models.PlatformAccountPoolWindsurf{}).TableName()
-		total, err = accountPoolCountMySQL(table, where, whereArgs)
-		if err != nil {
-			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
-			return
-		}
-		sqlStr := fmt.Sprintf(
-			"SELECT * FROM `%s` WHERE %s ORDER BY FIELD(is_extracted, 0, 2, 3, 1) ASC, id DESC LIMIT ? OFFSET ?",
-			table, where,
-		)
-		args := append(append([]interface{}{}, whereArgs...), pageSize, offset)
-		var rows []models.PlatformAccountPoolWindsurf
-		_, err = models.Orm.Raw(sqlStr, args...).QueryRows(&rows)
-		if err != nil && err != orm.ErrNoRows {
-			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
-			return
-		}
-		if rows == nil {
-			rows = []models.PlatformAccountPoolWindsurf{}
-		}
-		list = rows
-	case "krio":
-		table := (&models.PlatformAccountPoolKiro{}).TableName()
-		total, err = accountPoolCountMySQL(table, where, whereArgs)
-		if err != nil {
-			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
-			return
-		}
-		sqlStr := fmt.Sprintf(
-			"SELECT * FROM `%s` WHERE %s ORDER BY FIELD(is_extracted, 0, 2, 3, 1) ASC, id DESC LIMIT ? OFFSET ?",
-			table, where,
-		)
-		args := append(append([]interface{}{}, whereArgs...), pageSize, offset)
-		var rows []models.PlatformAccountPoolKiro
-		_, err = models.Orm.Raw(sqlStr, args...).QueryRows(&rows)
-		if err != nil && err != orm.ErrNoRows {
-			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
-			return
-		}
-		if rows == nil {
-			rows = []models.PlatformAccountPoolKiro{}
-		}
-		list = rows
-	case "codex":
-		table := (&models.PlatformAccountPoolCodex{}).TableName()
-		total, err = accountPoolCountMySQL(table, where, whereArgs)
-		if err != nil {
-			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
-			return
-		}
-		sqlStr := fmt.Sprintf(
-			"SELECT * FROM `%s` WHERE %s ORDER BY FIELD(is_extracted, 0, 2, 3, 1) ASC, id DESC LIMIT ? OFFSET ?",
-			table, where,
-		)
-		args := append(append([]interface{}{}, whereArgs...), pageSize, offset)
-		var rows []models.PlatformAccountPoolCodex
-		_, err = models.Orm.Raw(sqlStr, args...).QueryRows(&rows)
-		if err != nil && err != orm.ErrNoRows {
-			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
-			return
-		}
-		if rows == nil {
-			rows = []models.PlatformAccountPoolCodex{}
-		}
-		list = rows
-	default:
-		poolJSONErr(c, 400, 400, "无效模块")
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"list":  list,
-			"total": total,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-func addPoolRow(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var row accountPoolCreateRow
-	if err := json.Unmarshal(raw, &row); err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	if err := validateCreateRow(row); err != nil {
-		poolJSONErr(c, 400, 400, err.Error())
-		return
-	}
-
-	switch module {
-	case "cursor":
-		r := &models.PlatformAccountPoolCursor{
-			DataType:    strings.TrimSpace(row.DataType),
-			Account:     strings.TrimSpace(row.Account),
-			Password:    strings.TrimSpace(row.Password),
-			Token:       strings.TrimSpace(row.Token),
-			Remark:      strings.TrimSpace(row.Remark),
-			IsExtracted: 0,
-		}
-		_, err = models.Orm.Insert(r)
-	case "windsurf":
-		r := &models.PlatformAccountPoolWindsurf{
-			DataType:    strings.TrimSpace(row.DataType),
-			Account:     strings.TrimSpace(row.Account),
-			Password:    strings.TrimSpace(row.Password),
-			Token:       strings.TrimSpace(row.Token),
-			Remark:      strings.TrimSpace(row.Remark),
-			IsExtracted: 0,
-		}
-		_, err = models.Orm.Insert(r)
-	case "krio":
-		r := &models.PlatformAccountPoolKiro{
-			DataType:    strings.TrimSpace(row.DataType),
-			Account:     strings.TrimSpace(row.Account),
-			Password:    strings.TrimSpace(row.Password),
-			Token:       strings.TrimSpace(row.Token),
-			Remark:      strings.TrimSpace(row.Remark),
-			IsExtracted: 0,
-		}
-		_, err = models.Orm.Insert(r)
-	case "codex":
-		r := &models.PlatformAccountPoolCodex{
-			DataType:    strings.TrimSpace(row.DataType),
-			Account:     strings.TrimSpace(row.Account),
-			Password:    strings.TrimSpace(row.Password),
-			Token:       strings.TrimSpace(row.Token),
-			Remark:      strings.TrimSpace(row.Remark),
-			IsExtracted: 0,
-		}
-		_, err = models.Orm.Insert(r)
-	default:
-		poolJSONErr(c, 400, 400, "无效模块")
-		return
-	}
-	if err != nil {
-		poolJSONErr(c, 500, 500, "添加失败: "+err.Error())
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "添加成功"}
-	_ = c.ServeJSON()
-}
-
-func batchAddPoolRows(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		Rows []accountPoolCreateRow `json:"rows"`
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil || len(payload.Rows) == 0 {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	for _, row := range payload.Rows {
-		if err := validateCreateRow(row); err != nil {
-			poolJSONErr(c, 400, 400, err.Error())
-			return
-		}
-	}
-	var accounts []string
-	var tokens []string
-	seenAccs := make(map[string]bool)
-	seenTks := make(map[string]bool)
-
-	for _, row := range payload.Rows {
-		acc := strings.TrimSpace(row.Account)
-		tk := strings.TrimSpace(row.Token)
-		if acc != "" && !seenAccs[acc] {
-			seenAccs[acc] = true
-			accounts = append(accounts, acc)
-		}
-		if tk != "" && !seenTks[tk] {
-			seenTks[tk] = true
-			tokens = append(tokens, tk)
-		}
-	}
-
-	existingAccs := make(map[string]bool)
-	existingTks := make(map[string]bool)
-
-	if len(accounts) > 0 || len(tokens) > 0 {
-		condObj := orm.NewCondition()
-		subCond := orm.NewCondition()
-		if len(accounts) > 0 {
-			subCond = subCond.Or("account__in", accounts)
-		}
-		if len(tokens) > 0 {
-			subCond = subCond.Or("token__in", tokens)
-		}
-
-		switch module {
-		case "cursor":
-			var dbRows []models.PlatformAccountPoolCursor
-			cond := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("delete_time__isnull", true)
-			cond = cond.SetCond(condObj.AndCond(subCond))
-			if _, err := cond.All(&dbRows, "account", "token"); err == nil {
-				for _, r := range dbRows {
-					if r.Account != "" {
-						existingAccs[r.Account] = true
-					}
-					if r.Token != "" {
-						existingTks[r.Token] = true
-					}
-				}
-			}
-		case "windsurf":
-			var dbRows []models.PlatformAccountPoolWindsurf
-			cond := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("delete_time__isnull", true)
-			cond = cond.SetCond(condObj.AndCond(subCond))
-			if _, err := cond.All(&dbRows, "account", "token"); err == nil {
-				for _, r := range dbRows {
-					if r.Account != "" {
-						existingAccs[r.Account] = true
-					}
-					if r.Token != "" {
-						existingTks[r.Token] = true
-					}
-				}
-			}
-		case "krio":
-			var dbRows []models.PlatformAccountPoolKiro
-			cond := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("delete_time__isnull", true)
-			cond = cond.SetCond(condObj.AndCond(subCond))
-			if _, err := cond.All(&dbRows, "account", "token"); err == nil {
-				for _, r := range dbRows {
-					if r.Account != "" {
-						existingAccs[r.Account] = true
-					}
-					if r.Token != "" {
-						existingTks[r.Token] = true
-					}
-				}
-			}
-		case "codex":
-			var dbRows []models.PlatformAccountPoolCodex
-			cond := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("delete_time__isnull", true)
-			cond = cond.SetCond(condObj.AndCond(subCond))
-			if _, err := cond.All(&dbRows, "account", "token"); err == nil {
-				for _, r := range dbRows {
-					if r.Account != "" {
-						existingAccs[r.Account] = true
-					}
-					if r.Token != "" {
-						existingTks[r.Token] = true
-					}
-				}
-			}
-		}
-	}
-
-	insertedAccs := make(map[string]bool)
-	insertedTks := make(map[string]bool)
-
-	var successCount int
-	var duplicateCount int
-
-	for _, row := range payload.Rows {
-		acc := strings.TrimSpace(row.Account)
-		tk := strings.TrimSpace(row.Token)
-
-		isDuplicate := false
-		if row.DataType == "account" {
-			if existingAccs[acc] || insertedAccs[acc] {
-				isDuplicate = true
-			}
-		} else if row.DataType == "tk" {
-			if existingTks[tk] || insertedTks[tk] {
-				isDuplicate = true
-			}
-		} else if row.DataType == "account_tk" {
-			if (acc != "" && (existingAccs[acc] || insertedAccs[acc])) || (tk != "" && (existingTks[tk] || insertedTks[tk])) {
-				isDuplicate = true
-			}
-		}
-
-		if isDuplicate {
-			duplicateCount++
-			continue
-		}
-
-		if acc != "" {
-			insertedAccs[acc] = true
-		}
-		if tk != "" {
-			insertedTks[tk] = true
-		}
-
-		switch module {
-		case "cursor":
-			_, err = models.Orm.Insert(&models.PlatformAccountPoolCursor{
-				DataType:    strings.TrimSpace(row.DataType),
-				Account:     acc,
-				Password:    strings.TrimSpace(row.Password),
-				Token:       tk,
-				Remark:      strings.TrimSpace(row.Remark),
-				IsExtracted: 0,
-			})
-		case "windsurf":
-			_, err = models.Orm.Insert(&models.PlatformAccountPoolWindsurf{
-				DataType:    strings.TrimSpace(row.DataType),
-				Account:     acc,
-				Password:    strings.TrimSpace(row.Password),
-				Token:       tk,
-				Remark:      strings.TrimSpace(row.Remark),
-				IsExtracted: 0,
-			})
-		case "krio":
-			_, err = models.Orm.Insert(&models.PlatformAccountPoolKiro{
-				DataType:    strings.TrimSpace(row.DataType),
-				Account:     acc,
-				Password:    strings.TrimSpace(row.Password),
-				Token:       tk,
-				Remark:      strings.TrimSpace(row.Remark),
-				IsExtracted: 0,
-			})
-		case "codex":
-			_, err = models.Orm.Insert(&models.PlatformAccountPoolCodex{
-				DataType:    strings.TrimSpace(row.DataType),
-				Account:     acc,
-				Password:    strings.TrimSpace(row.Password),
-				Token:       tk,
-				Remark:      strings.TrimSpace(row.Remark),
-				IsExtracted: 0,
-			})
-		default:
-			poolJSONErr(c, 400, 400, "无效模块")
-			return
-		}
-		if err != nil {
-			poolJSONErr(c, 500, 500, "批量添加失败: "+err.Error())
-			return
-		}
-		successCount++
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "批量添加成功",
-		"data": map[string]interface{}{
-			"success_count":   successCount,
-			"duplicate_count": duplicateCount,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-func getPoolDetail(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		poolJSONErr(c, 400, 400, "无效ID")
-		return
-	}
-
-	switch module {
-	case "cursor":
-		var row models.PlatformAccountPoolCursor
-		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", id).One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "记录不存在")
-			return
-		}
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": row}
-	case "windsurf":
-		var row models.PlatformAccountPoolWindsurf
-		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", id).One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "记录不存在")
-			return
-		}
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": row}
-	case "krio":
-		var row models.PlatformAccountPoolKiro
-		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", id).One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "记录不存在")
-			return
-		}
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": row}
-	case "codex":
-		var row models.PlatformAccountPoolCodex
-		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", id).One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "记录不存在")
-			return
-		}
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": row}
-	default:
-		poolJSONErr(c, 400, 400, "无效模块")
-		return
-	}
-	_ = c.ServeJSON()
-}
-
-func extractPoolRow(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		ID        uint64 `json:"id"`
-		Type      string `json:"type"`
-		Platform  string `json:"platform"` // local | xianyu | taobao | pinduoduo | jingdong | douyin | ziyoushangcheng | xubei
-		Remark    string `json:"remark"`
-		Replenish bool   `json:"replenish"` // true 时写入 is_extracted=2（补号），否则为 1（已提取）
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	if !validExtractPlatform(payload.Platform) {
-		poolJSONErr(c, 400, 400, "提取平台错误")
-		return
-	}
-	if payload.Type != "" && !isValidPoolType(payload.Type) {
-		poolJSONErr(c, 400, 400, "提取类型错误")
-		return
-	}
-
-	now := time.Now()
-	platform := payload.Platform
-	remark := strings.TrimSpace(payload.Remark)
-	extractStatus := int8(1)
-	if payload.Replenish {
-		extractStatus = 2
-	}
-
-	switch module {
-	case "cursor":
-		var row models.PlatformAccountPoolCursor
-		qs := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("is_extracted", 0)
-		if payload.ID > 0 {
-			qs = qs.Filter("id", payload.ID)
-		} else if payload.Type != "" {
-			qs = qs.Filter("data_type", payload.Type)
-		}
-		if err := qs.OrderBy("id").One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "没有可提取数据")
-			return
-		}
-		_, err = models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", row.ID).Update(map[string]interface{}{
-			"is_extracted":       extractStatus,
-			"extracted_time":     now,
-			"extracted_platform": platform,
-			"remark":             remark,
-		})
-		if err != nil {
-			poolJSONErr(c, 500, 500, "提取失败: "+err.Error())
-			return
-		}
-		row.IsExtracted = extractStatus
-		row.ExtractedTime = &now
-		pf := platform
-		row.ExtractedPlatform = &pf
-		row.Remark = remark
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "提取成功", "data": row}
-	case "windsurf":
-		var row models.PlatformAccountPoolWindsurf
-		qs := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("is_extracted", 0)
-		if payload.ID > 0 {
-			qs = qs.Filter("id", payload.ID)
-		} else if payload.Type != "" {
-			qs = qs.Filter("data_type", payload.Type)
-		}
-		if err := qs.OrderBy("id").One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "没有可提取数据")
-			return
-		}
-		_, err = models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", row.ID).Update(map[string]interface{}{
-			"is_extracted":       extractStatus,
-			"extracted_time":     now,
-			"extracted_platform": platform,
-			"remark":             remark,
-		})
-		if err != nil {
-			poolJSONErr(c, 500, 500, "提取失败: "+err.Error())
-			return
-		}
-		row.IsExtracted = extractStatus
-		row.ExtractedTime = &now
-		pf := platform
-		row.ExtractedPlatform = &pf
-		row.Remark = remark
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "提取成功", "data": row}
-	case "krio":
-		var row models.PlatformAccountPoolKiro
-		qs := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("is_extracted", 0)
-		if payload.ID > 0 {
-			qs = qs.Filter("id", payload.ID)
-		} else if payload.Type != "" {
-			qs = qs.Filter("data_type", payload.Type)
-		}
-		if err := qs.OrderBy("id").One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "没有可提取数据")
-			return
-		}
-		_, err = models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", row.ID).Update(map[string]interface{}{
-			"is_extracted":       extractStatus,
-			"extracted_time":     now,
-			"extracted_platform": platform,
-			"remark":             remark,
-		})
-		if err != nil {
-			poolJSONErr(c, 500, 500, "提取失败: "+err.Error())
-			return
-		}
-		row.IsExtracted = extractStatus
-		row.ExtractedTime = &now
-		pf := platform
-		row.ExtractedPlatform = &pf
-		row.Remark = remark
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "提取成功", "data": row}
-	case "codex":
-		var row models.PlatformAccountPoolCodex
-		qs := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("is_extracted", 0)
-		if payload.ID > 0 {
-			qs = qs.Filter("id", payload.ID)
-		} else if payload.Type != "" {
-			qs = qs.Filter("data_type", payload.Type)
-		}
-		if err := qs.OrderBy("id").One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "没有可提取数据")
-			return
-		}
-		_, err = models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", row.ID).Update(map[string]interface{}{
-			"is_extracted":       extractStatus,
-			"extracted_time":     now,
-			"extracted_platform": platform,
-			"remark":             remark,
-		})
-		if err != nil {
-			poolJSONErr(c, 500, 500, "提取失败: "+err.Error())
-			return
-		}
-		row.IsExtracted = extractStatus
-		row.ExtractedTime = &now
-		pf := platform
-		row.ExtractedPlatform = &pf
-		row.Remark = remark
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "提取成功", "data": row}
-	default:
-		poolJSONErr(c, 400, 400, "无效模块")
-		return
-	}
-	_ = c.ServeJSON()
-}
-
-func replenishPoolRow(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		Type     string `json:"type"`
-		Platform string `json:"platform"`
-		Remark   string `json:"remark"`
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	if !isValidPoolType(payload.Type) {
-		poolJSONErr(c, 400, 400, "账号类型不正确")
-		return
-	}
-	validPlatforms := map[string]bool{"local": true, "xianyu": true, "pinduoduo": true, "jingdong": true, "douyin": true, "xubei": true}
-	if !validPlatforms[payload.Platform] {
-		poolJSONErr(c, 400, 400, "提取平台错误")
-		return
-	}
-
-	now := time.Now()
-	platform := payload.Platform
-	remark := strings.TrimSpace(payload.Remark)
-
-	replenishWithProbe(c, module, payload.Type, platform, remark, now)
-}
-
-type poolReplenishCandidate struct {
-	id       uint64
-	dataType string
-	token    string
-	isUsed   *int8
-	row      interface{}
-}
-
-type poolReplenishFetcher func() (*poolReplenishCandidate, error)
-
-// replenishWithProbe 按 id 顺序补号并探测；不可用则标记 is_extracted=2 后继续下一条。
-func replenishWithProbe(c *beego.Controller, module, dataType, platform, remark string, now time.Time) {
-	var fetch poolReplenishFetcher
-	switch module {
-	case "cursor":
-		fetch = func() (*poolReplenishCandidate, error) {
-			var row models.PlatformAccountPoolCursor
-			err := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).
-				Filter("is_extracted", 0).
-				Filter("data_type", dataType).
-				Filter("delete_time__isnull", true).
-				OrderBy("id").
-				One(&row)
-			if err != nil {
-				return nil, err
-			}
-			return &poolReplenishCandidate{
-				id: row.ID, dataType: row.DataType, token: row.Token, isUsed: row.IsUsed, row: row,
-			}, nil
-		}
-	case "windsurf":
-		fetch = func() (*poolReplenishCandidate, error) {
-			var row models.PlatformAccountPoolWindsurf
-			err := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).
-				Filter("is_extracted", 0).
-				Filter("data_type", dataType).
-				Filter("delete_time__isnull", true).
-				OrderBy("id").
-				One(&row)
-			if err != nil {
-				return nil, err
-			}
-			return &poolReplenishCandidate{
-				id: row.ID, dataType: row.DataType, token: row.Token, row: row,
-			}, nil
-		}
-	case "krio":
-		fetch = func() (*poolReplenishCandidate, error) {
-			var row models.PlatformAccountPoolKiro
-			err := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).
-				Filter("is_extracted", 0).
-				Filter("data_type", dataType).
-				Filter("delete_time__isnull", true).
-				OrderBy("id").
-				One(&row)
-			if err != nil {
-				return nil, err
-			}
-			return &poolReplenishCandidate{
-				id: row.ID, dataType: row.DataType, token: row.Token, row: row,
-			}, nil
-		}
-	case "codex":
-		fetch = func() (*poolReplenishCandidate, error) {
-			var row models.PlatformAccountPoolCodex
-			err := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).
-				Filter("is_extracted", 0).
-				Filter("data_type", dataType).
-				Filter("delete_time__isnull", true).
-				OrderBy("id").
-				One(&row)
-			if err != nil {
-				return nil, err
-			}
-			return &poolReplenishCandidate{
-				id: row.ID, dataType: row.DataType, token: row.Token, row: row,
-			}, nil
-		}
-	default:
-		poolJSONErr(c, 400, 400, "无效模块")
-		return
-	}
-
-	tableName := poolTableName(module)
-	if tableName == "" {
-		poolJSONErr(c, 400, 400, "无效模块")
-		return
-	}
-
-	for {
-		candidate, err := fetch()
-		if err != nil {
-			if err == orm.ErrNoRows {
-				poolJSONErr(c, 404, 404, "暂无可用账号")
-			} else {
-				poolJSONErr(c, 500, 500, "查询失败")
-			}
-			return
-		}
-
-		updateFields := map[string]interface{}{
-			"is_extracted":       int8(2),
-			"extracted_time":     now,
-			"extracted_platform": platform,
-			"remark":             remark,
-			"update_time":        now,
-		}
-		if _, err = models.Orm.QueryTable(tableName).
-			Filter("id", candidate.id).
-			Update(updateFields); err != nil {
-			poolJSONErr(c, 500, 500, "补号失败: "+err.Error())
-			return
-		}
-
-		if known, available := poolIsUsedAvailable(candidate.isUsed); known {
-			if !available {
-				continue
-			}
-		} else if !poolProbeToken(module, candidate.dataType, candidate.token, candidate.id) {
-			continue
-		}
-
-		data := replenishApplyResponse(candidate.row, platform, remark, now)
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "补号成功", "data": data}
-		_ = c.ServeJSON()
-		return
-	}
-}
-
-func replenishApplyResponse(row interface{}, platform, remark string, now time.Time) interface{} {
-	pf := platform
-	switch r := row.(type) {
-	case models.PlatformAccountPoolCursor:
-		r.IsExtracted = 2
-		r.ExtractedTime = &now
-		r.ExtractedPlatform = &pf
-		r.Remark = remark
-		if r.IsUsed == nil || *r.IsUsed != 1 {
-			used := int8(1)
-			r.IsUsed = &used
-		}
-		return r
-	case models.PlatformAccountPoolWindsurf:
-		r.IsExtracted = 2
-		r.ExtractedTime = &now
-		r.ExtractedPlatform = &pf
-		r.Remark = remark
-		return r
-	case models.PlatformAccountPoolKiro:
-		r.IsExtracted = 2
-		r.ExtractedTime = &now
-		r.ExtractedPlatform = &pf
-		r.Remark = remark
-		return r
-	case models.PlatformAccountPoolCodex:
-		r.IsExtracted = 2
-		r.ExtractedTime = &now
-		r.ExtractedPlatform = &pf
-		r.Remark = remark
-		return r
-	default:
-		return row
-	}
-}
-
-func updatePoolRemark(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		ID     uint64 `json:"id"`
-		Remark string `json:"remark"`
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	remark := strings.TrimSpace(payload.Remark)
-
-	var updated int64
-	switch module {
-	case "cursor":
-		updated, err = models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", payload.ID).Update(map[string]interface{}{
-			"remark": remark,
-		})
-	case "windsurf":
-		updated, err = models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", payload.ID).Update(map[string]interface{}{
-			"remark": remark,
-		})
-	case "krio":
-		updated, err = models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", payload.ID).Update(map[string]interface{}{
-			"remark": remark,
-		})
-	case "codex":
-		updated, err = models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", payload.ID).Update(map[string]interface{}{
-			"remark": remark,
-		})
-	default:
-		poolJSONErr(c, 400, 400, "无效模块")
-		return
-	}
-	if err != nil {
-		poolJSONErr(c, 500, 500, "备注更新失败: "+err.Error())
-		return
-	}
-	if updated == 0 {
-		poolJSONErr(c, 404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "备注更新成功"}
-	_ = c.ServeJSON()
-}
-
-func validExtractPlatform(platform string) bool {
-	switch platform {
-	case "local", "xianyu", "taobao", "pinduoduo", "jingdong", "douyin", "ziyoushangcheng", "xubei":
-		return true
-	default:
-		return false
-	}
-}
-
-func updatePoolExtractFields(module string, id uint64, fields map[string]interface{}) (int64, error) {
-	switch module {
-	case "cursor":
-		return models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", id).Update(fields)
-	case "windsurf":
-		return models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", id).Update(fields)
-	case "krio":
-		return models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", id).Update(fields)
-	case "codex":
-		return models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", id).Update(fields)
-	default:
-		return 0, fmt.Errorf("无效模块")
-	}
-}
-
-func setPoolUnavailable(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-
-	now := time.Now()
-	fields := map[string]interface{}{
-		"is_extracted":       int8(1),
-		"extracted_time":     now,
-		"extracted_platform": "local",
-		"update_time":        now,
-	}
-	if module == "cursor" {
-		fields["is_used"] = int8(0)
-	}
-	updated, err := updatePoolExtractFields(module, payload.ID, fields)
-	if err != nil {
-		poolJSONErr(c, 500, 500, "改不可用失败: "+err.Error())
-		return
-	}
-	if updated == 0 {
-		poolJSONErr(c, 404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "已标记不可用"}
-	_ = c.ServeJSON()
-}
-
-func updatePoolUsable(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	if module != "cursor" {
-		poolJSONErr(c, 400, 400, "该模块不支持可用状态修改")
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		ID     uint64 `json:"id"`
-		Usable int    `json:"usable"`
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	if payload.Usable != 0 && payload.Usable != 1 {
-		poolJSONErr(c, 400, 400, "可用状态参数错误")
-		return
-	}
-
-	now := time.Now()
-	updated, err := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", payload.ID).Update(orm.Params{
-		"is_used":     int8(payload.Usable),
-		"update_time": now,
-	})
-	if err != nil {
-		poolJSONErr(c, 500, 500, "可用状态更新失败: "+err.Error())
-		return
-	}
-	if updated == 0 {
-		poolJSONErr(c, 404, 404, "记录不存在")
-		return
-	}
-	msg := "已标记不可用"
-	if payload.Usable == 1 {
-		msg = "已标记可用"
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-func updatePoolPlatform(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		ID       uint64 `json:"id"`
-		Platform string `json:"platform"`
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	platform := strings.TrimSpace(payload.Platform)
-	if !validExtractPlatform(platform) {
-		poolJSONErr(c, 400, 400, "提取平台错误")
-		return
-	}
-
-	now := time.Now()
-	updated, err := updatePoolExtractFields(module, payload.ID, map[string]interface{}{
-		"extracted_platform": platform,
-		"update_time":        now,
-	})
-	if err != nil {
-		poolJSONErr(c, 500, 500, "平台更新失败: "+err.Error())
-		return
-	}
-	if updated == 0 {
-		poolJSONErr(c, 404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "平台更新成功"}
-	_ = c.ServeJSON()
-}
-
-func unextractPoolRow(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-
-	now := time.Now()
-	updated, err := updatePoolExtractFields(module, payload.ID, map[string]interface{}{
-		"is_extracted":       int8(0),
-		"extracted_time":     nil,
-		"extracted_platform": nil,
-		"update_time":        now,
-	})
-	if err != nil {
-		poolJSONErr(c, 500, 500, "反提取失败: "+err.Error())
-		return
-	}
-	if updated == 0 {
-		poolJSONErr(c, 404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "反提取成功"}
-	_ = c.ServeJSON()
-}
-
-func probePoolToken(c *beego.Controller, module string) {
-	if _, err := requirePlatformAuth(c); err != nil {
-		poolJSONErr(c, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-	var payload struct {
-		ID          uint64 `json:"id"`
-		AccessToken string `json:"accessToken"`
-		Token       string `json:"token"`
-	}
-	if err := json.Unmarshal(raw, &payload); err != nil {
-		poolJSONErr(c, 400, 400, "参数错误")
-		return
-	}
-
-	var token string
-	switch module {
-	case "cursor":
-		token = strings.TrimSpace(payload.AccessToken)
-		if token == "" {
-			token = strings.TrimSpace(payload.Token)
-		}
-		if token == "" {
-			if payload.ID == 0 {
-				poolJSONErr(c, 400, 400, "请传入 Cursor 的 accessToken（会话 JWT），或传 id 从库中读取")
-				return
-			}
-			var row models.PlatformAccountPoolCursor
-			if err := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", payload.ID).One(&row); err != nil {
-				poolJSONErr(c, 404, 404, "记录不存在")
-				return
-			}
-			token = strings.TrimSpace(row.Token)
-		}
-	case "windsurf":
-		if payload.ID == 0 {
-			poolJSONErr(c, 400, 400, "缺少有效 id")
-			return
-		}
-		var row models.PlatformAccountPoolWindsurf
-		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", payload.ID).One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "记录不存在")
-			return
-		}
-		token = strings.TrimSpace(row.Token)
-	case "krio":
-		if payload.ID == 0 {
-			poolJSONErr(c, 400, 400, "缺少有效 id")
-			return
-		}
-		var row models.PlatformAccountPoolKiro
-		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", payload.ID).One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "记录不存在")
-			return
-		}
-		token = strings.TrimSpace(row.Token)
-	case "codex":
-		if payload.ID == 0 {
-			poolJSONErr(c, 400, 400, "缺少有效 id")
-			return
-		}
-		var row models.PlatformAccountPoolCodex
-		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", payload.ID).One(&row); err != nil {
-			poolJSONErr(c, 404, 404, "记录不存在")
-			return
-		}
-		token = strings.TrimSpace(row.Token)
-	default:
-		poolJSONErr(c, 400, 400, "无效模块")
-		return
-	}
-
-	if token == "" {
-		poolJSONErr(c, 400, 400, "该记录无 Token，无法探测")
-		return
-	}
-
-	r := tokenprobe.ProbeOfficial(module, token)
-	data := map[string]interface{}{
-		"ok":         r.OK,
-		"detail":     r.Detail,
-		"httpStatus": r.HTTPStatus,
-	}
-	if r.ProbeMessage != "" {
-		data["probeMessage"] = r.ProbeMessage
-	}
-	if r.Endpoint != "" {
-		data["endpoint"] = r.Endpoint
-	}
-	if r.BytesRead > 0 {
-		data["bytesRead"] = r.BytesRead
-	}
-	if r.RawPreview != "" {
-		data["rawPreview"] = r.RawPreview
-	}
-	if r.RequestBodyPrefixHex != "" {
-		data["requestBodyPrefixHex"] = r.RequestBodyPrefixHex
-	}
-	if r.StreamProtocol != "" {
-		data["streamProtocol"] = r.StreamProtocol
-	}
-	if r.StreamNote != "" {
-		data["streamNote"] = r.StreamNote
-	}
-	if module == "cursor" && payload.ID > 0 && r.HTTPStatus == http.StatusOK {
-		var isUsed int8
-		if r.OK {
-			isUsed = 1
-		} else {
-			isUsed = 0
-		}
-		if _, uerr := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", payload.ID).Update(orm.Params{
-			"is_used":     isUsed,
-			"update_time": time.Now(),
-		}); uerr == nil {
-			data["is_used"] = int(isUsed)
-		}
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": data,
-	}
-	_ = c.ServeJSON()
-}
-
-func (c *PlatformAccountPoolCursorController) List()      { listPoolRows(&c.Controller, "cursor") }
-func (c *PlatformAccountPoolCursorController) Add()       { addPoolRow(&c.Controller, "cursor") }
-func (c *PlatformAccountPoolCursorController) BatchAdd()  { batchAddPoolRows(&c.Controller, "cursor") }
-func (c *PlatformAccountPoolCursorController) Detail()    { getPoolDetail(&c.Controller, "cursor") }
-func (c *PlatformAccountPoolCursorController) Extract()   { extractPoolRow(&c.Controller, "cursor") }
-func (c *PlatformAccountPoolCursorController) Replenish() { replenishPoolRow(&c.Controller, "cursor") }
-func (c *PlatformAccountPoolCursorController) UpdateRemark() {
-	updatePoolRemark(&c.Controller, "cursor")
-}
-func (c *PlatformAccountPoolCursorController) SetUnavailable() {
-	setPoolUnavailable(&c.Controller, "cursor")
-}
-func (c *PlatformAccountPoolCursorController) UpdateUsable() {
-	updatePoolUsable(&c.Controller, "cursor")
-}
-func (c *PlatformAccountPoolCursorController) UpdatePlatform() {
-	updatePoolPlatform(&c.Controller, "cursor")
-}
-func (c *PlatformAccountPoolCursorController) Unextract()  { unextractPoolRow(&c.Controller, "cursor") }
-func (c *PlatformAccountPoolCursorController) ProbeToken() { probePoolToken(&c.Controller, "cursor") }
-
-func (c *PlatformAccountPoolWindsurfController) List() { listPoolRows(&c.Controller, "windsurf") }
-func (c *PlatformAccountPoolWindsurfController) Add()  { addPoolRow(&c.Controller, "windsurf") }
-func (c *PlatformAccountPoolWindsurfController) BatchAdd() {
-	batchAddPoolRows(&c.Controller, "windsurf")
-}
-func (c *PlatformAccountPoolWindsurfController) Detail()  { getPoolDetail(&c.Controller, "windsurf") }
-func (c *PlatformAccountPoolWindsurfController) Extract() { extractPoolRow(&c.Controller, "windsurf") }
-func (c *PlatformAccountPoolWindsurfController) Replenish() {
-	replenishPoolRow(&c.Controller, "windsurf")
-}
-func (c *PlatformAccountPoolWindsurfController) UpdateRemark() {
-	updatePoolRemark(&c.Controller, "windsurf")
-}
-func (c *PlatformAccountPoolWindsurfController) SetUnavailable() {
-	setPoolUnavailable(&c.Controller, "windsurf")
-}
-func (c *PlatformAccountPoolWindsurfController) UpdatePlatform() {
-	updatePoolPlatform(&c.Controller, "windsurf")
-}
-func (c *PlatformAccountPoolWindsurfController) Unextract() {
-	unextractPoolRow(&c.Controller, "windsurf")
-}
-func (c *PlatformAccountPoolWindsurfController) ProbeToken() {
-	probePoolToken(&c.Controller, "windsurf")
-}
-
-func (c *PlatformAccountPoolKrioController) List()      { listPoolRows(&c.Controller, "krio") }
-func (c *PlatformAccountPoolKrioController) Add()       { addPoolRow(&c.Controller, "krio") }
-func (c *PlatformAccountPoolKrioController) BatchAdd()  { batchAddPoolRows(&c.Controller, "krio") }
-func (c *PlatformAccountPoolKrioController) Detail()    { getPoolDetail(&c.Controller, "krio") }
-func (c *PlatformAccountPoolKrioController) Extract()   { extractPoolRow(&c.Controller, "krio") }
-func (c *PlatformAccountPoolKrioController) Replenish() { replenishPoolRow(&c.Controller, "krio") }
-func (c *PlatformAccountPoolKrioController) UpdateRemark() {
-	updatePoolRemark(&c.Controller, "krio")
-}
-func (c *PlatformAccountPoolKrioController) SetUnavailable() {
-	setPoolUnavailable(&c.Controller, "krio")
-}
-func (c *PlatformAccountPoolKrioController) UpdatePlatform() {
-	updatePoolPlatform(&c.Controller, "krio")
-}
-func (c *PlatformAccountPoolKrioController) Unextract()  { unextractPoolRow(&c.Controller, "krio") }
-func (c *PlatformAccountPoolKrioController) ProbeToken() { probePoolToken(&c.Controller, "krio") }
-
-func (c *PlatformAccountPoolCodexController) List()      { listPoolRows(&c.Controller, "codex") }
-func (c *PlatformAccountPoolCodexController) Add()       { addPoolRow(&c.Controller, "codex") }
-func (c *PlatformAccountPoolCodexController) BatchAdd()  { batchAddPoolRows(&c.Controller, "codex") }
-func (c *PlatformAccountPoolCodexController) Detail()    { getPoolDetail(&c.Controller, "codex") }
-func (c *PlatformAccountPoolCodexController) Extract()   { extractPoolRow(&c.Controller, "codex") }
-func (c *PlatformAccountPoolCodexController) Replenish() { replenishPoolRow(&c.Controller, "codex") }
-func (c *PlatformAccountPoolCodexController) UpdateRemark() {
-	updatePoolRemark(&c.Controller, "codex")
-}
-func (c *PlatformAccountPoolCodexController) SetUnavailable() {
-	setPoolUnavailable(&c.Controller, "codex")
-}
-func (c *PlatformAccountPoolCodexController) UpdatePlatform() {
-	updatePoolPlatform(&c.Controller, "codex")
-}
-func (c *PlatformAccountPoolCodexController) Unextract()  { unextractPoolRow(&c.Controller, "codex") }
-func (c *PlatformAccountPoolCodexController) ProbeToken() { probePoolToken(&c.Controller, "codex") }
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+	"server/pkg/tokenprobe"
+
+	"github.com/beego/beego/v2/client/orm"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type PlatformAccountPoolCursorController struct{ beego.Controller }
+type PlatformAccountPoolWindsurfController struct{ beego.Controller }
+type PlatformAccountPoolKrioController struct{ beego.Controller }
+type PlatformAccountPoolCodexController struct{ beego.Controller }
+
+type accountPoolCreateRow struct {
+	DataType string `json:"type"`
+	Account  string `json:"account"`
+	Password string `json:"password"`
+	Token    string `json:"token"`
+	Remark   string `json:"remark"`
+}
+
+func requirePlatformAuth(c *beego.Controller) (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+func poolJSONErr(c *beego.Controller, httpStatus, code int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": code, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+func isValidPoolType(t string) bool {
+	return t == "account" || t == "tk" || t == "account_tk"
+}
+
+func validateCreateRow(row accountPoolCreateRow) error {
+	if !isValidPoolType(row.DataType) {
+		return fmt.Errorf("账号类型不正确")
+	}
+	row.Account = strings.TrimSpace(row.Account)
+	row.Password = strings.TrimSpace(row.Password)
+	row.Token = strings.TrimSpace(row.Token)
+	if row.DataType == "account" && (row.Account == "" || row.Password == "") {
+		return fmt.Errorf("账号密码类型必须填写账号和密码")
+	}
+	if row.DataType == "tk" && row.Token == "" {
+		return fmt.Errorf("token类型必须填写token")
+	}
+	if row.DataType == "account_tk" && (row.Account == "" || row.Token == "") {
+		return fmt.Errorf("账号密码+token类型必须填写账号和token，密码可为空")
+	}
+	return nil
+}
+
+// accountPoolListWhere 列表筛选（与各号池表字段一致）
+func accountPoolListWhere(dataType, status, platform, keyword, account, token, remark string) (where string, args []interface{}) {
+	var parts []string
+	if dataType != "" && isValidPoolType(dataType) {
+		parts = append(parts, "data_type = ?")
+		args = append(args, dataType)
+	}
+	switch status {
+	case "unused":
+		parts = append(parts, "is_extracted = ?")
+		args = append(args, int8(0))
+	case "extracted":
+		parts = append(parts, "is_extracted = ?")
+		args = append(args, int8(1))
+	case "replenished":
+		parts = append(parts, "is_extracted = ?")
+		args = append(args, int8(2))
+	case "renewed":
+		parts = append(parts, "is_extracted = ?")
+		args = append(args, int8(3))
+	}
+	if p := strings.TrimSpace(platform); p != "" {
+		parts = append(parts, "extracted_platform = ?")
+		args = append(args, p)
+	}
+	if acc := strings.TrimSpace(account); acc != "" {
+		parts = append(parts, "account LIKE ?")
+		args = append(args, "%"+acc+"%")
+	}
+	if tk := strings.TrimSpace(token); tk != "" {
+		parts = append(parts, "token LIKE ?")
+		args = append(args, "%"+tk+"%")
+	}
+	if rm := strings.TrimSpace(remark); rm != "" {
+		parts = append(parts, "remark LIKE ?")
+		args = append(args, "%"+rm+"%")
+	}
+	// 兼容旧版前端 keyword 参数：仅作为账号查询，不再合并 token/备注。
+	if kw := strings.TrimSpace(keyword); kw != "" {
+		parts = append(parts, "account LIKE ?")
+		args = append(args, "%"+kw+"%")
+	}
+	if len(parts) == 0 {
+		return "1=1", args
+	}
+	return strings.Join(parts, " AND "), args
+}
+
+func accountPoolCountMySQL(table, where string, whereArgs []interface{}) (int64, error) {
+	sqlStr := fmt.Sprintf("SELECT COUNT(*) AS cnt FROM `%s` WHERE %s", table, where)
+	var maps []orm.Params
+	_, err := models.Orm.Raw(sqlStr, whereArgs...).Values(&maps)
+	if err != nil {
+		return 0, err
+	}
+	if len(maps) == 0 {
+		return 0, nil
+	}
+	return paramsCellToInt64(maps[0]["cnt"]), nil
+}
+
+func paramsCellToInt64(v interface{}) int64 {
+	if v == nil {
+		return 0
+	}
+	switch x := v.(type) {
+	case []byte:
+		n, _ := strconv.ParseInt(strings.TrimSpace(string(x)), 10, 64)
+		return n
+	case int64:
+		return x
+	case int32:
+		return int64(x)
+	case int:
+		return int64(x)
+	default:
+		n, _ := strconv.ParseInt(strings.TrimSpace(fmt.Sprint(x)), 10, 64)
+		return n
+	}
+}
+
+func listPoolRows(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 30)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 30
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+	keyword := strings.TrimSpace(c.GetString("keyword"))
+	account := strings.TrimSpace(c.GetString("account"))
+	token := strings.TrimSpace(c.GetString("token"))
+	remark := strings.TrimSpace(c.GetString("remark"))
+	dataType := strings.TrimSpace(c.GetString("type"))
+	status := strings.TrimSpace(c.GetString("status"))
+	platform := strings.TrimSpace(c.GetString("platform"))
+
+	where, whereArgs := accountPoolListWhere(dataType, status, platform, keyword, account, token, remark)
+	if module == "cursor" {
+		u := strings.TrimSpace(c.GetString("usable"))
+		if u == "1" || u == "0" {
+			if v, err := strconv.ParseInt(u, 10, 8); err == nil {
+				where = "(" + where + ") AND is_used = ?"
+				whereArgs = append(whereArgs, int8(v))
+			}
+		}
+	}
+	offset := (page - 1) * pageSize
+
+	var list interface{}
+	var total int64
+	var err error
+
+	switch module {
+	case "cursor":
+		table := (&models.PlatformAccountPoolCursor{}).TableName()
+		total, err = accountPoolCountMySQL(table, where, whereArgs)
+		if err != nil {
+			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
+			return
+		}
+		sqlStr := fmt.Sprintf(
+			"SELECT * FROM `%s` WHERE %s ORDER BY FIELD(is_extracted, 0, 2, 3, 1) ASC, id DESC LIMIT ? OFFSET ?",
+			table, where,
+		)
+		args := append(append([]interface{}{}, whereArgs...), pageSize, offset)
+		var rows []models.PlatformAccountPoolCursor
+		_, err = models.Orm.Raw(sqlStr, args...).QueryRows(&rows)
+		if err != nil && err != orm.ErrNoRows {
+			poolJSONErr(c, 500, 500, "cursor查询失败: "+err.Error())
+			return
+		}
+		if rows == nil {
+			rows = []models.PlatformAccountPoolCursor{}
+		}
+		list = rows
+	case "windsurf":
+		table := (&models.PlatformAccountPoolWindsurf{}).TableName()
+		total, err = accountPoolCountMySQL(table, where, whereArgs)
+		if err != nil {
+			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
+			return
+		}
+		sqlStr := fmt.Sprintf(
+			"SELECT * FROM `%s` WHERE %s ORDER BY FIELD(is_extracted, 0, 2, 3, 1) ASC, id DESC LIMIT ? OFFSET ?",
+			table, where,
+		)
+		args := append(append([]interface{}{}, whereArgs...), pageSize, offset)
+		var rows []models.PlatformAccountPoolWindsurf
+		_, err = models.Orm.Raw(sqlStr, args...).QueryRows(&rows)
+		if err != nil && err != orm.ErrNoRows {
+			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
+			return
+		}
+		if rows == nil {
+			rows = []models.PlatformAccountPoolWindsurf{}
+		}
+		list = rows
+	case "krio":
+		table := (&models.PlatformAccountPoolKiro{}).TableName()
+		total, err = accountPoolCountMySQL(table, where, whereArgs)
+		if err != nil {
+			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
+			return
+		}
+		sqlStr := fmt.Sprintf(
+			"SELECT * FROM `%s` WHERE %s ORDER BY FIELD(is_extracted, 0, 2, 3, 1) ASC, id DESC LIMIT ? OFFSET ?",
+			table, where,
+		)
+		args := append(append([]interface{}{}, whereArgs...), pageSize, offset)
+		var rows []models.PlatformAccountPoolKiro
+		_, err = models.Orm.Raw(sqlStr, args...).QueryRows(&rows)
+		if err != nil && err != orm.ErrNoRows {
+			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
+			return
+		}
+		if rows == nil {
+			rows = []models.PlatformAccountPoolKiro{}
+		}
+		list = rows
+	case "codex":
+		table := (&models.PlatformAccountPoolCodex{}).TableName()
+		total, err = accountPoolCountMySQL(table, where, whereArgs)
+		if err != nil {
+			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
+			return
+		}
+		sqlStr := fmt.Sprintf(
+			"SELECT * FROM `%s` WHERE %s ORDER BY FIELD(is_extracted, 0, 2, 3, 1) ASC, id DESC LIMIT ? OFFSET ?",
+			table, where,
+		)
+		args := append(append([]interface{}{}, whereArgs...), pageSize, offset)
+		var rows []models.PlatformAccountPoolCodex
+		_, err = models.Orm.Raw(sqlStr, args...).QueryRows(&rows)
+		if err != nil && err != orm.ErrNoRows {
+			poolJSONErr(c, 500, 500, "获取列表失败: "+err.Error())
+			return
+		}
+		if rows == nil {
+			rows = []models.PlatformAccountPoolCodex{}
+		}
+		list = rows
+	default:
+		poolJSONErr(c, 400, 400, "无效模块")
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"list":  list,
+			"total": total,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+func addPoolRow(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var row accountPoolCreateRow
+	if err := json.Unmarshal(raw, &row); err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	if err := validateCreateRow(row); err != nil {
+		poolJSONErr(c, 400, 400, err.Error())
+		return
+	}
+
+	switch module {
+	case "cursor":
+		r := &models.PlatformAccountPoolCursor{
+			DataType:    strings.TrimSpace(row.DataType),
+			Account:     strings.TrimSpace(row.Account),
+			Password:    strings.TrimSpace(row.Password),
+			Token:       strings.TrimSpace(row.Token),
+			Remark:      strings.TrimSpace(row.Remark),
+			IsExtracted: 0,
+		}
+		_, err = models.Orm.Insert(r)
+	case "windsurf":
+		r := &models.PlatformAccountPoolWindsurf{
+			DataType:    strings.TrimSpace(row.DataType),
+			Account:     strings.TrimSpace(row.Account),
+			Password:    strings.TrimSpace(row.Password),
+			Token:       strings.TrimSpace(row.Token),
+			Remark:      strings.TrimSpace(row.Remark),
+			IsExtracted: 0,
+		}
+		_, err = models.Orm.Insert(r)
+	case "krio":
+		r := &models.PlatformAccountPoolKiro{
+			DataType:    strings.TrimSpace(row.DataType),
+			Account:     strings.TrimSpace(row.Account),
+			Password:    strings.TrimSpace(row.Password),
+			Token:       strings.TrimSpace(row.Token),
+			Remark:      strings.TrimSpace(row.Remark),
+			IsExtracted: 0,
+		}
+		_, err = models.Orm.Insert(r)
+	case "codex":
+		r := &models.PlatformAccountPoolCodex{
+			DataType:    strings.TrimSpace(row.DataType),
+			Account:     strings.TrimSpace(row.Account),
+			Password:    strings.TrimSpace(row.Password),
+			Token:       strings.TrimSpace(row.Token),
+			Remark:      strings.TrimSpace(row.Remark),
+			IsExtracted: 0,
+		}
+		_, err = models.Orm.Insert(r)
+	default:
+		poolJSONErr(c, 400, 400, "无效模块")
+		return
+	}
+	if err != nil {
+		poolJSONErr(c, 500, 500, "添加失败: "+err.Error())
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "添加成功"}
+	_ = c.ServeJSON()
+}
+
+func batchAddPoolRows(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		Rows []accountPoolCreateRow `json:"rows"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil || len(payload.Rows) == 0 {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	for _, row := range payload.Rows {
+		if err := validateCreateRow(row); err != nil {
+			poolJSONErr(c, 400, 400, err.Error())
+			return
+		}
+	}
+	var accounts []string
+	var tokens []string
+	seenAccs := make(map[string]bool)
+	seenTks := make(map[string]bool)
+
+	for _, row := range payload.Rows {
+		acc := strings.TrimSpace(row.Account)
+		tk := strings.TrimSpace(row.Token)
+		if acc != "" && !seenAccs[acc] {
+			seenAccs[acc] = true
+			accounts = append(accounts, acc)
+		}
+		if tk != "" && !seenTks[tk] {
+			seenTks[tk] = true
+			tokens = append(tokens, tk)
+		}
+	}
+
+	existingAccs := make(map[string]bool)
+	existingTks := make(map[string]bool)
+
+	if len(accounts) > 0 || len(tokens) > 0 {
+		condObj := orm.NewCondition()
+		subCond := orm.NewCondition()
+		if len(accounts) > 0 {
+			subCond = subCond.Or("account__in", accounts)
+		}
+		if len(tokens) > 0 {
+			subCond = subCond.Or("token__in", tokens)
+		}
+
+		switch module {
+		case "cursor":
+			var dbRows []models.PlatformAccountPoolCursor
+			cond := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("delete_time__isnull", true)
+			cond = cond.SetCond(condObj.AndCond(subCond))
+			if _, err := cond.All(&dbRows, "account", "token"); err == nil {
+				for _, r := range dbRows {
+					if r.Account != "" {
+						existingAccs[r.Account] = true
+					}
+					if r.Token != "" {
+						existingTks[r.Token] = true
+					}
+				}
+			}
+		case "windsurf":
+			var dbRows []models.PlatformAccountPoolWindsurf
+			cond := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("delete_time__isnull", true)
+			cond = cond.SetCond(condObj.AndCond(subCond))
+			if _, err := cond.All(&dbRows, "account", "token"); err == nil {
+				for _, r := range dbRows {
+					if r.Account != "" {
+						existingAccs[r.Account] = true
+					}
+					if r.Token != "" {
+						existingTks[r.Token] = true
+					}
+				}
+			}
+		case "krio":
+			var dbRows []models.PlatformAccountPoolKiro
+			cond := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("delete_time__isnull", true)
+			cond = cond.SetCond(condObj.AndCond(subCond))
+			if _, err := cond.All(&dbRows, "account", "token"); err == nil {
+				for _, r := range dbRows {
+					if r.Account != "" {
+						existingAccs[r.Account] = true
+					}
+					if r.Token != "" {
+						existingTks[r.Token] = true
+					}
+				}
+			}
+		case "codex":
+			var dbRows []models.PlatformAccountPoolCodex
+			cond := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("delete_time__isnull", true)
+			cond = cond.SetCond(condObj.AndCond(subCond))
+			if _, err := cond.All(&dbRows, "account", "token"); err == nil {
+				for _, r := range dbRows {
+					if r.Account != "" {
+						existingAccs[r.Account] = true
+					}
+					if r.Token != "" {
+						existingTks[r.Token] = true
+					}
+				}
+			}
+		}
+	}
+
+	insertedAccs := make(map[string]bool)
+	insertedTks := make(map[string]bool)
+
+	var successCount int
+	var duplicateCount int
+
+	for _, row := range payload.Rows {
+		acc := strings.TrimSpace(row.Account)
+		tk := strings.TrimSpace(row.Token)
+
+		isDuplicate := false
+		if row.DataType == "account" {
+			if existingAccs[acc] || insertedAccs[acc] {
+				isDuplicate = true
+			}
+		} else if row.DataType == "tk" {
+			if existingTks[tk] || insertedTks[tk] {
+				isDuplicate = true
+			}
+		} else if row.DataType == "account_tk" {
+			if (acc != "" && (existingAccs[acc] || insertedAccs[acc])) || (tk != "" && (existingTks[tk] || insertedTks[tk])) {
+				isDuplicate = true
+			}
+		}
+
+		if isDuplicate {
+			duplicateCount++
+			continue
+		}
+
+		if acc != "" {
+			insertedAccs[acc] = true
+		}
+		if tk != "" {
+			insertedTks[tk] = true
+		}
+
+		switch module {
+		case "cursor":
+			_, err = models.Orm.Insert(&models.PlatformAccountPoolCursor{
+				DataType:    strings.TrimSpace(row.DataType),
+				Account:     acc,
+				Password:    strings.TrimSpace(row.Password),
+				Token:       tk,
+				Remark:      strings.TrimSpace(row.Remark),
+				IsExtracted: 0,
+			})
+		case "windsurf":
+			_, err = models.Orm.Insert(&models.PlatformAccountPoolWindsurf{
+				DataType:    strings.TrimSpace(row.DataType),
+				Account:     acc,
+				Password:    strings.TrimSpace(row.Password),
+				Token:       tk,
+				Remark:      strings.TrimSpace(row.Remark),
+				IsExtracted: 0,
+			})
+		case "krio":
+			_, err = models.Orm.Insert(&models.PlatformAccountPoolKiro{
+				DataType:    strings.TrimSpace(row.DataType),
+				Account:     acc,
+				Password:    strings.TrimSpace(row.Password),
+				Token:       tk,
+				Remark:      strings.TrimSpace(row.Remark),
+				IsExtracted: 0,
+			})
+		case "codex":
+			_, err = models.Orm.Insert(&models.PlatformAccountPoolCodex{
+				DataType:    strings.TrimSpace(row.DataType),
+				Account:     acc,
+				Password:    strings.TrimSpace(row.Password),
+				Token:       tk,
+				Remark:      strings.TrimSpace(row.Remark),
+				IsExtracted: 0,
+			})
+		default:
+			poolJSONErr(c, 400, 400, "无效模块")
+			return
+		}
+		if err != nil {
+			poolJSONErr(c, 500, 500, "批量添加失败: "+err.Error())
+			return
+		}
+		successCount++
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "批量添加成功",
+		"data": map[string]interface{}{
+			"success_count":   successCount,
+			"duplicate_count": duplicateCount,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+func getPoolDetail(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		poolJSONErr(c, 400, 400, "无效ID")
+		return
+	}
+
+	switch module {
+	case "cursor":
+		var row models.PlatformAccountPoolCursor
+		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", id).One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "记录不存在")
+			return
+		}
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": row}
+	case "windsurf":
+		var row models.PlatformAccountPoolWindsurf
+		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", id).One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "记录不存在")
+			return
+		}
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": row}
+	case "krio":
+		var row models.PlatformAccountPoolKiro
+		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", id).One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "记录不存在")
+			return
+		}
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": row}
+	case "codex":
+		var row models.PlatformAccountPoolCodex
+		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", id).One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "记录不存在")
+			return
+		}
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": row}
+	default:
+		poolJSONErr(c, 400, 400, "无效模块")
+		return
+	}
+	_ = c.ServeJSON()
+}
+
+func extractPoolRow(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		ID        uint64 `json:"id"`
+		Type      string `json:"type"`
+		Platform  string `json:"platform"` // local | xianyu | taobao | pinduoduo | jingdong | douyin | ziyoushangcheng | xubei
+		Remark    string `json:"remark"`
+		Replenish bool   `json:"replenish"` // true 时写入 is_extracted=2（补号），否则为 1（已提取）
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	if !validExtractPlatform(payload.Platform) {
+		poolJSONErr(c, 400, 400, "提取平台错误")
+		return
+	}
+	if payload.Type != "" && !isValidPoolType(payload.Type) {
+		poolJSONErr(c, 400, 400, "提取类型错误")
+		return
+	}
+
+	now := time.Now()
+	platform := payload.Platform
+	remark := strings.TrimSpace(payload.Remark)
+	extractStatus := int8(1)
+	if payload.Replenish {
+		extractStatus = 2
+	}
+
+	switch module {
+	case "cursor":
+		var row models.PlatformAccountPoolCursor
+		qs := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("is_extracted", 0)
+		if payload.ID > 0 {
+			qs = qs.Filter("id", payload.ID)
+		} else if payload.Type != "" {
+			qs = qs.Filter("data_type", payload.Type)
+		}
+		if err := qs.OrderBy("id").One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "没有可提取数据")
+			return
+		}
+		_, err = models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", row.ID).Update(map[string]interface{}{
+			"is_extracted":       extractStatus,
+			"extracted_time":     now,
+			"extracted_platform": platform,
+			"remark":             remark,
+		})
+		if err != nil {
+			poolJSONErr(c, 500, 500, "提取失败: "+err.Error())
+			return
+		}
+		row.IsExtracted = extractStatus
+		row.ExtractedTime = &now
+		pf := platform
+		row.ExtractedPlatform = &pf
+		row.Remark = remark
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "提取成功", "data": row}
+	case "windsurf":
+		var row models.PlatformAccountPoolWindsurf
+		qs := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("is_extracted", 0)
+		if payload.ID > 0 {
+			qs = qs.Filter("id", payload.ID)
+		} else if payload.Type != "" {
+			qs = qs.Filter("data_type", payload.Type)
+		}
+		if err := qs.OrderBy("id").One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "没有可提取数据")
+			return
+		}
+		_, err = models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", row.ID).Update(map[string]interface{}{
+			"is_extracted":       extractStatus,
+			"extracted_time":     now,
+			"extracted_platform": platform,
+			"remark":             remark,
+		})
+		if err != nil {
+			poolJSONErr(c, 500, 500, "提取失败: "+err.Error())
+			return
+		}
+		row.IsExtracted = extractStatus
+		row.ExtractedTime = &now
+		pf := platform
+		row.ExtractedPlatform = &pf
+		row.Remark = remark
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "提取成功", "data": row}
+	case "krio":
+		var row models.PlatformAccountPoolKiro
+		qs := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("is_extracted", 0)
+		if payload.ID > 0 {
+			qs = qs.Filter("id", payload.ID)
+		} else if payload.Type != "" {
+			qs = qs.Filter("data_type", payload.Type)
+		}
+		if err := qs.OrderBy("id").One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "没有可提取数据")
+			return
+		}
+		_, err = models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", row.ID).Update(map[string]interface{}{
+			"is_extracted":       extractStatus,
+			"extracted_time":     now,
+			"extracted_platform": platform,
+			"remark":             remark,
+		})
+		if err != nil {
+			poolJSONErr(c, 500, 500, "提取失败: "+err.Error())
+			return
+		}
+		row.IsExtracted = extractStatus
+		row.ExtractedTime = &now
+		pf := platform
+		row.ExtractedPlatform = &pf
+		row.Remark = remark
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "提取成功", "data": row}
+	case "codex":
+		var row models.PlatformAccountPoolCodex
+		qs := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("is_extracted", 0)
+		if payload.ID > 0 {
+			qs = qs.Filter("id", payload.ID)
+		} else if payload.Type != "" {
+			qs = qs.Filter("data_type", payload.Type)
+		}
+		if err := qs.OrderBy("id").One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "没有可提取数据")
+			return
+		}
+		_, err = models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", row.ID).Update(map[string]interface{}{
+			"is_extracted":       extractStatus,
+			"extracted_time":     now,
+			"extracted_platform": platform,
+			"remark":             remark,
+		})
+		if err != nil {
+			poolJSONErr(c, 500, 500, "提取失败: "+err.Error())
+			return
+		}
+		row.IsExtracted = extractStatus
+		row.ExtractedTime = &now
+		pf := platform
+		row.ExtractedPlatform = &pf
+		row.Remark = remark
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "提取成功", "data": row}
+	default:
+		poolJSONErr(c, 400, 400, "无效模块")
+		return
+	}
+	_ = c.ServeJSON()
+}
+
+func replenishPoolRow(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		Type     string `json:"type"`
+		Platform string `json:"platform"`
+		Remark   string `json:"remark"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	if !isValidPoolType(payload.Type) {
+		poolJSONErr(c, 400, 400, "账号类型不正确")
+		return
+	}
+	validPlatforms := map[string]bool{"local": true, "xianyu": true, "pinduoduo": true, "jingdong": true, "douyin": true, "xubei": true}
+	if !validPlatforms[payload.Platform] {
+		poolJSONErr(c, 400, 400, "提取平台错误")
+		return
+	}
+
+	now := time.Now()
+	platform := payload.Platform
+	remark := strings.TrimSpace(payload.Remark)
+
+	replenishWithProbe(c, module, payload.Type, platform, remark, now)
+}
+
+type poolReplenishCandidate struct {
+	id       uint64
+	dataType string
+	token    string
+	isUsed   *int8
+	row      interface{}
+}
+
+type poolReplenishFetcher func() (*poolReplenishCandidate, error)
+
+// replenishWithProbe 按 id 顺序补号并探测；不可用则标记 is_extracted=2 后继续下一条。
+func replenishWithProbe(c *beego.Controller, module, dataType, platform, remark string, now time.Time) {
+	var fetch poolReplenishFetcher
+	switch module {
+	case "cursor":
+		fetch = func() (*poolReplenishCandidate, error) {
+			var row models.PlatformAccountPoolCursor
+			err := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).
+				Filter("is_extracted", 0).
+				Filter("data_type", dataType).
+				Filter("delete_time__isnull", true).
+				OrderBy("id").
+				One(&row)
+			if err != nil {
+				return nil, err
+			}
+			return &poolReplenishCandidate{
+				id: row.ID, dataType: row.DataType, token: row.Token, isUsed: row.IsUsed, row: row,
+			}, nil
+		}
+	case "windsurf":
+		fetch = func() (*poolReplenishCandidate, error) {
+			var row models.PlatformAccountPoolWindsurf
+			err := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).
+				Filter("is_extracted", 0).
+				Filter("data_type", dataType).
+				Filter("delete_time__isnull", true).
+				OrderBy("id").
+				One(&row)
+			if err != nil {
+				return nil, err
+			}
+			return &poolReplenishCandidate{
+				id: row.ID, dataType: row.DataType, token: row.Token, row: row,
+			}, nil
+		}
+	case "krio":
+		fetch = func() (*poolReplenishCandidate, error) {
+			var row models.PlatformAccountPoolKiro
+			err := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).
+				Filter("is_extracted", 0).
+				Filter("data_type", dataType).
+				Filter("delete_time__isnull", true).
+				OrderBy("id").
+				One(&row)
+			if err != nil {
+				return nil, err
+			}
+			return &poolReplenishCandidate{
+				id: row.ID, dataType: row.DataType, token: row.Token, row: row,
+			}, nil
+		}
+	case "codex":
+		fetch = func() (*poolReplenishCandidate, error) {
+			var row models.PlatformAccountPoolCodex
+			err := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).
+				Filter("is_extracted", 0).
+				Filter("data_type", dataType).
+				Filter("delete_time__isnull", true).
+				OrderBy("id").
+				One(&row)
+			if err != nil {
+				return nil, err
+			}
+			return &poolReplenishCandidate{
+				id: row.ID, dataType: row.DataType, token: row.Token, row: row,
+			}, nil
+		}
+	default:
+		poolJSONErr(c, 400, 400, "无效模块")
+		return
+	}
+
+	tableName := poolTableName(module)
+	if tableName == "" {
+		poolJSONErr(c, 400, 400, "无效模块")
+		return
+	}
+
+	for {
+		candidate, err := fetch()
+		if err != nil {
+			if err == orm.ErrNoRows {
+				poolJSONErr(c, 404, 404, "暂无可用账号")
+			} else {
+				poolJSONErr(c, 500, 500, "查询失败")
+			}
+			return
+		}
+
+		updateFields := map[string]interface{}{
+			"is_extracted":       int8(2),
+			"extracted_time":     now,
+			"extracted_platform": platform,
+			"remark":             remark,
+			"update_time":        now,
+		}
+		if _, err = models.Orm.QueryTable(tableName).
+			Filter("id", candidate.id).
+			Update(updateFields); err != nil {
+			poolJSONErr(c, 500, 500, "补号失败: "+err.Error())
+			return
+		}
+
+		if known, available := poolIsUsedAvailable(candidate.isUsed); known {
+			if !available {
+				continue
+			}
+		} else if !poolProbeToken(module, candidate.dataType, candidate.token, candidate.id) {
+			continue
+		}
+
+		data := replenishApplyResponse(candidate.row, platform, remark, now)
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "补号成功", "data": data}
+		_ = c.ServeJSON()
+		return
+	}
+}
+
+func replenishApplyResponse(row interface{}, platform, remark string, now time.Time) interface{} {
+	pf := platform
+	switch r := row.(type) {
+	case models.PlatformAccountPoolCursor:
+		r.IsExtracted = 2
+		r.ExtractedTime = &now
+		r.ExtractedPlatform = &pf
+		r.Remark = remark
+		if r.IsUsed == nil || *r.IsUsed != 1 {
+			used := int8(1)
+			r.IsUsed = &used
+		}
+		return r
+	case models.PlatformAccountPoolWindsurf:
+		r.IsExtracted = 2
+		r.ExtractedTime = &now
+		r.ExtractedPlatform = &pf
+		r.Remark = remark
+		return r
+	case models.PlatformAccountPoolKiro:
+		r.IsExtracted = 2
+		r.ExtractedTime = &now
+		r.ExtractedPlatform = &pf
+		r.Remark = remark
+		return r
+	case models.PlatformAccountPoolCodex:
+		r.IsExtracted = 2
+		r.ExtractedTime = &now
+		r.ExtractedPlatform = &pf
+		r.Remark = remark
+		return r
+	default:
+		return row
+	}
+}
+
+func updatePoolRemark(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		ID     uint64 `json:"id"`
+		Remark string `json:"remark"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	remark := strings.TrimSpace(payload.Remark)
+
+	var updated int64
+	switch module {
+	case "cursor":
+		updated, err = models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", payload.ID).Update(map[string]interface{}{
+			"remark": remark,
+		})
+	case "windsurf":
+		updated, err = models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", payload.ID).Update(map[string]interface{}{
+			"remark": remark,
+		})
+	case "krio":
+		updated, err = models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", payload.ID).Update(map[string]interface{}{
+			"remark": remark,
+		})
+	case "codex":
+		updated, err = models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", payload.ID).Update(map[string]interface{}{
+			"remark": remark,
+		})
+	default:
+		poolJSONErr(c, 400, 400, "无效模块")
+		return
+	}
+	if err != nil {
+		poolJSONErr(c, 500, 500, "备注更新失败: "+err.Error())
+		return
+	}
+	if updated == 0 {
+		poolJSONErr(c, 404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "备注更新成功"}
+	_ = c.ServeJSON()
+}
+
+func validExtractPlatform(platform string) bool {
+	switch platform {
+	case "local", "xianyu", "taobao", "pinduoduo", "jingdong", "douyin", "ziyoushangcheng", "xubei":
+		return true
+	default:
+		return false
+	}
+}
+
+func updatePoolExtractFields(module string, id uint64, fields map[string]interface{}) (int64, error) {
+	switch module {
+	case "cursor":
+		return models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", id).Update(fields)
+	case "windsurf":
+		return models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", id).Update(fields)
+	case "krio":
+		return models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", id).Update(fields)
+	case "codex":
+		return models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", id).Update(fields)
+	default:
+		return 0, fmt.Errorf("无效模块")
+	}
+}
+
+func setPoolUnavailable(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+
+	now := time.Now()
+	fields := map[string]interface{}{
+		"is_extracted":       int8(1),
+		"extracted_time":     now,
+		"extracted_platform": "local",
+		"update_time":        now,
+	}
+	if module == "cursor" {
+		fields["is_used"] = int8(0)
+	}
+	updated, err := updatePoolExtractFields(module, payload.ID, fields)
+	if err != nil {
+		poolJSONErr(c, 500, 500, "改不可用失败: "+err.Error())
+		return
+	}
+	if updated == 0 {
+		poolJSONErr(c, 404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "已标记不可用"}
+	_ = c.ServeJSON()
+}
+
+func updatePoolUsable(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	if module != "cursor" {
+		poolJSONErr(c, 400, 400, "该模块不支持可用状态修改")
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		ID     uint64 `json:"id"`
+		Usable int    `json:"usable"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	if payload.Usable != 0 && payload.Usable != 1 {
+		poolJSONErr(c, 400, 400, "可用状态参数错误")
+		return
+	}
+
+	now := time.Now()
+	updated, err := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", payload.ID).Update(orm.Params{
+		"is_used":     int8(payload.Usable),
+		"update_time": now,
+	})
+	if err != nil {
+		poolJSONErr(c, 500, 500, "可用状态更新失败: "+err.Error())
+		return
+	}
+	if updated == 0 {
+		poolJSONErr(c, 404, 404, "记录不存在")
+		return
+	}
+	msg := "已标记不可用"
+	if payload.Usable == 1 {
+		msg = "已标记可用"
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+func updatePoolPlatform(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		ID       uint64 `json:"id"`
+		Platform string `json:"platform"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	platform := strings.TrimSpace(payload.Platform)
+	if !validExtractPlatform(platform) {
+		poolJSONErr(c, 400, 400, "提取平台错误")
+		return
+	}
+
+	now := time.Now()
+	updated, err := updatePoolExtractFields(module, payload.ID, map[string]interface{}{
+		"extracted_platform": platform,
+		"update_time":        now,
+	})
+	if err != nil {
+		poolJSONErr(c, 500, 500, "平台更新失败: "+err.Error())
+		return
+	}
+	if updated == 0 {
+		poolJSONErr(c, 404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "平台更新成功"}
+	_ = c.ServeJSON()
+}
+
+func unextractPoolRow(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil || payload.ID == 0 {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+
+	now := time.Now()
+	updated, err := updatePoolExtractFields(module, payload.ID, map[string]interface{}{
+		"is_extracted":       int8(0),
+		"extracted_time":     nil,
+		"extracted_platform": nil,
+		"update_time":        now,
+	})
+	if err != nil {
+		poolJSONErr(c, 500, 500, "反提取失败: "+err.Error())
+		return
+	}
+	if updated == 0 {
+		poolJSONErr(c, 404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "反提取成功"}
+	_ = c.ServeJSON()
+}
+
+func probePoolToken(c *beego.Controller, module string) {
+	if _, err := requirePlatformAuth(c); err != nil {
+		code := identity.Status(err)
+		poolJSONErr(c, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+	var payload struct {
+		ID          uint64 `json:"id"`
+		AccessToken string `json:"accessToken"`
+		Token       string `json:"token"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil {
+		poolJSONErr(c, 400, 400, "参数错误")
+		return
+	}
+
+	var token string
+	switch module {
+	case "cursor":
+		token = strings.TrimSpace(payload.AccessToken)
+		if token == "" {
+			token = strings.TrimSpace(payload.Token)
+		}
+		if token == "" {
+			if payload.ID == 0 {
+				poolJSONErr(c, 400, 400, "请传入 Cursor 的 accessToken（会话 JWT），或传 id 从库中读取")
+				return
+			}
+			var row models.PlatformAccountPoolCursor
+			if err := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", payload.ID).One(&row); err != nil {
+				poolJSONErr(c, 404, 404, "记录不存在")
+				return
+			}
+			token = strings.TrimSpace(row.Token)
+		}
+	case "windsurf":
+		if payload.ID == 0 {
+			poolJSONErr(c, 400, 400, "缺少有效 id")
+			return
+		}
+		var row models.PlatformAccountPoolWindsurf
+		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolWindsurf)).Filter("id", payload.ID).One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "记录不存在")
+			return
+		}
+		token = strings.TrimSpace(row.Token)
+	case "krio":
+		if payload.ID == 0 {
+			poolJSONErr(c, 400, 400, "缺少有效 id")
+			return
+		}
+		var row models.PlatformAccountPoolKiro
+		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolKiro)).Filter("id", payload.ID).One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "记录不存在")
+			return
+		}
+		token = strings.TrimSpace(row.Token)
+	case "codex":
+		if payload.ID == 0 {
+			poolJSONErr(c, 400, 400, "缺少有效 id")
+			return
+		}
+		var row models.PlatformAccountPoolCodex
+		if err := models.Orm.QueryTable(new(models.PlatformAccountPoolCodex)).Filter("id", payload.ID).One(&row); err != nil {
+			poolJSONErr(c, 404, 404, "记录不存在")
+			return
+		}
+		token = strings.TrimSpace(row.Token)
+	default:
+		poolJSONErr(c, 400, 400, "无效模块")
+		return
+	}
+
+	if token == "" {
+		poolJSONErr(c, 400, 400, "该记录无 Token，无法探测")
+		return
+	}
+
+	r := tokenprobe.ProbeOfficial(module, token)
+	data := map[string]interface{}{
+		"ok":         r.OK,
+		"detail":     r.Detail,
+		"httpStatus": r.HTTPStatus,
+	}
+	if r.ProbeMessage != "" {
+		data["probeMessage"] = r.ProbeMessage
+	}
+	if r.Endpoint != "" {
+		data["endpoint"] = r.Endpoint
+	}
+	if r.BytesRead > 0 {
+		data["bytesRead"] = r.BytesRead
+	}
+	if r.RawPreview != "" {
+		data["rawPreview"] = r.RawPreview
+	}
+	if r.RequestBodyPrefixHex != "" {
+		data["requestBodyPrefixHex"] = r.RequestBodyPrefixHex
+	}
+	if r.StreamProtocol != "" {
+		data["streamProtocol"] = r.StreamProtocol
+	}
+	if r.StreamNote != "" {
+		data["streamNote"] = r.StreamNote
+	}
+	if module == "cursor" && payload.ID > 0 && r.HTTPStatus == http.StatusOK {
+		var isUsed int8
+		if r.OK {
+			isUsed = 1
+		} else {
+			isUsed = 0
+		}
+		if _, uerr := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).Filter("id", payload.ID).Update(orm.Params{
+			"is_used":     isUsed,
+			"update_time": time.Now(),
+		}); uerr == nil {
+			data["is_used"] = int(isUsed)
+		}
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": data,
+	}
+	_ = c.ServeJSON()
+}
+
+func (c *PlatformAccountPoolCursorController) List()      { listPoolRows(&c.Controller, "cursor") }
+func (c *PlatformAccountPoolCursorController) Add()       { addPoolRow(&c.Controller, "cursor") }
+func (c *PlatformAccountPoolCursorController) BatchAdd()  { batchAddPoolRows(&c.Controller, "cursor") }
+func (c *PlatformAccountPoolCursorController) Detail()    { getPoolDetail(&c.Controller, "cursor") }
+func (c *PlatformAccountPoolCursorController) Extract()   { extractPoolRow(&c.Controller, "cursor") }
+func (c *PlatformAccountPoolCursorController) Replenish() { replenishPoolRow(&c.Controller, "cursor") }
+func (c *PlatformAccountPoolCursorController) UpdateRemark() {
+	updatePoolRemark(&c.Controller, "cursor")
+}
+func (c *PlatformAccountPoolCursorController) SetUnavailable() {
+	setPoolUnavailable(&c.Controller, "cursor")
+}
+func (c *PlatformAccountPoolCursorController) UpdateUsable() {
+	updatePoolUsable(&c.Controller, "cursor")
+}
+func (c *PlatformAccountPoolCursorController) UpdatePlatform() {
+	updatePoolPlatform(&c.Controller, "cursor")
+}
+func (c *PlatformAccountPoolCursorController) Unextract()  { unextractPoolRow(&c.Controller, "cursor") }
+func (c *PlatformAccountPoolCursorController) ProbeToken() { probePoolToken(&c.Controller, "cursor") }
+
+func (c *PlatformAccountPoolWindsurfController) List() { listPoolRows(&c.Controller, "windsurf") }
+func (c *PlatformAccountPoolWindsurfController) Add()  { addPoolRow(&c.Controller, "windsurf") }
+func (c *PlatformAccountPoolWindsurfController) BatchAdd() {
+	batchAddPoolRows(&c.Controller, "windsurf")
+}
+func (c *PlatformAccountPoolWindsurfController) Detail()  { getPoolDetail(&c.Controller, "windsurf") }
+func (c *PlatformAccountPoolWindsurfController) Extract() { extractPoolRow(&c.Controller, "windsurf") }
+func (c *PlatformAccountPoolWindsurfController) Replenish() {
+	replenishPoolRow(&c.Controller, "windsurf")
+}
+func (c *PlatformAccountPoolWindsurfController) UpdateRemark() {
+	updatePoolRemark(&c.Controller, "windsurf")
+}
+func (c *PlatformAccountPoolWindsurfController) SetUnavailable() {
+	setPoolUnavailable(&c.Controller, "windsurf")
+}
+func (c *PlatformAccountPoolWindsurfController) UpdatePlatform() {
+	updatePoolPlatform(&c.Controller, "windsurf")
+}
+func (c *PlatformAccountPoolWindsurfController) Unextract() {
+	unextractPoolRow(&c.Controller, "windsurf")
+}
+func (c *PlatformAccountPoolWindsurfController) ProbeToken() {
+	probePoolToken(&c.Controller, "windsurf")
+}
+
+func (c *PlatformAccountPoolKrioController) List()      { listPoolRows(&c.Controller, "krio") }
+func (c *PlatformAccountPoolKrioController) Add()       { addPoolRow(&c.Controller, "krio") }
+func (c *PlatformAccountPoolKrioController) BatchAdd()  { batchAddPoolRows(&c.Controller, "krio") }
+func (c *PlatformAccountPoolKrioController) Detail()    { getPoolDetail(&c.Controller, "krio") }
+func (c *PlatformAccountPoolKrioController) Extract()   { extractPoolRow(&c.Controller, "krio") }
+func (c *PlatformAccountPoolKrioController) Replenish() { replenishPoolRow(&c.Controller, "krio") }
+func (c *PlatformAccountPoolKrioController) UpdateRemark() {
+	updatePoolRemark(&c.Controller, "krio")
+}
+func (c *PlatformAccountPoolKrioController) SetUnavailable() {
+	setPoolUnavailable(&c.Controller, "krio")
+}
+func (c *PlatformAccountPoolKrioController) UpdatePlatform() {
+	updatePoolPlatform(&c.Controller, "krio")
+}
+func (c *PlatformAccountPoolKrioController) Unextract()  { unextractPoolRow(&c.Controller, "krio") }
+func (c *PlatformAccountPoolKrioController) ProbeToken() { probePoolToken(&c.Controller, "krio") }
+
+func (c *PlatformAccountPoolCodexController) List()      { listPoolRows(&c.Controller, "codex") }
+func (c *PlatformAccountPoolCodexController) Add()       { addPoolRow(&c.Controller, "codex") }
+func (c *PlatformAccountPoolCodexController) BatchAdd()  { batchAddPoolRows(&c.Controller, "codex") }
+func (c *PlatformAccountPoolCodexController) Detail()    { getPoolDetail(&c.Controller, "codex") }
+func (c *PlatformAccountPoolCodexController) Extract()   { extractPoolRow(&c.Controller, "codex") }
+func (c *PlatformAccountPoolCodexController) Replenish() { replenishPoolRow(&c.Controller, "codex") }
+func (c *PlatformAccountPoolCodexController) UpdateRemark() {
+	updatePoolRemark(&c.Controller, "codex")
+}
+func (c *PlatformAccountPoolCodexController) SetUnavailable() {
+	setPoolUnavailable(&c.Controller, "codex")
+}
+func (c *PlatformAccountPoolCodexController) UpdatePlatform() {
+	updatePoolPlatform(&c.Controller, "codex")
+}
+func (c *PlatformAccountPoolCodexController) Unextract()  { unextractPoolRow(&c.Controller, "codex") }
+func (c *PlatformAccountPoolCodexController) ProbeToken() { probePoolToken(&c.Controller, "codex") }
diff --git a/go/controllers/platform_agent_api.go b/go/controllers/platform_agent_api.go
index 73ebda0..0953b05 100644
--- a/go/controllers/platform_agent_api.go
+++ b/go/controllers/platform_agent_api.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -74,22 +75,7 @@ func (c *PlatformAgentApiController) ok(msg string, data interface{}) {
 }
 
 func (c *PlatformAgentApiController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 // agentApiPayload 新增/更新请求体
@@ -338,7 +324,8 @@ func buildAgentEndpoint(protocol, base, model, apiKey string) string {
 // List GET /platform/agentApi/list?page=1&pageSize=24&keyword=&provider=&status=
 func (c *PlatformAgentApiController) List() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -415,7 +402,8 @@ func (c *PlatformAgentApiController) List() {
 // Detail GET /platform/agentApi/:id
 func (c *PlatformAgentApiController) Detail() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -455,7 +443,8 @@ func (c *PlatformAgentApiController) findByID() (*models.PlatformAgentApi, error
 func (c *PlatformAgentApiController) Create() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -510,7 +499,8 @@ func (c *PlatformAgentApiController) Create() {
 // Update PUT /platform/agentApi/:id
 func (c *PlatformAgentApiController) Update() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -569,7 +559,8 @@ func (c *PlatformAgentApiController) Update() {
 // Delete DELETE /platform/agentApi/:id
 func (c *PlatformAgentApiController) Delete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -596,7 +587,8 @@ func (c *PlatformAgentApiController) Delete() {
 // BatchDelete POST /platform/agentApi/batchDelete
 func (c *PlatformAgentApiController) BatchDelete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -637,7 +629,8 @@ func (c *PlatformAgentApiController) BatchDelete() {
 // ToggleStatus POST /platform/agentApi/:id/status
 func (c *PlatformAgentApiController) ToggleStatus() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -707,7 +700,8 @@ func redactKeyInURL(rawURL, key string) string {
 // key_index 指定用密钥列表中的第几个密钥，缺省用第一个
 func (c *PlatformAgentApiController) Test() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/platform_approval.go b/go/controllers/platform_approval.go
index bcc81ed..3a1b6cf 100644
--- a/go/controllers/platform_approval.go
+++ b/go/controllers/platform_approval.go
@@ -10,6 +10,7 @@ import (
 
 	"server/models"
 	"server/services"
+	"server/pkg/identity"
 	approvalEngine "server/services/approval"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -102,7 +103,8 @@ func (c *PlatformApprovalController) readApprovalBody(dst interface{}) error {
 // 平台端流程列表；可按单据类型过滤，附带节点数。
 func (c *PlatformApprovalController) FlowList() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bizType := strings.TrimSpace(c.GetString("biz_type"))
@@ -142,7 +144,8 @@ func (c *PlatformApprovalController) FlowList() {
 // 返回流程及其全部节点（按 sort 升序），供编排界面回显。
 func (c *PlatformApprovalController) FlowDetail() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -201,7 +204,8 @@ func (c *PlatformApprovalController) flowToView(f models.PlatformApprovalFlow) a
 // 新建或更新流程；节点采用「全量覆盖」语义（先软删旧节点，再按传入顺序重建）。
 func (c *PlatformApprovalController) FlowSave() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	var p approvalFlowSave
@@ -345,7 +349,8 @@ func (c *PlatformApprovalController) FlowSave() {
 // 轻量清单：按分类返回启用流程的 {flow_code, flow_name}，供其它功能“选/填编号调用”。
 func (c *PlatformApprovalController) Pick() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	module := strings.TrimSpace(c.GetString("module"))
@@ -377,7 +382,8 @@ func (c *PlatformApprovalController) Pick() {
 // 软删流程及其节点。存在在途实例时禁止删除，避免审批中断。
 func (c *PlatformApprovalController) FlowDelete() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -407,7 +413,8 @@ func (c *PlatformApprovalController) FlowDelete() {
 // 编排界面「选审批人」用：返回平台角色（cid=1）与平台用户列表。
 func (c *PlatformApprovalController) Options() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	var roles []models.AdminRole
@@ -456,7 +463,8 @@ func (c *PlatformApprovalController) Options() {
 // 可绑定业务类型字典（当期平台侧为「域名申请」），供配置界面顶级下拉。
 func (c *PlatformApprovalController) BizTypes() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "ok", "data": []map[string]interface{}{
@@ -470,7 +478,8 @@ func (c *PlatformApprovalController) BizTypes() {
 // 平台无部门概念，userOrgID 固定为 0（引擎内平台侧不做部门过滤）。
 func (c *PlatformApprovalController) AvailableFlows() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	bizType := strings.TrimSpace(c.GetString("biz_type"))
diff --git a/go/controllers/platform_auth.go b/go/controllers/platform_auth.go
index daf96ec..60c9e31 100644
--- a/go/controllers/platform_auth.go
+++ b/go/controllers/platform_auth.go
@@ -1,427 +1,411 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strings"
-
-	"server/models"
-	"server/pkg/jwtutil"
-	"server/services"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type platformLoginRequest struct {
-	Account      string `json:"account"`
-	Password     string `json:"password"`
-	Code         string `json:"code"`
-	// 极验4验证参数
-	CaptchaID     string `json:"captcha_id"`
-	LotNumber     string `json:"lot_number"`
-	PassToken     string `json:"pass_token"`
-	GenTime       string `json:"gen_time"`
-	CaptchaOutput string `json:"captcha_output"`
-}
-
-type backendLoginRequest struct {
-	TenantName string `json:"tenant_name"`
-	Account    string `json:"account"`
-	Password   string `json:"password"`
-	Code       string `json:"code"`
-}
-
-// PlatformAuthController 平台端认证控制器
-type PlatformAuthController struct {
-	beego.Controller
-}
-
-// LoginPlatform 平台端登录（不需要租户）
-func (c *PlatformAuthController) LoginPlatform() {
-	var req platformLoginRequest
-
-	// 先尝试从缓存读取
-	body := c.Ctx.Input.RequestBody
-	
-	// 如果缓存为空，直接从请求体读取
-	if len(body) == 0 {
-		var err error
-		body, err = io.ReadAll(c.Ctx.Request.Body)
-		if err != nil {
-			fmt.Println("读取请求体失败:", err)
-			c.Data["json"] = map[string]interface{}{
-				"code": 400,
-				"msg":  "参数错误",
-			}
-			_ = c.ServeJSON()
-			return
-		}
-	}
-
-	if len(body) == 0 {
-		fmt.Println("请求体为空")
-		c.Data["json"] = map[string]interface{}{
-			"code": 400,
-			"msg":  "参数错误",
-		}
-		_ = c.ServeJSON()
-		return
-	}
-
-	fmt.Println("登录请求体:", string(body))
-
-	if err := json.Unmarshal(body, &req); err != nil {
-		fmt.Println("JSON解析失败:", err, "body:", string(body))
-		c.Data["json"] = map[string]interface{}{
-			"code": 400,
-			"msg":  "参数错误: " + err.Error(),
-		}
-		_ = c.ServeJSON()
-		return
-	}
-
-	fmt.Printf("解析后的请求: %+v\n", req)
-
-	if req.Account == "" || req.Password == "" {
-		fmt.Println("账号或密码为空, account:", req.Account, "password:", req.Password)
-		c.Data["json"] = map[string]interface{}{
-			"code": 400,
-			"msg":  "用户名或密码不能为空",
-		}
-		_ = c.ServeJSON()
-		return
-	}
-	
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.OpenVerifyEnabled == 1 {
-		// 极验验证
-		if cfg.VerifyType == "geetest4" {
-			if req.LotNumber == "" || req.PassToken == "" || req.GenTime == "" || req.CaptchaOutput == "" {
-				c.Data["json"] = map[string]interface{}{"code": 400, "msg": "请完成人机验证"}
-				_ = c.ServeJSON()
-				return
-			}
-			// TODO: 这里应该调用极验服务端SDK验证，暂时跳过验证
-			// 如果需要严格验证，需要集成极验服务端SDK
-		} else if cfg.VerifyType == "geetest3" {
-			// 极验3验证
-			if req.CaptchaOutput == "" {
-				c.Data["json"] = map[string]interface{}{"code": 400, "msg": "请完成人机验证"}
-				_ = c.ServeJSON()
-				return
-			}
-			// TODO: 这里应该调用极验服务端SDK验证，暂时跳过验证
-		} else if cfg.VerifyType == "sms" || cfg.VerifyType == "email" {
-			if strings.TrimSpace(req.Code) == "" {
-				c.Data["json"] = map[string]interface{}{"code": 400, "msg": "请输入验证码"}
-				_ = c.ServeJSON()
-				return
-			}
-			if err := services.VerifyPlatformLoginCode(req.Account, cfg.VerifyType, req.Code); err != nil {
-				c.Data["json"] = map[string]interface{}{"code": 400, "msg": err.Error()}
-				_ = c.ServeJSON()
-				return
-			}
-		}
-	}
-
-	// 控制器只做 HTTP 解析与响应编排，业务逻辑放 services 层
-	token, loginUser, err := services.PlatformAdminLogin(req.Account, req.Password, c.Ctx.Input.IP())
-	if err != nil {
-		RecordLoginLog(nil, 0, req.Account, "", "", "password", 0, err.Error(), c.Ctx.Input.IP(), c.Ctx.Request.UserAgent())
-		c.Data["json"] = map[string]interface{}{
-			"code": 401,
-			"msg":  err.Error(),
-		}
-		_ = c.ServeJSON()
-		return
-	}
-
-	RecordLoginLog(nil, loginUser.ID, loginUser.Account, loginUser.Name, "", "password", 1, "登录成功", c.Ctx.Input.IP(), c.Ctx.Request.UserAgent())
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "登录成功",
-		"data": map[string]interface{}{
-			"token": token,
-			"user": map[string]interface{}{
-				"id":        loginUser.ID,
-				"account":   loginUser.Account,
-				"name":      loginUser.Name,
-				"rid":       loginUser.Rid,
-				"avatar":    loginUser.Avatar,
-				"role_name": loginUser.RoleName,
-			},
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// LoginBackend backend 登录（需要租户）
-func (c *PlatformAuthController) LoginBackend() {
-	var req backendLoginRequest
-
-	body := c.Ctx.Input.RequestBody
-	if len(body) == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
-		_ = c.ServeJSON()
-		return
-	}
-	if err := json.Unmarshal(body, &req); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
-		_ = c.ServeJSON()
-		return
-	}
-	if req.TenantName == "" || req.Account == "" || req.Password == "" {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户名称、用户名或密码不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.OpenVerifyEnabled == 1 {
-		if cfg.VerifyType == "sms" || cfg.VerifyType == "email" {
-			if strings.TrimSpace(req.Code) == "" {
-				c.Data["json"] = map[string]interface{}{"code": 400, "msg": "请输入验证码"}
-				_ = c.ServeJSON()
-				return
-			}
-			if err := services.VerifyBackendLoginCode(req.TenantName, req.Account, cfg.VerifyType, req.Code); err != nil {
-				c.Data["json"] = map[string]interface{}{"code": 400, "msg": err.Error()}
-				_ = c.ServeJSON()
-				return
-			}
-		}
-	}
-
-	token, loginUser, err := services.BackendLogin(req.TenantName, req.Account, req.Password)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "登录成功",
-		"data": map[string]interface{}{
-			"token": token,
-			"user": map[string]interface{}{
-				"id":        loginUser.ID,
-				"account":   loginUser.Account,
-				"name":      loginUser.Name,
-				"tid":       loginUser.Tid,
-				"rid":       loginUser.Rid,
-				"avatar":    loginUser.Avatar,
-				"role_name": loginUser.RoleName,
-			},
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetCurrentUser 当前登录平台用户信息（含角色名称），需 Bearer Token
-func (c *PlatformAuthController) GetCurrentUser() {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "未登录"}
-		_ = c.ServeJSON()
-		return
-	}
-	authParts := strings.SplitN(authHeader, " ", 2)
-	if len(authParts) != 2 || authParts[0] != "Bearer" {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "认证信息格式错误"}
-		_ = c.ServeJSON()
-		return
-	}
-	claims, err := jwtutil.ParseToken(authParts[1])
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": "无效的token"}
-		_ = c.ServeJSON()
-		return
-	}
-	if claims.UserType != "platform" {
-		c.Data["json"] = map[string]interface{}{"code": 403, "msg": "无权访问"}
-		_ = c.ServeJSON()
-		return
-	}
-	loginUser, err := services.PlatformGetCurrentUser(uint64(claims.UserID))
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 401, "msg": err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"id":        loginUser.ID,
-			"account":   loginUser.Account,
-			"name":      loginUser.Name,
-			"rid":       loginUser.Rid,
-			"avatar":    loginUser.Avatar,
-			"role_name": loginUser.RoleName,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// SendLoginCode 发送登录验证码（占位实现）
-func (c *PlatformAuthController) SendLoginCode() {
-	var req struct {
-		Account    string `json:"account"`
-		TenantName string `json:"tenant_name"`
-		Channel    string `json:"channel"`
-	}
-	body := c.Ctx.Input.RequestBody
-	if err := json.Unmarshal(body, &req); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
-		_ = c.ServeJSON()
-		return
-	}
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.OpenVerifyEnabled != 1 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "当前未开启验证"}
-		_ = c.ServeJSON()
-		return
-	}
-	channel := strings.TrimSpace(req.Channel)
-	if channel == "" {
-		channel = cfg.VerifyType
-	}
-	if channel != "sms" && channel != "email" {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "仅支持短信/邮箱验证码"}
-		_ = c.ServeJSON()
-		return
-	}
-	path := strings.ToLower(c.Ctx.Request.URL.Path)
-	var sendErr error
-	if strings.HasPrefix(path, "/backend/") {
-		sendErr = services.SendBackendLoginCode(req.TenantName, req.Account, channel)
-	} else {
-		sendErr = services.SendPlatformLoginCode(req.Account, channel)
-	}
-	if sendErr != nil {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": sendErr.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "验证码已发送"}
-	_ = c.ServeJSON()
-}
-
-// LoginBySms 手机号验证码登录（占位实现）
-func (c *PlatformAuthController) LoginBySms() {
-	c.Data["json"] = map[string]interface{}{
-		"code": 501,
-		"msg":  "手机号验证码登录暂未实现",
-	}
-	_ = c.ServeJSON()
-}
-
-// Logout 平台退出登录（占位实现，当前为无状态直接返回成功）
-func (c *PlatformAuthController) Logout() {
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "退出成功",
-	}
-	_ = c.ServeJSON()
-}
-
-// GetGeetest3Infos 获取极验3.0配置（占位实现）
-func (c *PlatformAuthController) GetGeetest3Infos() {
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.Geetest3ID == nil || cfg.Geetest3Key == nil {
-		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "未配置极验3参数"}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"captcha_id": *cfg.Geetest3ID,
-			"captcha_key": *cfg.Geetest3Key,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetGeetest4Infos 获取极验4.0配置（占位实现）
-func (c *PlatformAuthController) GetGeetest4Infos() {
-	cfg, _ := models.GetPlatformLoginVerify()
-	if cfg.Geetest4ID == nil || cfg.Geetest4Key == nil {
-		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "未配置极验4参数"}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"captcha_id": *cfg.Geetest4ID,
-			"captcha_key": *cfg.Geetest4Key,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetOpenVerify 判断是否开启登录验证（占位实现）
-func (c *PlatformAuthController) GetOpenVerify() {
-	cfg, _ := models.GetPlatformLoginVerify()
-	openVerify := "0"
-	if cfg.OpenVerifyEnabled == 1 {
-		openVerify = "1"
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "ok",
-		"data": []map[string]string{
-			{
-				"label": "openVerify",
-				"value": openVerify,
-			},
-			{
-				"label": "verifyType",
-				"value": cfg.VerifyType,
-			},
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// Register 注册（占位实现）
-func (c *PlatformAuthController) Register() {
-	c.Data["json"] = map[string]interface{}{
-		"code": 501,
-		"msg":  "注册暂未实现",
-	}
-	_ = c.ServeJSON()
-}
-
-// SendRegisterCode 发送注册验证码（占位实现）
-func (c *PlatformAuthController) SendRegisterCode() {
-	c.Data["json"] = map[string]interface{}{
-		"code": 501,
-		"msg":  "发送注册验证码暂未实现",
-	}
-	_ = c.ServeJSON()
-}
-
-// ResetPassword 忘记密码重置（占位实现）
-func (c *PlatformAuthController) ResetPassword() {
-	c.Data["json"] = map[string]interface{}{
-		"code": 501,
-		"msg":  "重置密码暂未实现",
-	}
-	_ = c.ServeJSON()
-}
-
-// SendResetCode 发送找回密码验证码（占位实现）
-func (c *PlatformAuthController) SendResetCode() {
-	c.Data["json"] = map[string]interface{}{
-		"code": 501,
-		"msg":  "发送找回密码验证码暂未实现",
-	}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"strings"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/services"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type platformLoginRequest struct {
+	Account      string `json:"account"`
+	Password     string `json:"password"`
+	Code         string `json:"code"`
+	// 极验4验证参数
+	CaptchaID     string `json:"captcha_id"`
+	LotNumber     string `json:"lot_number"`
+	PassToken     string `json:"pass_token"`
+	GenTime       string `json:"gen_time"`
+	CaptchaOutput string `json:"captcha_output"`
+}
+
+type backendLoginRequest struct {
+	TenantName string `json:"tenant_name"`
+	Account    string `json:"account"`
+	Password   string `json:"password"`
+	Code       string `json:"code"`
+}
+
+// PlatformAuthController 平台端认证控制器
+type PlatformAuthController struct {
+	beego.Controller
+}
+
+// LoginPlatform 平台端登录（不需要租户）
+func (c *PlatformAuthController) LoginPlatform() {
+	var req platformLoginRequest
+
+	// 先尝试从缓存读取
+	body := c.Ctx.Input.RequestBody
+	
+	// 如果缓存为空，直接从请求体读取
+	if len(body) == 0 {
+		var err error
+		body, err = io.ReadAll(c.Ctx.Request.Body)
+		if err != nil {
+			fmt.Println("读取请求体失败:", err)
+			c.Data["json"] = map[string]interface{}{
+				"code": 400,
+				"msg":  "参数错误",
+			}
+			_ = c.ServeJSON()
+			return
+		}
+	}
+
+	if len(body) == 0 {
+		fmt.Println("请求体为空")
+		c.Data["json"] = map[string]interface{}{
+			"code": 400,
+			"msg":  "参数错误",
+		}
+		_ = c.ServeJSON()
+		return
+	}
+
+	fmt.Println("登录请求体:", string(body))
+
+	if err := json.Unmarshal(body, &req); err != nil {
+		fmt.Println("JSON解析失败:", err, "body:", string(body))
+		c.Data["json"] = map[string]interface{}{
+			"code": 400,
+			"msg":  "参数错误: " + err.Error(),
+		}
+		_ = c.ServeJSON()
+		return
+	}
+
+	fmt.Printf("解析后的请求: %+v\n", req)
+
+	if req.Account == "" || req.Password == "" {
+		fmt.Println("账号或密码为空, account:", req.Account, "password:", req.Password)
+		c.Data["json"] = map[string]interface{}{
+			"code": 400,
+			"msg":  "用户名或密码不能为空",
+		}
+		_ = c.ServeJSON()
+		return
+	}
+	
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.OpenVerifyEnabled == 1 {
+		// 极验验证
+		if cfg.VerifyType == "geetest4" {
+			if req.LotNumber == "" || req.PassToken == "" || req.GenTime == "" || req.CaptchaOutput == "" {
+				c.Data["json"] = map[string]interface{}{"code": 400, "msg": "请完成人机验证"}
+				_ = c.ServeJSON()
+				return
+			}
+			// TODO: 这里应该调用极验服务端SDK验证，暂时跳过验证
+			// 如果需要严格验证，需要集成极验服务端SDK
+		} else if cfg.VerifyType == "geetest3" {
+			// 极验3验证
+			if req.CaptchaOutput == "" {
+				c.Data["json"] = map[string]interface{}{"code": 400, "msg": "请完成人机验证"}
+				_ = c.ServeJSON()
+				return
+			}
+			// TODO: 这里应该调用极验服务端SDK验证，暂时跳过验证
+		} else if cfg.VerifyType == "sms" || cfg.VerifyType == "email" {
+			if strings.TrimSpace(req.Code) == "" {
+				c.Data["json"] = map[string]interface{}{"code": 400, "msg": "请输入验证码"}
+				_ = c.ServeJSON()
+				return
+			}
+			if err := services.VerifyPlatformLoginCode(req.Account, cfg.VerifyType, req.Code); err != nil {
+				c.Data["json"] = map[string]interface{}{"code": 400, "msg": err.Error()}
+				_ = c.ServeJSON()
+				return
+			}
+		}
+	}
+
+	// 控制器只做 HTTP 解析与响应编排，业务逻辑放 services 层
+	token, loginUser, err := services.PlatformAdminLogin(req.Account, req.Password, c.Ctx.Input.IP())
+	if err != nil {
+		RecordLoginLog(nil, 0, req.Account, "", "", "password", 0, err.Error(), c.Ctx.Input.IP(), c.Ctx.Request.UserAgent())
+		c.Data["json"] = map[string]interface{}{
+			"code": 401,
+			"msg":  err.Error(),
+		}
+		_ = c.ServeJSON()
+		return
+	}
+
+	RecordLoginLog(nil, loginUser.ID, loginUser.Account, loginUser.Name, "", "password", 1, "登录成功", c.Ctx.Input.IP(), c.Ctx.Request.UserAgent())
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "登录成功",
+		"data": map[string]interface{}{
+			"token": token,
+			"user": map[string]interface{}{
+				"id":        loginUser.ID,
+				"account":   loginUser.Account,
+				"name":      loginUser.Name,
+				"rid":       loginUser.Rid,
+				"avatar":    loginUser.Avatar,
+				"role_name": loginUser.RoleName,
+			},
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// LoginBackend backend 登录（需要租户）
+func (c *PlatformAuthController) LoginBackend() {
+	var req backendLoginRequest
+
+	body := c.Ctx.Input.RequestBody
+	if len(body) == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
+		_ = c.ServeJSON()
+		return
+	}
+	if err := json.Unmarshal(body, &req); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
+		_ = c.ServeJSON()
+		return
+	}
+	if req.TenantName == "" || req.Account == "" || req.Password == "" {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户名称、用户名或密码不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.OpenVerifyEnabled == 1 {
+		if cfg.VerifyType == "sms" || cfg.VerifyType == "email" {
+			if strings.TrimSpace(req.Code) == "" {
+				c.Data["json"] = map[string]interface{}{"code": 400, "msg": "请输入验证码"}
+				_ = c.ServeJSON()
+				return
+			}
+			if err := services.VerifyBackendLoginCode(req.TenantName, req.Account, cfg.VerifyType, req.Code); err != nil {
+				c.Data["json"] = map[string]interface{}{"code": 400, "msg": err.Error()}
+				_ = c.ServeJSON()
+				return
+			}
+		}
+	}
+
+	token, loginUser, err := services.BackendLogin(req.TenantName, req.Account, req.Password)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 401, "msg": err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "登录成功",
+		"data": map[string]interface{}{
+			"token": token,
+			"user": map[string]interface{}{
+				"id":        loginUser.ID,
+				"account":   loginUser.Account,
+				"name":      loginUser.Name,
+				"tid":       loginUser.Tid,
+				"rid":       loginUser.Rid,
+				"avatar":    loginUser.Avatar,
+				"role_name": loginUser.RoleName,
+			},
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetCurrentUser 当前登录平台用户信息（含角色名称），需 Bearer Token
+func (c *PlatformAuthController) GetCurrentUser() {
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+	if err != nil {
+		code := identity.Status(err)
+		c.Data["json"] = map[string]interface{}{"code": code, "msg": err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	loginUser, err := services.PlatformGetCurrentUser(uint64(claims.UserID))
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 401, "msg": err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"id":        loginUser.ID,
+			"account":   loginUser.Account,
+			"name":      loginUser.Name,
+			"rid":       loginUser.Rid,
+			"avatar":    loginUser.Avatar,
+			"role_name": loginUser.RoleName,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// SendLoginCode 发送登录验证码（占位实现）
+func (c *PlatformAuthController) SendLoginCode() {
+	var req struct {
+		Account    string `json:"account"`
+		TenantName string `json:"tenant_name"`
+		Channel    string `json:"channel"`
+	}
+	body := c.Ctx.Input.RequestBody
+	if err := json.Unmarshal(body, &req); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
+		_ = c.ServeJSON()
+		return
+	}
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.OpenVerifyEnabled != 1 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "当前未开启验证"}
+		_ = c.ServeJSON()
+		return
+	}
+	channel := strings.TrimSpace(req.Channel)
+	if channel == "" {
+		channel = cfg.VerifyType
+	}
+	if channel != "sms" && channel != "email" {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "仅支持短信/邮箱验证码"}
+		_ = c.ServeJSON()
+		return
+	}
+	path := strings.ToLower(c.Ctx.Request.URL.Path)
+	var sendErr error
+	if strings.HasPrefix(path, "/backend/") {
+		sendErr = services.SendBackendLoginCode(req.TenantName, req.Account, channel)
+	} else {
+		sendErr = services.SendPlatformLoginCode(req.Account, channel)
+	}
+	if sendErr != nil {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": sendErr.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "验证码已发送"}
+	_ = c.ServeJSON()
+}
+
+// LoginBySms 手机号验证码登录（占位实现）
+func (c *PlatformAuthController) LoginBySms() {
+	c.Data["json"] = map[string]interface{}{
+		"code": 501,
+		"msg":  "手机号验证码登录暂未实现",
+	}
+	_ = c.ServeJSON()
+}
+
+// Logout 平台退出登录（占位实现，当前为无状态直接返回成功）
+func (c *PlatformAuthController) Logout() {
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "退出成功",
+	}
+	_ = c.ServeJSON()
+}
+
+// GetGeetest3Infos 获取极验3.0配置（占位实现）
+func (c *PlatformAuthController) GetGeetest3Infos() {
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.Geetest3ID == nil || cfg.Geetest3Key == nil {
+		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "未配置极验3参数"}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"captcha_id": *cfg.Geetest3ID,
+			"captcha_key": *cfg.Geetest3Key,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetGeetest4Infos 获取极验4.0配置（占位实现）
+func (c *PlatformAuthController) GetGeetest4Infos() {
+	cfg, _ := models.GetPlatformLoginVerify()
+	if cfg.Geetest4ID == nil || cfg.Geetest4Key == nil {
+		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "未配置极验4参数"}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"captcha_id": *cfg.Geetest4ID,
+			"captcha_key": *cfg.Geetest4Key,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetOpenVerify 判断是否开启登录验证（占位实现）
+func (c *PlatformAuthController) GetOpenVerify() {
+	cfg, _ := models.GetPlatformLoginVerify()
+	openVerify := "0"
+	if cfg.OpenVerifyEnabled == 1 {
+		openVerify = "1"
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "ok",
+		"data": []map[string]string{
+			{
+				"label": "openVerify",
+				"value": openVerify,
+			},
+			{
+				"label": "verifyType",
+				"value": cfg.VerifyType,
+			},
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// Register 注册（占位实现）
+func (c *PlatformAuthController) Register() {
+	c.Data["json"] = map[string]interface{}{
+		"code": 501,
+		"msg":  "注册暂未实现",
+	}
+	_ = c.ServeJSON()
+}
+
+// SendRegisterCode 发送注册验证码（占位实现）
+func (c *PlatformAuthController) SendRegisterCode() {
+	c.Data["json"] = map[string]interface{}{
+		"code": 501,
+		"msg":  "发送注册验证码暂未实现",
+	}
+	_ = c.ServeJSON()
+}
+
+// ResetPassword 忘记密码重置（占位实现）
+func (c *PlatformAuthController) ResetPassword() {
+	c.Data["json"] = map[string]interface{}{
+		"code": 501,
+		"msg":  "重置密码暂未实现",
+	}
+	_ = c.ServeJSON()
+}
+
+// SendResetCode 发送找回密码验证码（占位实现）
+func (c *PlatformAuthController) SendResetCode() {
+	c.Data["json"] = map[string]interface{}{
+		"code": 501,
+		"msg":  "发送找回密码验证码暂未实现",
+	}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/platform_auth_client.go b/go/controllers/platform_auth_client.go
index fb53af8..a6c5f37 100644
--- a/go/controllers/platform_auth_client.go
+++ b/go/controllers/platform_auth_client.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"server/models"
-	"server/pkg/jwtutil"
+	"server/pkg/identity"
 
 	beego "github.com/beego/beego/v2/server/web"
 )
@@ -31,31 +31,10 @@ func (c *PlatformAuthClientController) serveJSON(data map[string]interface{}) {
 // Prepare 统一鉴权：接入应用属于平台级敏感配置，仅平台管理员可操作。
 // 不依赖全局中间件（其处于 warn 观察模式时不拦截），这里主动校验。
 func (c *PlatformAuthClientController) Prepare() {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "未登录"})
-		c.StopRun()
-		return
-	}
-	parts := strings.SplitN(authHeader, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "认证信息格式错误"})
-		c.StopRun()
-		return
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "登录已失效，请重新登录"})
-		c.StopRun()
-		return
-	}
-	// 平台端应用注册只允许平台管理员操作；租户管理员无权访问
-	if claims.UserType != "platform" {
-		c.Ctx.Output.SetStatus(403)
-		c.serveJSON(map[string]interface{}{"code": 403, "msg": "无权访问"})
+	if _, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform); err != nil {
+		code := identity.Status(err)
+		c.Ctx.Output.SetStatus(code)
+		c.serveJSON(map[string]interface{}{"code": code, "msg": err.Error()})
 		c.StopRun()
 		return
 	}
diff --git a/go/controllers/platform_auth_config.go b/go/controllers/platform_auth_config.go
index 9bf3be9..8c940e2 100644
--- a/go/controllers/platform_auth_config.go
+++ b/go/controllers/platform_auth_config.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"server/models"
-	"server/pkg/jwtutil"
+	"server/pkg/identity"
 	authsvc "server/services/auth"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -28,30 +28,10 @@ func (c *PlatformAuthConfigController) serveJSON(data map[string]interface{}) {
 
 // Prepare 统一鉴权：仅平台管理员可配置
 func (c *PlatformAuthConfigController) Prepare() {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "未登录"})
-		c.StopRun()
-		return
-	}
-	parts := strings.SplitN(authHeader, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "认证信息格式错误"})
-		c.StopRun()
-		return
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "登录已失效，请重新登录"})
-		c.StopRun()
-		return
-	}
-	if claims.UserType != "platform" {
-		c.Ctx.Output.SetStatus(403)
-		c.serveJSON(map[string]interface{}{"code": 403, "msg": "无权访问"})
+	if _, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform); err != nil {
+		code := identity.Status(err)
+		c.Ctx.Output.SetStatus(code)
+		c.serveJSON(map[string]interface{}{"code": code, "msg": err.Error()})
 		c.StopRun()
 		return
 	}
diff --git a/go/controllers/platform_auth_idp.go b/go/controllers/platform_auth_idp.go
index f7ac696..de56525 100644
--- a/go/controllers/platform_auth_idp.go
+++ b/go/controllers/platform_auth_idp.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -31,30 +32,10 @@ func (c *PlatformAuthIdpController) serveJSON(data map[string]interface{}) {
 
 // Prepare 统一鉴权：仅平台管理员可维护第三方登录配置
 func (c *PlatformAuthIdpController) Prepare() {
-	authHeader := c.Ctx.Request.Header.Get("Authorization")
-	if authHeader == "" {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "未登录"})
-		c.StopRun()
-		return
-	}
-	parts := strings.SplitN(authHeader, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "认证信息格式错误"})
-		c.StopRun()
-		return
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		c.Ctx.Output.SetStatus(401)
-		c.serveJSON(map[string]interface{}{"code": 401, "msg": "登录已失效，请重新登录"})
-		c.StopRun()
-		return
-	}
-	if claims.UserType != "platform" {
-		c.Ctx.Output.SetStatus(403)
-		c.serveJSON(map[string]interface{}{"code": 403, "msg": "无权访问"})
+	if _, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform); err != nil {
+		code := identity.Status(err)
+		c.Ctx.Output.SetStatus(code)
+		c.serveJSON(map[string]interface{}{"code": code, "msg": err.Error()})
 		c.StopRun()
 		return
 	}
diff --git a/go/controllers/platform_bark.go b/go/controllers/platform_bark.go
index b9c36ff..5f82854 100644
--- a/go/controllers/platform_bark.go
+++ b/go/controllers/platform_bark.go
@@ -1,215 +1,204 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type PlatformBarkController struct {
-	beego.Controller
-}
-
-func (c *PlatformBarkController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *PlatformBarkController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-// GetBarkInfo GET /platform/bark/info
-func (c *PlatformBarkController) GetBarkInfo() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	enabledStr := models.GetPlatformSettingValue("bark_enabled", "0")
-	serverURL := models.GetPlatformSettingValue("bark_server_url", "https://api.day.app")
-	deviceKey := models.GetPlatformSettingValue("bark_device_key", "")
-
-	enabled := false
-	if enabledStr == "1" {
-		enabled = true
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"enabled":    enabled,
-			"server_url": serverURL,
-			"device_key": deviceKey,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-type barkEditPayload struct {
-	Enabled   bool   `json:"enabled"`
-	ServerUrl string `json:"server_url"`
-	DeviceKey string `json:"device_key"`
-}
-
-// EditBarkInfo POST /platform/bark/editinfo
-func (c *PlatformBarkController) EditBarkInfo() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p barkEditPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	enabledStr := "0"
-	if p.Enabled {
-		enabledStr = "1"
-	}
-
-	serverURL := strings.TrimSpace(p.ServerUrl)
-	if serverURL == "" {
-		serverURL = "https://api.day.app"
-	}
-	deviceKey := strings.TrimSpace(p.DeviceKey)
-
-	settings := []struct {
-		code   string
-		name   string
-		value  string
-		remark string
-	}{
-		{"bark_enabled", "Bark推送启用状态", enabledStr, "0为关闭，1为开启"},
-		{"bark_server_url", "Bark推送服务器地址", serverURL, ""},
-		{"bark_device_key", "Bark设备Key", deviceKey, ""},
-	}
-
-	for _, item := range settings {
-		var setting models.PlatformNormalSetting
-		err := models.Orm.QueryTable(new(models.PlatformNormalSetting)).
-			Filter("code", item.code).
-			Filter("delete_time__isnull", true).
-			One(&setting)
-		if err == nil {
-			setting.Value = item.value
-			setting.Name = item.name
-			setting.Remark = item.remark
-			now := time.Now()
-			setting.UpdateTime = &now
-			_, err = models.Orm.Update(&setting, "Value", "Name", "Remark", "UpdateTime")
-			if err != nil {
-				c.jsonErr(500, 500, "保存失败: "+err.Error())
-				return
-			}
-		} else {
-			newSetting := models.PlatformNormalSetting{
-				Name:       item.name,
-				Code:       item.code,
-				Value:      item.value,
-				Remark:     item.remark,
-				CreateTime: time.Now(),
-			}
-			_, err = models.Orm.Insert(&newSetting)
-			if err != nil {
-				c.jsonErr(500, 500, "保存失败: "+err.Error())
-				return
-			}
-		}
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
-	_ = c.ServeJSON()
-}
-
-type barkTestPayload struct {
-	ServerUrl string `json:"server_url"`
-	DeviceKey string `json:"device_key"`
-}
-
-// SendTestBark POST /platform/bark/sendtest
-func (c *PlatformBarkController) SendTestBark() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p barkTestPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	serverURL := strings.TrimSpace(p.ServerUrl)
-	if serverURL == "" {
-		serverURL = models.GetPlatformSettingValue("bark_server_url", "https://api.day.app")
-	}
-	deviceKey := strings.TrimSpace(p.DeviceKey)
-	if deviceKey == "" {
-		deviceKey = models.GetPlatformSettingValue("bark_device_key", "")
-	}
-
-	if deviceKey == "" {
-		c.jsonErr(400, 400, "设备 Key 不能为空")
-		return
-	}
-
-	// 拼接发送 URL，注意去除多余斜杠
-	baseURL := strings.TrimRight(serverURL, "/")
-	// Bark 的格式是: base_url/device_key/title/body
-	testURL := fmt.Sprintf("%s/%s/测试通知/您配置的 Bark 推送服务已连接成功！", baseURL, deviceKey)
-
-	client := &http.Client{Timeout: 10 * time.Second}
-	resp, err := client.Get(testURL)
-	if err != nil {
-		c.jsonErr(500, 500, "发送失败: "+err.Error())
-		return
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		bodyBytes, _ := io.ReadAll(resp.Body)
-		c.jsonErr(500, 500, fmt.Sprintf("发送失败，HTTP 状态码: %d, 返回内容: %s", resp.StatusCode, string(bodyBytes)))
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "测试推送已发出，请注意查收"}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type PlatformBarkController struct {
+	beego.Controller
+}
+
+func (c *PlatformBarkController) platformClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+func (c *PlatformBarkController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// GetBarkInfo GET /platform/bark/info
+func (c *PlatformBarkController) GetBarkInfo() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	enabledStr := models.GetPlatformSettingValue("bark_enabled", "0")
+	serverURL := models.GetPlatformSettingValue("bark_server_url", "https://api.day.app")
+	deviceKey := models.GetPlatformSettingValue("bark_device_key", "")
+
+	enabled := false
+	if enabledStr == "1" {
+		enabled = true
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"enabled":    enabled,
+			"server_url": serverURL,
+			"device_key": deviceKey,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+type barkEditPayload struct {
+	Enabled   bool   `json:"enabled"`
+	ServerUrl string `json:"server_url"`
+	DeviceKey string `json:"device_key"`
+}
+
+// EditBarkInfo POST /platform/bark/editinfo
+func (c *PlatformBarkController) EditBarkInfo() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p barkEditPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	enabledStr := "0"
+	if p.Enabled {
+		enabledStr = "1"
+	}
+
+	serverURL := strings.TrimSpace(p.ServerUrl)
+	if serverURL == "" {
+		serverURL = "https://api.day.app"
+	}
+	deviceKey := strings.TrimSpace(p.DeviceKey)
+
+	settings := []struct {
+		code   string
+		name   string
+		value  string
+		remark string
+	}{
+		{"bark_enabled", "Bark推送启用状态", enabledStr, "0为关闭，1为开启"},
+		{"bark_server_url", "Bark推送服务器地址", serverURL, ""},
+		{"bark_device_key", "Bark设备Key", deviceKey, ""},
+	}
+
+	for _, item := range settings {
+		var setting models.PlatformNormalSetting
+		err := models.Orm.QueryTable(new(models.PlatformNormalSetting)).
+			Filter("code", item.code).
+			Filter("delete_time__isnull", true).
+			One(&setting)
+		if err == nil {
+			setting.Value = item.value
+			setting.Name = item.name
+			setting.Remark = item.remark
+			now := time.Now()
+			setting.UpdateTime = &now
+			_, err = models.Orm.Update(&setting, "Value", "Name", "Remark", "UpdateTime")
+			if err != nil {
+				c.jsonErr(500, 500, "保存失败: "+err.Error())
+				return
+			}
+		} else {
+			newSetting := models.PlatformNormalSetting{
+				Name:       item.name,
+				Code:       item.code,
+				Value:      item.value,
+				Remark:     item.remark,
+				CreateTime: time.Now(),
+			}
+			_, err = models.Orm.Insert(&newSetting)
+			if err != nil {
+				c.jsonErr(500, 500, "保存失败: "+err.Error())
+				return
+			}
+		}
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
+	_ = c.ServeJSON()
+}
+
+type barkTestPayload struct {
+	ServerUrl string `json:"server_url"`
+	DeviceKey string `json:"device_key"`
+}
+
+// SendTestBark POST /platform/bark/sendtest
+func (c *PlatformBarkController) SendTestBark() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p barkTestPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	serverURL := strings.TrimSpace(p.ServerUrl)
+	if serverURL == "" {
+		serverURL = models.GetPlatformSettingValue("bark_server_url", "https://api.day.app")
+	}
+	deviceKey := strings.TrimSpace(p.DeviceKey)
+	if deviceKey == "" {
+		deviceKey = models.GetPlatformSettingValue("bark_device_key", "")
+	}
+
+	if deviceKey == "" {
+		c.jsonErr(400, 400, "设备 Key 不能为空")
+		return
+	}
+
+	// 拼接发送 URL，注意去除多余斜杠
+	baseURL := strings.TrimRight(serverURL, "/")
+	// Bark 的格式是: base_url/device_key/title/body
+	testURL := fmt.Sprintf("%s/%s/测试通知/您配置的 Bark 推送服务已连接成功！", baseURL, deviceKey)
+
+	client := &http.Client{Timeout: 10 * time.Second}
+	resp, err := client.Get(testURL)
+	if err != nil {
+		c.jsonErr(500, 500, "发送失败: "+err.Error())
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		bodyBytes, _ := io.ReadAll(resp.Body)
+		c.jsonErr(500, 500, fmt.Sprintf("发送失败，HTTP 状态码: %d, 返回内容: %s", resp.StatusCode, string(bodyBytes)))
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "测试推送已发出，请注意查收"}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/platform_commission.go b/go/controllers/platform_commission.go
index 7220a0d..a19ae95 100644
--- a/go/controllers/platform_commission.go
+++ b/go/controllers/platform_commission.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services/payment"
 
@@ -88,7 +89,8 @@ func commissionOrderDTO(row *models.PlatformCommissionOrder) map[string]interfac
 // List GET /platform/commission/list 佣金台账
 func (c *PlatformCommissionController) List() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	page, _ := strconv.Atoi(c.GetString("page", "1"))
@@ -118,7 +120,8 @@ func (c *PlatformCommissionController) List() {
 // Stats GET /platform/commission/stats 台账统计
 func (c *PlatformCommissionController) Stats() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	stats, err := payment.GetCommissionStats()
@@ -133,7 +136,8 @@ func (c *PlatformCommissionController) Stats() {
 func (c *PlatformCommissionController) MarkPaid() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -220,7 +224,8 @@ func buildTierJSON(steps []struct {
 // RulesList GET /platform/commission/rules 规则列表
 func (c *PlatformCommissionController) RulesList() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	page, _ := strconv.Atoi(c.GetString("page", "1"))
@@ -260,7 +265,8 @@ func (c *PlatformCommissionController) RulesList() {
 func (c *PlatformCommissionController) RuleCreate() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -299,7 +305,8 @@ func (c *PlatformCommissionController) RuleCreate() {
 // RuleUpdate POST /platform/commission/rules/:id 更新规则
 func (c *PlatformCommissionController) RuleUpdate() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -380,7 +387,8 @@ func applyCommissionRuleValues(row *models.PlatformCommissionRule, p *commission
 // RuleDelete DELETE /platform/commission/rules/:id 删除规则（软删除；历史佣金单不受影响）
 func (c *PlatformCommissionController) RuleDelete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -401,7 +409,8 @@ func (c *PlatformCommissionController) RuleDelete() {
 // RuleToggle POST /platform/commission/rules/:id/status 启用/停用
 func (c *PlatformCommissionController) RuleToggle() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/platform_complaint.go b/go/controllers/platform_complaint.go
index fedac95..d84d15f 100644
--- a/go/controllers/platform_complaint.go
+++ b/go/controllers/platform_complaint.go
@@ -1,363 +1,353 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	"github.com/beego/beego/v2/client/orm"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type PlatformComplaintController struct {
-	beego.Controller
-}
-
-func (c *PlatformComplaintController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *PlatformComplaintController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-func (c *PlatformComplaintController) ok(data interface{}) {
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
-	_ = c.ServeJSON()
-}
-
-func categoryNameMap(ids []uint64) map[uint64]string {
-	m := make(map[uint64]string)
-	if len(ids) == 0 {
-		return m
-	}
-	seen := make(map[uint64]bool)
-	var uniq []uint64
-	for _, id := range ids {
-		if id > 0 && !seen[id] {
-			seen[id] = true
-			uniq = append(uniq, id)
-		}
-	}
-	if len(uniq) == 0 {
-		return m
-	}
-	var cats []models.ComplaintCategory
-	_, _ = models.Orm.QueryTable(new(models.ComplaintCategory)).
-		Filter("id__in", uniq).
-		Filter("delete_time__isnull", true).
-		All(&cats)
-	for _, x := range cats {
-		m[x.ID] = x.Name
-	}
-	return m
-}
-
-// List GET /platform/complaint/list?page=1&pageSize=20&categoryId=&status=&keyword=
-func (c *PlatformComplaintController) List() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 20)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 20
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-	var categoryID uint64
-	if s := strings.TrimSpace(c.GetString("categoryId")); s != "" {
-		if v, err := strconv.ParseUint(s, 10, 64); err == nil {
-			categoryID = v
-		}
-	}
-	statusStr := strings.TrimSpace(c.GetString("status"))
-	keyword := strings.TrimSpace(c.GetString("keyword"))
-
-	qs := models.Orm.QueryTable(new(models.PlatformComplaint)).Filter("delete_time__isnull", true)
-	if categoryID > 0 {
-		qs = qs.Filter("category_id", categoryID)
-	}
-	if statusStr != "" {
-		if st, err := strconv.Atoi(statusStr); err == nil {
-			qs = qs.Filter("status", st)
-		}
-	}
-	if keyword != "" {
-		cond := orm.NewCondition().
-			Or("title__icontains", keyword).
-			Or("content__icontains", keyword).
-			Or("contact_name__icontains", keyword).
-			Or("contact_phone__icontains", keyword).
-			Or("contact_email__icontains", keyword)
-		qs = qs.SetCond(cond)
-	}
-
-	total, _ := qs.Count()
-	var rows []models.PlatformComplaint
-	_, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取失败: "+err.Error())
-		return
-	}
-	ids := make([]uint64, 0, len(rows))
-	for _, r := range rows {
-		ids = append(ids, r.CategoryID)
-	}
-	names := categoryNameMap(ids)
-	list := make([]map[string]interface{}, 0, len(rows))
-	for _, r := range rows {
-		list = append(list, map[string]interface{}{
-			"id":            r.ID,
-			"categoryId":    r.CategoryID,
-			"categoryName":  names[r.CategoryID],
-			"title":         r.Title,
-			"content":       r.Content,
-			"contactName":   r.ContactName,
-			"contactPhone":  r.ContactPhone,
-			"contactEmail":  r.ContactEmail,
-			"status":        r.Status,
-			"replyContent":  r.ReplyContent,
-			"replyTime":     r.ReplyTime,
-			"tid":           r.Tid,
-			"remark":        r.Remark,
-			"createTime":    r.CreateTime,
-			"updateTime":    r.UpdateTime,
-		})
-	}
-	c.ok(map[string]interface{}{
-		"list":     list,
-		"total":    total,
-		"page":     page,
-		"pageSize": pageSize,
-	})
-}
-
-// Detail GET /platform/complaint/:id
-func (c *PlatformComplaintController) Detail() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-	var row models.PlatformComplaint
-	err = models.Orm.QueryTable(new(models.PlatformComplaint)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		One(&row)
-	if err != nil {
-		c.jsonErr(404, 404, "记录不存在")
-		return
-	}
-	names := categoryNameMap([]uint64{row.CategoryID})
-	c.ok(map[string]interface{}{
-		"id":            row.ID,
-		"categoryId":    row.CategoryID,
-		"categoryName":  names[row.CategoryID],
-		"title":         row.Title,
-		"content":       row.Content,
-		"contactName":   row.ContactName,
-		"contactPhone":  row.ContactPhone,
-		"contactEmail":  row.ContactEmail,
-		"status":        row.Status,
-		"replyContent":  row.ReplyContent,
-		"replyTime":     row.ReplyTime,
-		"tid":           row.Tid,
-		"remark":        row.Remark,
-		"createTime":    row.CreateTime,
-		"updateTime":    row.UpdateTime,
-	})
-}
-
-type complaintPayload struct {
-	CategoryID   *uint64 `json:"categoryId"`
-	Title        *string `json:"title"`
-	Content      *string `json:"content"`
-	ContactName  *string `json:"contactName"`
-	ContactPhone *string `json:"contactPhone"`
-	ContactEmail *string `json:"contactEmail"`
-	Status       *int8   `json:"status"`
-	ReplyContent *string `json:"replyContent"`
-	Tid          *uint64 `json:"tid"`
-	Remark       *string `json:"remark"`
-}
-
-// Create POST /platform/complaint
-func (c *PlatformComplaintController) Create() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	body, _ := io.ReadAll(c.Ctx.Request.Body)
-	var p complaintPayload
-	if err := json.Unmarshal(body, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	if p.CategoryID == nil || *p.CategoryID == 0 || p.Title == nil || strings.TrimSpace(*p.Title) == "" ||
-		p.Content == nil || strings.TrimSpace(*p.Content) == "" {
-		c.jsonErr(400, 400, "分类、标题、内容不能为空")
-		return
-	}
-	row := models.PlatformComplaint{
-		CategoryID: *p.CategoryID,
-		Title:      strings.TrimSpace(*p.Title),
-		Content:    strings.TrimSpace(*p.Content),
-		Status:     0,
-	}
-	if p.ContactName != nil {
-		row.ContactName = p.ContactName
-	}
-	if p.ContactPhone != nil {
-		row.ContactPhone = p.ContactPhone
-	}
-	if p.ContactEmail != nil {
-		row.ContactEmail = p.ContactEmail
-	}
-	if p.Tid != nil {
-		row.Tid = p.Tid
-	}
-	if p.Status != nil {
-		row.Status = *p.Status
-	}
-	if p.Remark != nil {
-		row.Remark = p.Remark
-	}
-	id, err := models.Orm.Insert(&row)
-	if err != nil {
-		c.jsonErr(500, 500, "创建失败: "+err.Error())
-		return
-	}
-	c.ok(map[string]interface{}{"id": id})
-}
-
-// Update POST /platform/complaint/:id
-func (c *PlatformComplaintController) Update() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-	body, _ := io.ReadAll(c.Ctx.Request.Body)
-	var p complaintPayload
-	if err := json.Unmarshal(body, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	up := map[string]interface{}{}
-	if p.CategoryID != nil && *p.CategoryID > 0 {
-		up["category_id"] = *p.CategoryID
-	}
-	if p.Title != nil {
-		up["title"] = strings.TrimSpace(*p.Title)
-	}
-	if p.Content != nil {
-		up["content"] = strings.TrimSpace(*p.Content)
-	}
-	if p.ContactName != nil {
-		up["contact_name"] = p.ContactName
-	}
-	if p.ContactPhone != nil {
-		up["contact_phone"] = p.ContactPhone
-	}
-	if p.ContactEmail != nil {
-		up["contact_email"] = p.ContactEmail
-	}
-	if p.Status != nil {
-		up["status"] = *p.Status
-	}
-	if p.ReplyContent != nil {
-		s := strings.TrimSpace(*p.ReplyContent)
-		up["reply_content"] = s
-		if s != "" {
-			now := time.Now()
-			up["reply_time"] = now
-		}
-	}
-	if p.Tid != nil {
-		up["tid"] = p.Tid
-	}
-	if p.Remark != nil {
-		up["remark"] = p.Remark
-	}
-	if len(up) == 0 {
-		c.jsonErr(400, 400, "无更新字段")
-		return
-	}
-	n, err := models.Orm.QueryTable(new(models.PlatformComplaint)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(up)
-	if err != nil {
-		c.jsonErr(500, 500, "更新失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "记录不存在")
-		return
-	}
-	c.ok(nil)
-}
-
-// Delete DELETE /platform/complaint/:id
-func (c *PlatformComplaintController) Delete() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.PlatformComplaint)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now})
-	if err != nil {
-		c.jsonErr(500, 500, "删除失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "记录不存在")
-		return
-	}
-	c.ok(nil)
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	"github.com/beego/beego/v2/client/orm"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type PlatformComplaintController struct {
+	beego.Controller
+}
+
+func (c *PlatformComplaintController) platformClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+func (c *PlatformComplaintController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+func (c *PlatformComplaintController) ok(data interface{}) {
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+func categoryNameMap(ids []uint64) map[uint64]string {
+	m := make(map[uint64]string)
+	if len(ids) == 0 {
+		return m
+	}
+	seen := make(map[uint64]bool)
+	var uniq []uint64
+	for _, id := range ids {
+		if id > 0 && !seen[id] {
+			seen[id] = true
+			uniq = append(uniq, id)
+		}
+	}
+	if len(uniq) == 0 {
+		return m
+	}
+	var cats []models.ComplaintCategory
+	_, _ = models.Orm.QueryTable(new(models.ComplaintCategory)).
+		Filter("id__in", uniq).
+		Filter("delete_time__isnull", true).
+		All(&cats)
+	for _, x := range cats {
+		m[x.ID] = x.Name
+	}
+	return m
+}
+
+// List GET /platform/complaint/list?page=1&pageSize=20&categoryId=&status=&keyword=
+func (c *PlatformComplaintController) List() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 20)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 20
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+	var categoryID uint64
+	if s := strings.TrimSpace(c.GetString("categoryId")); s != "" {
+		if v, err := strconv.ParseUint(s, 10, 64); err == nil {
+			categoryID = v
+		}
+	}
+	statusStr := strings.TrimSpace(c.GetString("status"))
+	keyword := strings.TrimSpace(c.GetString("keyword"))
+
+	qs := models.Orm.QueryTable(new(models.PlatformComplaint)).Filter("delete_time__isnull", true)
+	if categoryID > 0 {
+		qs = qs.Filter("category_id", categoryID)
+	}
+	if statusStr != "" {
+		if st, err := strconv.Atoi(statusStr); err == nil {
+			qs = qs.Filter("status", st)
+		}
+	}
+	if keyword != "" {
+		cond := orm.NewCondition().
+			Or("title__icontains", keyword).
+			Or("content__icontains", keyword).
+			Or("contact_name__icontains", keyword).
+			Or("contact_phone__icontains", keyword).
+			Or("contact_email__icontains", keyword)
+		qs = qs.SetCond(cond)
+	}
+
+	total, _ := qs.Count()
+	var rows []models.PlatformComplaint
+	_, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取失败: "+err.Error())
+		return
+	}
+	ids := make([]uint64, 0, len(rows))
+	for _, r := range rows {
+		ids = append(ids, r.CategoryID)
+	}
+	names := categoryNameMap(ids)
+	list := make([]map[string]interface{}, 0, len(rows))
+	for _, r := range rows {
+		list = append(list, map[string]interface{}{
+			"id":            r.ID,
+			"categoryId":    r.CategoryID,
+			"categoryName":  names[r.CategoryID],
+			"title":         r.Title,
+			"content":       r.Content,
+			"contactName":   r.ContactName,
+			"contactPhone":  r.ContactPhone,
+			"contactEmail":  r.ContactEmail,
+			"status":        r.Status,
+			"replyContent":  r.ReplyContent,
+			"replyTime":     r.ReplyTime,
+			"tid":           r.Tid,
+			"remark":        r.Remark,
+			"createTime":    r.CreateTime,
+			"updateTime":    r.UpdateTime,
+		})
+	}
+	c.ok(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"page":     page,
+		"pageSize": pageSize,
+	})
+}
+
+// Detail GET /platform/complaint/:id
+func (c *PlatformComplaintController) Detail() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+	var row models.PlatformComplaint
+	err = models.Orm.QueryTable(new(models.PlatformComplaint)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		One(&row)
+	if err != nil {
+		c.jsonErr(404, 404, "记录不存在")
+		return
+	}
+	names := categoryNameMap([]uint64{row.CategoryID})
+	c.ok(map[string]interface{}{
+		"id":            row.ID,
+		"categoryId":    row.CategoryID,
+		"categoryName":  names[row.CategoryID],
+		"title":         row.Title,
+		"content":       row.Content,
+		"contactName":   row.ContactName,
+		"contactPhone":  row.ContactPhone,
+		"contactEmail":  row.ContactEmail,
+		"status":        row.Status,
+		"replyContent":  row.ReplyContent,
+		"replyTime":     row.ReplyTime,
+		"tid":           row.Tid,
+		"remark":        row.Remark,
+		"createTime":    row.CreateTime,
+		"updateTime":    row.UpdateTime,
+	})
+}
+
+type complaintPayload struct {
+	CategoryID   *uint64 `json:"categoryId"`
+	Title        *string `json:"title"`
+	Content      *string `json:"content"`
+	ContactName  *string `json:"contactName"`
+	ContactPhone *string `json:"contactPhone"`
+	ContactEmail *string `json:"contactEmail"`
+	Status       *int8   `json:"status"`
+	ReplyContent *string `json:"replyContent"`
+	Tid          *uint64 `json:"tid"`
+	Remark       *string `json:"remark"`
+}
+
+// Create POST /platform/complaint
+func (c *PlatformComplaintController) Create() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	body, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p complaintPayload
+	if err := json.Unmarshal(body, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	if p.CategoryID == nil || *p.CategoryID == 0 || p.Title == nil || strings.TrimSpace(*p.Title) == "" ||
+		p.Content == nil || strings.TrimSpace(*p.Content) == "" {
+		c.jsonErr(400, 400, "分类、标题、内容不能为空")
+		return
+	}
+	row := models.PlatformComplaint{
+		CategoryID: *p.CategoryID,
+		Title:      strings.TrimSpace(*p.Title),
+		Content:    strings.TrimSpace(*p.Content),
+		Status:     0,
+	}
+	if p.ContactName != nil {
+		row.ContactName = p.ContactName
+	}
+	if p.ContactPhone != nil {
+		row.ContactPhone = p.ContactPhone
+	}
+	if p.ContactEmail != nil {
+		row.ContactEmail = p.ContactEmail
+	}
+	if p.Tid != nil {
+		row.Tid = p.Tid
+	}
+	if p.Status != nil {
+		row.Status = *p.Status
+	}
+	if p.Remark != nil {
+		row.Remark = p.Remark
+	}
+	id, err := models.Orm.Insert(&row)
+	if err != nil {
+		c.jsonErr(500, 500, "创建失败: "+err.Error())
+		return
+	}
+	c.ok(map[string]interface{}{"id": id})
+}
+
+// Update POST /platform/complaint/:id
+func (c *PlatformComplaintController) Update() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+	body, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p complaintPayload
+	if err := json.Unmarshal(body, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	up := map[string]interface{}{}
+	if p.CategoryID != nil && *p.CategoryID > 0 {
+		up["category_id"] = *p.CategoryID
+	}
+	if p.Title != nil {
+		up["title"] = strings.TrimSpace(*p.Title)
+	}
+	if p.Content != nil {
+		up["content"] = strings.TrimSpace(*p.Content)
+	}
+	if p.ContactName != nil {
+		up["contact_name"] = p.ContactName
+	}
+	if p.ContactPhone != nil {
+		up["contact_phone"] = p.ContactPhone
+	}
+	if p.ContactEmail != nil {
+		up["contact_email"] = p.ContactEmail
+	}
+	if p.Status != nil {
+		up["status"] = *p.Status
+	}
+	if p.ReplyContent != nil {
+		s := strings.TrimSpace(*p.ReplyContent)
+		up["reply_content"] = s
+		if s != "" {
+			now := time.Now()
+			up["reply_time"] = now
+		}
+	}
+	if p.Tid != nil {
+		up["tid"] = p.Tid
+	}
+	if p.Remark != nil {
+		up["remark"] = p.Remark
+	}
+	if len(up) == 0 {
+		c.jsonErr(400, 400, "无更新字段")
+		return
+	}
+	n, err := models.Orm.QueryTable(new(models.PlatformComplaint)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(up)
+	if err != nil {
+		c.jsonErr(500, 500, "更新失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "记录不存在")
+		return
+	}
+	c.ok(nil)
+}
+
+// Delete DELETE /platform/complaint/:id
+func (c *PlatformComplaintController) Delete() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.PlatformComplaint)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now})
+	if err != nil {
+		c.jsonErr(500, 500, "删除失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "记录不存在")
+		return
+	}
+	c.ok(nil)
+}
diff --git a/go/controllers/platform_complaint_category.go b/go/controllers/platform_complaint_category.go
index 6ac00cd..83e1287 100644
--- a/go/controllers/platform_complaint_category.go
+++ b/go/controllers/platform_complaint_category.go
@@ -1,203 +1,193 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type PlatformComplaintCategoryController struct {
-	beego.Controller
-}
-
-func (c *PlatformComplaintCategoryController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *PlatformComplaintCategoryController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-func (c *PlatformComplaintCategoryController) ok(data interface{}) {
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
-	_ = c.ServeJSON()
-}
-
-// List GET /platform/complaintCategory/list
-func (c *PlatformComplaintCategoryController) List() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	var rows []models.ComplaintCategory
-	_, err := models.Orm.QueryTable(new(models.ComplaintCategory)).
-		Filter("delete_time__isnull", true).
-		OrderBy("sort", "id").
-		All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取失败: "+err.Error())
-		return
-	}
-	c.ok(rows)
-}
-
-// SelectList GET /platform/complaintCategory/select — 仅启用，供下拉
-func (c *PlatformComplaintCategoryController) SelectList() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	var rows []models.ComplaintCategory
-	_, err := models.Orm.QueryTable(new(models.ComplaintCategory)).
-		Filter("delete_time__isnull", true).
-		Filter("status", 1).
-		OrderBy("sort", "id").
-		All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取失败: "+err.Error())
-		return
-	}
-	c.ok(rows)
-}
-
-type complaintCategoryPayload struct {
-	Name   *string `json:"name"`
-	Code   *string `json:"code"`
-	Sort   *int    `json:"sort"`
-	Status *int8   `json:"status"`
-}
-
-// Create POST /platform/complaintCategory
-func (c *PlatformComplaintCategoryController) Create() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	body, _ := io.ReadAll(c.Ctx.Request.Body)
-	var p complaintCategoryPayload
-	if err := json.Unmarshal(body, &p); err != nil || p.Name == nil || strings.TrimSpace(*p.Name) == "" {
-		c.jsonErr(400, 400, "分类名称不能为空")
-		return
-	}
-	sort := 0
-	if p.Sort != nil {
-		sort = *p.Sort
-	}
-	st := int8(1)
-	if p.Status != nil {
-		st = *p.Status
-	}
-	row := models.ComplaintCategory{
-		Name:   strings.TrimSpace(*p.Name),
-		Code:   p.Code,
-		Sort:   sort,
-		Status: st,
-	}
-	id, err := models.Orm.Insert(&row)
-	if err != nil {
-		c.jsonErr(500, 500, "创建失败: "+err.Error())
-		return
-	}
-	c.ok(map[string]interface{}{"id": id})
-}
-
-// Update POST /platform/complaintCategory/:id
-func (c *PlatformComplaintCategoryController) Update() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-	body, _ := io.ReadAll(c.Ctx.Request.Body)
-	var p complaintCategoryPayload
-	if err := json.Unmarshal(body, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	up := map[string]interface{}{}
-	if p.Name != nil {
-		up["name"] = strings.TrimSpace(*p.Name)
-	}
-	if p.Code != nil {
-		up["code"] = strings.TrimSpace(*p.Code)
-	}
-	if p.Sort != nil {
-		up["sort"] = *p.Sort
-	}
-	if p.Status != nil {
-		up["status"] = *p.Status
-	}
-	if len(up) == 0 {
-		c.jsonErr(400, 400, "无更新字段")
-		return
-	}
-	n, err := models.Orm.QueryTable(new(models.ComplaintCategory)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(up)
-	if err != nil {
-		c.jsonErr(500, 500, "更新失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "记录不存在")
-		return
-	}
-	c.ok(nil)
-}
-
-// Delete DELETE /platform/complaintCategory/:id
-func (c *PlatformComplaintCategoryController) Delete() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.ComplaintCategory)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now})
-	if err != nil {
-		c.jsonErr(500, 500, "删除失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "记录不存在")
-		return
-	}
-	c.ok(nil)
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type PlatformComplaintCategoryController struct {
+	beego.Controller
+}
+
+func (c *PlatformComplaintCategoryController) platformClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+func (c *PlatformComplaintCategoryController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+func (c *PlatformComplaintCategoryController) ok(data interface{}) {
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+// List GET /platform/complaintCategory/list
+func (c *PlatformComplaintCategoryController) List() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	var rows []models.ComplaintCategory
+	_, err := models.Orm.QueryTable(new(models.ComplaintCategory)).
+		Filter("delete_time__isnull", true).
+		OrderBy("sort", "id").
+		All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取失败: "+err.Error())
+		return
+	}
+	c.ok(rows)
+}
+
+// SelectList GET /platform/complaintCategory/select — 仅启用，供下拉
+func (c *PlatformComplaintCategoryController) SelectList() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	var rows []models.ComplaintCategory
+	_, err := models.Orm.QueryTable(new(models.ComplaintCategory)).
+		Filter("delete_time__isnull", true).
+		Filter("status", 1).
+		OrderBy("sort", "id").
+		All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取失败: "+err.Error())
+		return
+	}
+	c.ok(rows)
+}
+
+type complaintCategoryPayload struct {
+	Name   *string `json:"name"`
+	Code   *string `json:"code"`
+	Sort   *int    `json:"sort"`
+	Status *int8   `json:"status"`
+}
+
+// Create POST /platform/complaintCategory
+func (c *PlatformComplaintCategoryController) Create() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	body, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p complaintCategoryPayload
+	if err := json.Unmarshal(body, &p); err != nil || p.Name == nil || strings.TrimSpace(*p.Name) == "" {
+		c.jsonErr(400, 400, "分类名称不能为空")
+		return
+	}
+	sort := 0
+	if p.Sort != nil {
+		sort = *p.Sort
+	}
+	st := int8(1)
+	if p.Status != nil {
+		st = *p.Status
+	}
+	row := models.ComplaintCategory{
+		Name:   strings.TrimSpace(*p.Name),
+		Code:   p.Code,
+		Sort:   sort,
+		Status: st,
+	}
+	id, err := models.Orm.Insert(&row)
+	if err != nil {
+		c.jsonErr(500, 500, "创建失败: "+err.Error())
+		return
+	}
+	c.ok(map[string]interface{}{"id": id})
+}
+
+// Update POST /platform/complaintCategory/:id
+func (c *PlatformComplaintCategoryController) Update() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+	body, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p complaintCategoryPayload
+	if err := json.Unmarshal(body, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	up := map[string]interface{}{}
+	if p.Name != nil {
+		up["name"] = strings.TrimSpace(*p.Name)
+	}
+	if p.Code != nil {
+		up["code"] = strings.TrimSpace(*p.Code)
+	}
+	if p.Sort != nil {
+		up["sort"] = *p.Sort
+	}
+	if p.Status != nil {
+		up["status"] = *p.Status
+	}
+	if len(up) == 0 {
+		c.jsonErr(400, 400, "无更新字段")
+		return
+	}
+	n, err := models.Orm.QueryTable(new(models.ComplaintCategory)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(up)
+	if err != nil {
+		c.jsonErr(500, 500, "更新失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "记录不存在")
+		return
+	}
+	c.ok(nil)
+}
+
+// Delete DELETE /platform/complaintCategory/:id
+func (c *PlatformComplaintCategoryController) Delete() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.ComplaintCategory)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now})
+	if err != nil {
+		c.jsonErr(500, 500, "删除失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "记录不存在")
+		return
+	}
+	c.ok(nil)
+}
diff --git a/go/controllers/platform_cursor_activation_code.go b/go/controllers/platform_cursor_activation_code.go
index 9168760..7296330 100644
--- a/go/controllers/platform_cursor_activation_code.go
+++ b/go/controllers/platform_cursor_activation_code.go
@@ -1,750 +1,744 @@
-package controllers
-
-import (
-	"crypto/rand"
-	"encoding/csv"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	"github.com/beego/beego/v2/client/orm"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// PlatformCursorActivationCodeController 平台端 Cursor 激活码管理
-type PlatformCursorActivationCodeController struct {
-	beego.Controller
-}
-
-func (c *PlatformCursorActivationCodeController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *PlatformCursorActivationCodeController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-func (c *PlatformCursorActivationCodeController) ok(data interface{}) {
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
-	_ = c.ServeJSON()
-}
-
-func cursorActivationCodeTrimPtr(value *string) *string {
-	if value == nil {
-		return nil
-	}
-	v := strings.TrimSpace(*value)
-	if v == "" {
-		return nil
-	}
-	return &v
-}
-
-func cursorActivationCodeTimePtr(value *string) *time.Time {
-	if value == nil {
-		return nil
-	}
-	v := strings.TrimSpace(*value)
-	if v == "" {
-		return nil
-	}
-	layouts := []string{
-		time.RFC3339,
-		"2006-01-02 15:04:05",
-		"2006-01-02 15:04",
-		"2006-01-02",
-	}
-	for _, layout := range layouts {
-		if t, err := time.ParseInLocation(layout, v, time.Local); err == nil {
-			return &t
-		}
-	}
-	return nil
-}
-
-func cursorActivationCodeStatusValid(status int8) bool {
-	return status == 0 || status == 1 || status == 2 || status == 3
-}
-
-func cursorActivationCodeTypeName(cardType int) string {
-	switch cardType {
-	case 1:
-		return "天卡"
-	case 7:
-		return "周卡"
-	case 30:
-		return "月卡"
-	case 90:
-		return "季卡"
-	case 365:
-		return "年卡"
-	case 0:
-		return "自定义"
-	default:
-		return fmt.Sprintf("%d天", cardType)
-	}
-}
-
-func (c *PlatformCursorActivationCodeController) rowToMap(row *models.PlatformCursorActivationCode) map[string]interface{} {
-	bindStatus := 0
-	if row.BindAccount != nil || row.BindDeviceID != nil || row.MachineCode != nil {
-		bindStatus = 1
-	}
-
-	return map[string]interface{}{
-		"id":            row.ID,
-		"code":          row.Code,
-		"type":          row.Type,
-		"typeName":      cursorActivationCodeTypeName(row.Type),
-		"status":        row.Status,
-		"durationDays":  row.DurationDays,
-		"bindAccount":   row.BindAccount,
-		"bindDeviceId":  row.BindDeviceID,
-		"bindStatus":    bindStatus,
-		"machineCode":   row.MachineCode,
-		"deviceInfo":    row.DeviceInfo,
-		"ownerUserId":   row.OwnerUserID,
-		"ownerUserName": row.OwnerUserName,
-		"activatedAt":   row.ActivatedAt,
-		"expiredAt":     row.ExpiredAt,
-		"createdAt":     row.CreateTime,
-		"updatedAt":     row.UpdateTime,
-		"createTime":    row.CreateTime,
-		"updateTime":    row.UpdateTime,
-		"remark":        row.Remark,
-	}
-}
-
-func (c *PlatformCursorActivationCodeController) filteredQuery() orm.QuerySeter {
-	keyword := strings.TrimSpace(c.GetString("keyword"))
-	statusText := strings.TrimSpace(c.GetString("status"))
-	typeText := strings.TrimSpace(c.GetString("type"))
-	bindStatusText := strings.TrimSpace(c.GetString("bindStatus"))
-
-	qs := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).Filter("delete_time__isnull", true)
-
-	if keyword != "" {
-		cond := orm.NewCondition().
-			Or("code__icontains", keyword).
-			Or("bind_account__icontains", keyword).
-			Or("machine_code__icontains", keyword).
-			Or("device_info__icontains", keyword).
-			Or("owner_user_name__icontains", keyword).
-			Or("remark__icontains", keyword)
-		qs = qs.SetCond(cond)
-		qs = qs.Filter("delete_time__isnull", true)
-	}
-
-	if statusText != "" {
-		status, err := strconv.ParseInt(statusText, 10, 8)
-		if err == nil && cursorActivationCodeStatusValid(int8(status)) {
-			qs = qs.Filter("status", int8(status))
-		}
-	}
-
-	if typeText != "" {
-		cardType, err := strconv.Atoi(typeText)
-		if err == nil {
-			qs = qs.Filter("type", cardType)
-		}
-	}
-
-	if bindStatusText != "" {
-		bindStatus, err := strconv.Atoi(bindStatusText)
-		if err == nil {
-			if bindStatus == 0 {
-				qs = qs.Filter("bind_account__isnull", true).Filter("bind_device_id__isnull", true).Filter("machine_code__isnull", true)
-			} else if bindStatus == 1 {
-				cond := orm.NewCondition().
-					Or("bind_account__isnull", false).
-					Or("bind_device_id__isnull", false).
-					Or("machine_code__isnull", false)
-				qs = qs.SetCond(cond)
-				qs = qs.Filter("delete_time__isnull", true)
-				if statusText != "" {
-					status, err := strconv.ParseInt(statusText, 10, 8)
-					if err == nil && cursorActivationCodeStatusValid(int8(status)) {
-						qs = qs.Filter("status", int8(status))
-					}
-				}
-				if typeText != "" {
-					cardType, err := strconv.Atoi(typeText)
-					if err == nil {
-						qs = qs.Filter("type", cardType)
-					}
-				}
-			}
-		}
-	}
-
-	return qs
-}
-
-// List GET /platform/cursor/activationcode/list
-func (c *PlatformCursorActivationCodeController) List() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 20)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 20
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	qs := c.filteredQuery()
-	total, _ := qs.Count()
-
-	var rows []models.PlatformCursorActivationCode
-	_, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取激活码列表失败: "+err.Error())
-		return
-	}
-
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		list = append(list, c.rowToMap(&rows[i]))
-	}
-
-	c.ok(map[string]interface{}{
-		"list":     list,
-		"total":    total,
-		"page":     page,
-		"pageSize": pageSize,
-	})
-}
-
-// Detail GET /platform/cursor/activationcode/detail/:id
-func (c *PlatformCursorActivationCodeController) Detail() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-
-	var row models.PlatformCursorActivationCode
-	err = models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		One(&row)
-	if err != nil {
-		c.jsonErr(404, 404, "激活码不存在")
-		return
-	}
-
-	c.ok(c.rowToMap(&row))
-}
-
-type platformCursorActivationCodePayload struct {
-	ID            *uint64 `json:"id"`
-	Code          *string `json:"code"`
-	Type          *int    `json:"type"`
-	Status        *int8   `json:"status"`
-	DurationDays  *int    `json:"durationDays"`
-	BindAccount   *string `json:"bindAccount"`
-	BindDeviceID  *uint64 `json:"bindDeviceId"`
-	OwnerUserID   *uint64 `json:"ownerUserId"`
-	OwnerUserName *string `json:"ownerUserName"`
-	ActivatedAt   *string `json:"activatedAt"`
-	ExpiredAt     *string `json:"expiredAt"`
-	Remark        *string `json:"remark"`
-}
-
-func (c *PlatformCursorActivationCodeController) readPayload() (*platformCursorActivationCodePayload, error) {
-	body, _ := io.ReadAll(c.Ctx.Request.Body)
-	var p platformCursorActivationCodePayload
-	if err := json.Unmarshal(body, &p); err != nil {
-		return nil, err
-	}
-	return &p, nil
-}
-
-func (c *PlatformCursorActivationCodeController) fillDeviceSnapshot(up map[string]interface{}, bindDeviceID *uint64) {
-	if bindDeviceID == nil || *bindDeviceID == 0 {
-		up["bind_device_id"] = nil
-		up["machine_code"] = nil
-		up["device_info"] = nil
-		return
-	}
-
-	var device models.PlatformCursorEquipment
-	err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-		Filter("id", *bindDeviceID).
-		Filter("delete_time__isnull", true).
-		One(&device)
-	if err == nil {
-		up["bind_device_id"] = *bindDeviceID
-		up["machine_code"] = device.MachineCode
-		up["device_info"] = device.DeviceInfo
-		return
-	}
-
-	up["bind_device_id"] = *bindDeviceID
-}
-
-func (c *PlatformCursorActivationCodeController) payloadToUpdateMap(p *platformCursorActivationCodePayload, includeCode bool) (map[string]interface{}, error) {
-	up := map[string]interface{}{}
-
-	if includeCode {
-		if p.Code == nil || strings.TrimSpace(*p.Code) == "" {
-			return nil, fmt.Errorf("激活码不能为空")
-		}
-		up["code"] = strings.TrimSpace(*p.Code)
-	} else if p.Code != nil {
-		if strings.TrimSpace(*p.Code) == "" {
-			return nil, fmt.Errorf("激活码不能为空")
-		}
-		up["code"] = strings.TrimSpace(*p.Code)
-	}
-
-	if p.Type != nil {
-		if *p.Type < 0 {
-			return nil, fmt.Errorf("卡密类型不合法")
-		}
-		up["type"] = *p.Type
-	}
-	if p.Status != nil {
-		if !cursorActivationCodeStatusValid(*p.Status) {
-			return nil, fmt.Errorf("状态不合法，支持：0 未使用、1 已使用、2 已过期、3 已禁用")
-		}
-		up["status"] = *p.Status
-	}
-	if p.DurationDays != nil {
-		if *p.DurationDays < 0 || *p.DurationDays > 9999 {
-			return nil, fmt.Errorf("有效天数范围为 0-9999")
-		}
-		up["duration_days"] = *p.DurationDays
-	}
-	if p.BindAccount != nil {
-		up["bind_account"] = cursorActivationCodeTrimPtr(p.BindAccount)
-	}
-	if p.BindDeviceID != nil {
-		c.fillDeviceSnapshot(up, p.BindDeviceID)
-	}
-	if p.OwnerUserID != nil {
-		if *p.OwnerUserID == 0 {
-			up["owner_user_id"] = nil
-		} else {
-			up["owner_user_id"] = *p.OwnerUserID
-		}
-	}
-	if p.OwnerUserName != nil {
-		up["owner_user_name"] = cursorActivationCodeTrimPtr(p.OwnerUserName)
-	}
-	if p.ActivatedAt != nil {
-		up["activated_at"] = cursorActivationCodeTimePtr(p.ActivatedAt)
-	}
-	if p.ExpiredAt != nil {
-		up["expired_at"] = cursorActivationCodeTimePtr(p.ExpiredAt)
-	}
-	if p.Remark != nil {
-		up["remark"] = cursorActivationCodeTrimPtr(p.Remark)
-	}
-
-	return up, nil
-}
-
-// Add POST /platform/cursor/activationcode/add
-func (c *PlatformCursorActivationCodeController) Add() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	p, err := c.readPayload()
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	up, err := c.payloadToUpdateMap(p, true)
-	if err != nil {
-		c.jsonErr(400, 400, err.Error())
-		return
-	}
-
-	row := models.PlatformCursorActivationCode{
-		Code:          up["code"].(string),
-		Type:          30,
-		Status:        0,
-		DurationDays:  30,
-		BindAccount:   cursorActivationCodeTrimPtr(p.BindAccount),
-		BindDeviceID:  p.BindDeviceID,
-		OwnerUserID:   p.OwnerUserID,
-		OwnerUserName: cursorActivationCodeTrimPtr(p.OwnerUserName),
-		ActivatedAt:   cursorActivationCodeTimePtr(p.ActivatedAt),
-		ExpiredAt:     cursorActivationCodeTimePtr(p.ExpiredAt),
-		Remark:        cursorActivationCodeTrimPtr(p.Remark),
-		CreateTime:    time.Now(),
-	}
-
-	if p.Type != nil {
-		row.Type = *p.Type
-	}
-	if p.Status != nil {
-		row.Status = *p.Status
-	}
-	if p.DurationDays != nil {
-		row.DurationDays = *p.DurationDays
-	}
-	if row.BindDeviceID != nil && *row.BindDeviceID == 0 {
-		row.BindDeviceID = nil
-	}
-	if row.OwnerUserID != nil && *row.OwnerUserID == 0 {
-		row.OwnerUserID = nil
-	}
-	if row.BindDeviceID != nil {
-		var device models.PlatformCursorEquipment
-		if err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-			Filter("id", *row.BindDeviceID).
-			Filter("delete_time__isnull", true).
-			One(&device); err == nil {
-			row.MachineCode = &device.MachineCode
-			row.DeviceInfo = device.DeviceInfo
-		}
-	}
-
-	id, err := models.Orm.Insert(&row)
-	if err != nil {
-		if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
-			c.jsonErr(400, 400, "激活码已存在")
-			return
-		}
-		c.jsonErr(500, 500, "新增激活码失败: "+err.Error())
-		return
-	}
-
-	c.ok(map[string]interface{}{"id": id})
-}
-
-// Update POST /platform/cursor/activationcode/update
-func (c *PlatformCursorActivationCodeController) Update() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	p, err := c.readPayload()
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	if p.ID == nil || *p.ID == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-
-	up, err := c.payloadToUpdateMap(p, false)
-	if err != nil {
-		c.jsonErr(400, 400, err.Error())
-		return
-	}
-	if len(up) == 0 {
-		c.jsonErr(400, 400, "无更新字段")
-		return
-	}
-
-	now := time.Now()
-	up["update_time"] = now
-
-	n, err := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
-		Filter("id", *p.ID).
-		Filter("delete_time__isnull", true).
-		Update(up)
-	if err != nil {
-		if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
-			c.jsonErr(400, 400, "激活码已存在")
-			return
-		}
-		c.jsonErr(500, 500, "更新激活码失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "激活码不存在")
-		return
-	}
-
-	c.ok(nil)
-}
-
-// Delete POST /platform/cursor/activationcode/delete/:id
-func (c *PlatformCursorActivationCodeController) Delete() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now, "update_time": now})
-	if err != nil {
-		c.jsonErr(500, 500, "删除激活码失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "激活码不存在")
-		return
-	}
-
-	c.ok(nil)
-}
-
-type platformCursorActivationCodeGeneratePayload struct {
-	Count         int     `json:"count"`
-	Type          int     `json:"type"`
-	DurationDays  int     `json:"durationDays"`
-	OwnerUserID   *uint64 `json:"ownerUserId"`
-	OwnerUserName *string `json:"ownerUserName"`
-	Remark        *string `json:"remark"`
-}
-
-func randomCursorActivationCode() (string, error) {
-	b := make([]byte, 12)
-	if _, err := rand.Read(b); err != nil {
-		return "", err
-	}
-	return "CUR-" + strings.ToUpper(hex.EncodeToString(b)), nil
-}
-
-// Generate POST /platform/cursor/activationcode/generate
-func (c *PlatformCursorActivationCodeController) Generate() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	body, _ := io.ReadAll(c.Ctx.Request.Body)
-	var p platformCursorActivationCodeGeneratePayload
-	if err := json.Unmarshal(body, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	if p.Count < 1 {
-		p.Count = 1
-	}
-	if p.Count > 10000 {
-		c.jsonErr(400, 400, "单次最多生成 10000 个激活码")
-		return
-	}
-	if p.Type < 0 {
-		c.jsonErr(400, 400, "卡密类型不合法")
-		return
-	}
-	if p.DurationDays < 0 || p.DurationDays > 9999 {
-		c.jsonErr(400, 400, "有效天数范围为 0-9999")
-		return
-	}
-	if p.Type == 0 && p.DurationDays == 0 {
-		p.DurationDays = 30
-	}
-	if p.Type > 0 && p.DurationDays == 0 {
-		p.DurationDays = p.Type
-	}
-
-	createdIDs := make([]int64, 0, p.Count)
-	codes := make([]string, 0, p.Count)
-	now := time.Now()
-
-	for len(createdIDs) < p.Count {
-		code, err := randomCursorActivationCode()
-		if err != nil {
-			c.jsonErr(500, 500, "生成激活码失败: "+err.Error())
-			return
-		}
-
-		row := models.PlatformCursorActivationCode{
-			Code:          code,
-			Type:          p.Type,
-			Status:        0,
-			DurationDays:  p.DurationDays,
-			OwnerUserID:   p.OwnerUserID,
-			OwnerUserName: cursorActivationCodeTrimPtr(p.OwnerUserName),
-			Remark:        cursorActivationCodeTrimPtr(p.Remark),
-			CreateTime:    now,
-		}
-		if row.OwnerUserID != nil && *row.OwnerUserID == 0 {
-			row.OwnerUserID = nil
-		}
-
-		id, err := models.Orm.Insert(&row)
-		if err != nil {
-			if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
-				continue
-			}
-			c.jsonErr(500, 500, "生成激活码失败: "+err.Error())
-			return
-		}
-
-		createdIDs = append(createdIDs, id)
-		codes = append(codes, code)
-	}
-
-	c.ok(map[string]interface{}{
-		"count": len(createdIDs),
-		"ids":   createdIDs,
-		"codes": codes,
-	})
-}
-
-// Enable POST /platform/cursor/activationcode/enable/:id
-func (c *PlatformCursorActivationCodeController) Enable() {
-	c.changeStatus(0, "启用激活码失败")
-}
-
-// Disable POST /platform/cursor/activationcode/disable/:id
-func (c *PlatformCursorActivationCodeController) Disable() {
-	c.changeStatus(3, "禁用激活码失败")
-}
-
-func (c *PlatformCursorActivationCodeController) changeStatus(status int8, failMsg string) {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{
-			"status":      status,
-			"update_time": now,
-		})
-	if err != nil {
-		c.jsonErr(500, 500, failMsg+": "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "激活码不存在")
-		return
-	}
-
-	c.ok(nil)
-}
-
-// Export GET /platform/cursor/activationcode/export
-func (c *PlatformCursorActivationCodeController) Export() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	var rows []models.PlatformCursorActivationCode
-	_, err := c.filteredQuery().OrderBy("-id").Limit(50000).All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "导出激活码失败: "+err.Error())
-		return
-	}
-
-	filename := fmt.Sprintf("cursor-activation-code-%s.csv", time.Now().Format("20060102150405"))
-	c.Ctx.Output.Header("Content-Type", "text/csv; charset=utf-8")
-	c.Ctx.Output.Header("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
-
-	_, _ = c.Ctx.ResponseWriter.Write([]byte{0xEF, 0xBB, 0xBF})
-	writer := csv.NewWriter(c.Ctx.ResponseWriter)
-	_ = writer.Write([]string{
-		"ID", "激活码", "类型", "有效天数", "状态", "绑定账号", "绑定设备ID", "机器码", "归属用户ID", "归属用户", "激活时间", "过期时间", "创建时间", "备注",
-	})
-
-	statusText := map[int8]string{
-		0: "未使用",
-		1: "已使用",
-		2: "已过期",
-		3: "已禁用",
-	}
-
-	for i := range rows {
-		row := rows[i]
-		_ = writer.Write([]string{
-			strconv.FormatUint(row.ID, 10),
-			row.Code,
-			cursorActivationCodeTypeName(row.Type),
-			strconv.Itoa(row.DurationDays),
-			statusText[row.Status],
-			stringPtrValue(row.BindAccount),
-			uint64PtrValue(row.BindDeviceID),
-			stringPtrValue(row.MachineCode),
-			uint64PtrValue(row.OwnerUserID),
-			stringPtrValue(row.OwnerUserName),
-			timePtrValue(row.ActivatedAt),
-			timePtrValue(row.ExpiredAt),
-			row.CreateTime.Format("2006-01-02 15:04:05"),
-			stringPtrValue(row.Remark),
-		})
-	}
-
-	writer.Flush()
-}
-
-func stringPtrValue(value *string) string {
-	if value == nil {
-		return ""
-	}
-	return *value
-}
-
-func uint64PtrValue(value *uint64) string {
-	if value == nil {
-		return ""
-	}
-	return strconv.FormatUint(*value, 10)
-}
-
-func timePtrValue(value *time.Time) string {
-	if value == nil {
-		return ""
-	}
-	return value.Format("2006-01-02 15:04:05")
-}
+package controllers
+
+import (
+	"crypto/rand"
+	"encoding/csv"
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	"github.com/beego/beego/v2/client/orm"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// PlatformCursorActivationCodeController 平台端 Cursor 激活码管理
+type PlatformCursorActivationCodeController struct {
+	beego.Controller
+}
+
+func (c *PlatformCursorActivationCodeController) platformClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+func (c *PlatformCursorActivationCodeController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+func (c *PlatformCursorActivationCodeController) ok(data interface{}) {
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+func cursorActivationCodeTrimPtr(value *string) *string {
+	if value == nil {
+		return nil
+	}
+	v := strings.TrimSpace(*value)
+	if v == "" {
+		return nil
+	}
+	return &v
+}
+
+func cursorActivationCodeTimePtr(value *string) *time.Time {
+	if value == nil {
+		return nil
+	}
+	v := strings.TrimSpace(*value)
+	if v == "" {
+		return nil
+	}
+	layouts := []string{
+		time.RFC3339,
+		"2006-01-02 15:04:05",
+		"2006-01-02 15:04",
+		"2006-01-02",
+	}
+	for _, layout := range layouts {
+		if t, err := time.ParseInLocation(layout, v, time.Local); err == nil {
+			return &t
+		}
+	}
+	return nil
+}
+
+func cursorActivationCodeStatusValid(status int8) bool {
+	return status == 0 || status == 1 || status == 2 || status == 3
+}
+
+func cursorActivationCodeTypeName(cardType int) string {
+	switch cardType {
+	case 1:
+		return "天卡"
+	case 7:
+		return "周卡"
+	case 30:
+		return "月卡"
+	case 90:
+		return "季卡"
+	case 365:
+		return "年卡"
+	case 0:
+		return "自定义"
+	default:
+		return fmt.Sprintf("%d天", cardType)
+	}
+}
+
+func (c *PlatformCursorActivationCodeController) rowToMap(row *models.PlatformCursorActivationCode) map[string]interface{} {
+	bindStatus := 0
+	if row.BindAccount != nil || row.BindDeviceID != nil || row.MachineCode != nil {
+		bindStatus = 1
+	}
+
+	return map[string]interface{}{
+		"id":            row.ID,
+		"code":          row.Code,
+		"type":          row.Type,
+		"typeName":      cursorActivationCodeTypeName(row.Type),
+		"status":        row.Status,
+		"durationDays":  row.DurationDays,
+		"bindAccount":   row.BindAccount,
+		"bindDeviceId":  row.BindDeviceID,
+		"bindStatus":    bindStatus,
+		"machineCode":   row.MachineCode,
+		"deviceInfo":    row.DeviceInfo,
+		"ownerUserId":   row.OwnerUserID,
+		"ownerUserName": row.OwnerUserName,
+		"activatedAt":   row.ActivatedAt,
+		"expiredAt":     row.ExpiredAt,
+		"createdAt":     row.CreateTime,
+		"updatedAt":     row.UpdateTime,
+		"createTime":    row.CreateTime,
+		"updateTime":    row.UpdateTime,
+		"remark":        row.Remark,
+	}
+}
+
+func (c *PlatformCursorActivationCodeController) filteredQuery() orm.QuerySeter {
+	keyword := strings.TrimSpace(c.GetString("keyword"))
+	statusText := strings.TrimSpace(c.GetString("status"))
+	typeText := strings.TrimSpace(c.GetString("type"))
+	bindStatusText := strings.TrimSpace(c.GetString("bindStatus"))
+
+	qs := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).Filter("delete_time__isnull", true)
+
+	if keyword != "" {
+		cond := orm.NewCondition().
+			Or("code__icontains", keyword).
+			Or("bind_account__icontains", keyword).
+			Or("machine_code__icontains", keyword).
+			Or("device_info__icontains", keyword).
+			Or("owner_user_name__icontains", keyword).
+			Or("remark__icontains", keyword)
+		qs = qs.SetCond(cond)
+		qs = qs.Filter("delete_time__isnull", true)
+	}
+
+	if statusText != "" {
+		status, err := strconv.ParseInt(statusText, 10, 8)
+		if err == nil && cursorActivationCodeStatusValid(int8(status)) {
+			qs = qs.Filter("status", int8(status))
+		}
+	}
+
+	if typeText != "" {
+		cardType, err := strconv.Atoi(typeText)
+		if err == nil {
+			qs = qs.Filter("type", cardType)
+		}
+	}
+
+	if bindStatusText != "" {
+		bindStatus, err := strconv.Atoi(bindStatusText)
+		if err == nil {
+			if bindStatus == 0 {
+				qs = qs.Filter("bind_account__isnull", true).Filter("bind_device_id__isnull", true).Filter("machine_code__isnull", true)
+			} else if bindStatus == 1 {
+				cond := orm.NewCondition().
+					Or("bind_account__isnull", false).
+					Or("bind_device_id__isnull", false).
+					Or("machine_code__isnull", false)
+				qs = qs.SetCond(cond)
+				qs = qs.Filter("delete_time__isnull", true)
+				if statusText != "" {
+					status, err := strconv.ParseInt(statusText, 10, 8)
+					if err == nil && cursorActivationCodeStatusValid(int8(status)) {
+						qs = qs.Filter("status", int8(status))
+					}
+				}
+				if typeText != "" {
+					cardType, err := strconv.Atoi(typeText)
+					if err == nil {
+						qs = qs.Filter("type", cardType)
+					}
+				}
+			}
+		}
+	}
+
+	return qs
+}
+
+// List GET /platform/cursor/activationcode/list
+func (c *PlatformCursorActivationCodeController) List() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 20)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 20
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	qs := c.filteredQuery()
+	total, _ := qs.Count()
+
+	var rows []models.PlatformCursorActivationCode
+	_, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取激活码列表失败: "+err.Error())
+		return
+	}
+
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		list = append(list, c.rowToMap(&rows[i]))
+	}
+
+	c.ok(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"page":     page,
+		"pageSize": pageSize,
+	})
+}
+
+// Detail GET /platform/cursor/activationcode/detail/:id
+func (c *PlatformCursorActivationCodeController) Detail() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+
+	var row models.PlatformCursorActivationCode
+	err = models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		One(&row)
+	if err != nil {
+		c.jsonErr(404, 404, "激活码不存在")
+		return
+	}
+
+	c.ok(c.rowToMap(&row))
+}
+
+type platformCursorActivationCodePayload struct {
+	ID            *uint64 `json:"id"`
+	Code          *string `json:"code"`
+	Type          *int    `json:"type"`
+	Status        *int8   `json:"status"`
+	DurationDays  *int    `json:"durationDays"`
+	BindAccount   *string `json:"bindAccount"`
+	BindDeviceID  *uint64 `json:"bindDeviceId"`
+	OwnerUserID   *uint64 `json:"ownerUserId"`
+	OwnerUserName *string `json:"ownerUserName"`
+	ActivatedAt   *string `json:"activatedAt"`
+	ExpiredAt     *string `json:"expiredAt"`
+	Remark        *string `json:"remark"`
+}
+
+func (c *PlatformCursorActivationCodeController) readPayload() (*platformCursorActivationCodePayload, error) {
+	body, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p platformCursorActivationCodePayload
+	if err := json.Unmarshal(body, &p); err != nil {
+		return nil, err
+	}
+	return &p, nil
+}
+
+func (c *PlatformCursorActivationCodeController) fillDeviceSnapshot(up map[string]interface{}, bindDeviceID *uint64) {
+	if bindDeviceID == nil || *bindDeviceID == 0 {
+		up["bind_device_id"] = nil
+		up["machine_code"] = nil
+		up["device_info"] = nil
+		return
+	}
+
+	var device models.PlatformCursorEquipment
+	err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+		Filter("id", *bindDeviceID).
+		Filter("delete_time__isnull", true).
+		One(&device)
+	if err == nil {
+		up["bind_device_id"] = *bindDeviceID
+		up["machine_code"] = device.MachineCode
+		up["device_info"] = device.DeviceInfo
+		return
+	}
+
+	up["bind_device_id"] = *bindDeviceID
+}
+
+func (c *PlatformCursorActivationCodeController) payloadToUpdateMap(p *platformCursorActivationCodePayload, includeCode bool) (map[string]interface{}, error) {
+	up := map[string]interface{}{}
+
+	if includeCode {
+		if p.Code == nil || strings.TrimSpace(*p.Code) == "" {
+			return nil, fmt.Errorf("激活码不能为空")
+		}
+		up["code"] = strings.TrimSpace(*p.Code)
+	} else if p.Code != nil {
+		if strings.TrimSpace(*p.Code) == "" {
+			return nil, fmt.Errorf("激活码不能为空")
+		}
+		up["code"] = strings.TrimSpace(*p.Code)
+	}
+
+	if p.Type != nil {
+		if *p.Type < 0 {
+			return nil, fmt.Errorf("卡密类型不合法")
+		}
+		up["type"] = *p.Type
+	}
+	if p.Status != nil {
+		if !cursorActivationCodeStatusValid(*p.Status) {
+			return nil, fmt.Errorf("状态不合法，支持：0 未使用、1 已使用、2 已过期、3 已禁用")
+		}
+		up["status"] = *p.Status
+	}
+	if p.DurationDays != nil {
+		if *p.DurationDays < 0 || *p.DurationDays > 9999 {
+			return nil, fmt.Errorf("有效天数范围为 0-9999")
+		}
+		up["duration_days"] = *p.DurationDays
+	}
+	if p.BindAccount != nil {
+		up["bind_account"] = cursorActivationCodeTrimPtr(p.BindAccount)
+	}
+	if p.BindDeviceID != nil {
+		c.fillDeviceSnapshot(up, p.BindDeviceID)
+	}
+	if p.OwnerUserID != nil {
+		if *p.OwnerUserID == 0 {
+			up["owner_user_id"] = nil
+		} else {
+			up["owner_user_id"] = *p.OwnerUserID
+		}
+	}
+	if p.OwnerUserName != nil {
+		up["owner_user_name"] = cursorActivationCodeTrimPtr(p.OwnerUserName)
+	}
+	if p.ActivatedAt != nil {
+		up["activated_at"] = cursorActivationCodeTimePtr(p.ActivatedAt)
+	}
+	if p.ExpiredAt != nil {
+		up["expired_at"] = cursorActivationCodeTimePtr(p.ExpiredAt)
+	}
+	if p.Remark != nil {
+		up["remark"] = cursorActivationCodeTrimPtr(p.Remark)
+	}
+
+	return up, nil
+}
+
+// Add POST /platform/cursor/activationcode/add
+func (c *PlatformCursorActivationCodeController) Add() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	p, err := c.readPayload()
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	up, err := c.payloadToUpdateMap(p, true)
+	if err != nil {
+		c.jsonErr(400, 400, err.Error())
+		return
+	}
+
+	row := models.PlatformCursorActivationCode{
+		Code:          up["code"].(string),
+		Type:          30,
+		Status:        0,
+		DurationDays:  30,
+		BindAccount:   cursorActivationCodeTrimPtr(p.BindAccount),
+		BindDeviceID:  p.BindDeviceID,
+		OwnerUserID:   p.OwnerUserID,
+		OwnerUserName: cursorActivationCodeTrimPtr(p.OwnerUserName),
+		ActivatedAt:   cursorActivationCodeTimePtr(p.ActivatedAt),
+		ExpiredAt:     cursorActivationCodeTimePtr(p.ExpiredAt),
+		Remark:        cursorActivationCodeTrimPtr(p.Remark),
+		CreateTime:    time.Now(),
+	}
+
+	if p.Type != nil {
+		row.Type = *p.Type
+	}
+	if p.Status != nil {
+		row.Status = *p.Status
+	}
+	if p.DurationDays != nil {
+		row.DurationDays = *p.DurationDays
+	}
+	if row.BindDeviceID != nil && *row.BindDeviceID == 0 {
+		row.BindDeviceID = nil
+	}
+	if row.OwnerUserID != nil && *row.OwnerUserID == 0 {
+		row.OwnerUserID = nil
+	}
+	if row.BindDeviceID != nil {
+		var device models.PlatformCursorEquipment
+		if err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+			Filter("id", *row.BindDeviceID).
+			Filter("delete_time__isnull", true).
+			One(&device); err == nil {
+			row.MachineCode = &device.MachineCode
+			row.DeviceInfo = device.DeviceInfo
+		}
+	}
+
+	id, err := models.Orm.Insert(&row)
+	if err != nil {
+		if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
+			c.jsonErr(400, 400, "激活码已存在")
+			return
+		}
+		c.jsonErr(500, 500, "新增激活码失败: "+err.Error())
+		return
+	}
+
+	c.ok(map[string]interface{}{"id": id})
+}
+
+// Update POST /platform/cursor/activationcode/update
+func (c *PlatformCursorActivationCodeController) Update() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	p, err := c.readPayload()
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	if p.ID == nil || *p.ID == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+
+	up, err := c.payloadToUpdateMap(p, false)
+	if err != nil {
+		c.jsonErr(400, 400, err.Error())
+		return
+	}
+	if len(up) == 0 {
+		c.jsonErr(400, 400, "无更新字段")
+		return
+	}
+
+	now := time.Now()
+	up["update_time"] = now
+
+	n, err := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
+		Filter("id", *p.ID).
+		Filter("delete_time__isnull", true).
+		Update(up)
+	if err != nil {
+		if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
+			c.jsonErr(400, 400, "激活码已存在")
+			return
+		}
+		c.jsonErr(500, 500, "更新激活码失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "激活码不存在")
+		return
+	}
+
+	c.ok(nil)
+}
+
+// Delete POST /platform/cursor/activationcode/delete/:id
+func (c *PlatformCursorActivationCodeController) Delete() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now, "update_time": now})
+	if err != nil {
+		c.jsonErr(500, 500, "删除激活码失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "激活码不存在")
+		return
+	}
+
+	c.ok(nil)
+}
+
+type platformCursorActivationCodeGeneratePayload struct {
+	Count         int     `json:"count"`
+	Type          int     `json:"type"`
+	DurationDays  int     `json:"durationDays"`
+	OwnerUserID   *uint64 `json:"ownerUserId"`
+	OwnerUserName *string `json:"ownerUserName"`
+	Remark        *string `json:"remark"`
+}
+
+func randomCursorActivationCode() (string, error) {
+	b := make([]byte, 12)
+	if _, err := rand.Read(b); err != nil {
+		return "", err
+	}
+	return "CUR-" + strings.ToUpper(hex.EncodeToString(b)), nil
+}
+
+// Generate POST /platform/cursor/activationcode/generate
+func (c *PlatformCursorActivationCodeController) Generate() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	body, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p platformCursorActivationCodeGeneratePayload
+	if err := json.Unmarshal(body, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	if p.Count < 1 {
+		p.Count = 1
+	}
+	if p.Count > 10000 {
+		c.jsonErr(400, 400, "单次最多生成 10000 个激活码")
+		return
+	}
+	if p.Type < 0 {
+		c.jsonErr(400, 400, "卡密类型不合法")
+		return
+	}
+	if p.DurationDays < 0 || p.DurationDays > 9999 {
+		c.jsonErr(400, 400, "有效天数范围为 0-9999")
+		return
+	}
+	if p.Type == 0 && p.DurationDays == 0 {
+		p.DurationDays = 30
+	}
+	if p.Type > 0 && p.DurationDays == 0 {
+		p.DurationDays = p.Type
+	}
+
+	createdIDs := make([]int64, 0, p.Count)
+	codes := make([]string, 0, p.Count)
+	now := time.Now()
+
+	for len(createdIDs) < p.Count {
+		code, err := randomCursorActivationCode()
+		if err != nil {
+			c.jsonErr(500, 500, "生成激活码失败: "+err.Error())
+			return
+		}
+
+		row := models.PlatformCursorActivationCode{
+			Code:          code,
+			Type:          p.Type,
+			Status:        0,
+			DurationDays:  p.DurationDays,
+			OwnerUserID:   p.OwnerUserID,
+			OwnerUserName: cursorActivationCodeTrimPtr(p.OwnerUserName),
+			Remark:        cursorActivationCodeTrimPtr(p.Remark),
+			CreateTime:    now,
+		}
+		if row.OwnerUserID != nil && *row.OwnerUserID == 0 {
+			row.OwnerUserID = nil
+		}
+
+		id, err := models.Orm.Insert(&row)
+		if err != nil {
+			if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
+				continue
+			}
+			c.jsonErr(500, 500, "生成激活码失败: "+err.Error())
+			return
+		}
+
+		createdIDs = append(createdIDs, id)
+		codes = append(codes, code)
+	}
+
+	c.ok(map[string]interface{}{
+		"count": len(createdIDs),
+		"ids":   createdIDs,
+		"codes": codes,
+	})
+}
+
+// Enable POST /platform/cursor/activationcode/enable/:id
+func (c *PlatformCursorActivationCodeController) Enable() {
+	c.changeStatus(0, "启用激活码失败")
+}
+
+// Disable POST /platform/cursor/activationcode/disable/:id
+func (c *PlatformCursorActivationCodeController) Disable() {
+	c.changeStatus(3, "禁用激活码失败")
+}
+
+func (c *PlatformCursorActivationCodeController) changeStatus(status int8, failMsg string) {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{
+			"status":      status,
+			"update_time": now,
+		})
+	if err != nil {
+		c.jsonErr(500, 500, failMsg+": "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "激活码不存在")
+		return
+	}
+
+	c.ok(nil)
+}
+
+// Export GET /platform/cursor/activationcode/export
+func (c *PlatformCursorActivationCodeController) Export() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	var rows []models.PlatformCursorActivationCode
+	_, err := c.filteredQuery().OrderBy("-id").Limit(50000).All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "导出激活码失败: "+err.Error())
+		return
+	}
+
+	filename := fmt.Sprintf("cursor-activation-code-%s.csv", time.Now().Format("20060102150405"))
+	c.Ctx.Output.Header("Content-Type", "text/csv; charset=utf-8")
+	c.Ctx.Output.Header("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+
+	_, _ = c.Ctx.ResponseWriter.Write([]byte{0xEF, 0xBB, 0xBF})
+	writer := csv.NewWriter(c.Ctx.ResponseWriter)
+	_ = writer.Write([]string{
+		"ID", "激活码", "类型", "有效天数", "状态", "绑定账号", "绑定设备ID", "机器码", "归属用户ID", "归属用户", "激活时间", "过期时间", "创建时间", "备注",
+	})
+
+	statusText := map[int8]string{
+		0: "未使用",
+		1: "已使用",
+		2: "已过期",
+		3: "已禁用",
+	}
+
+	for i := range rows {
+		row := rows[i]
+		_ = writer.Write([]string{
+			strconv.FormatUint(row.ID, 10),
+			row.Code,
+			cursorActivationCodeTypeName(row.Type),
+			strconv.Itoa(row.DurationDays),
+			statusText[row.Status],
+			stringPtrValue(row.BindAccount),
+			uint64PtrValue(row.BindDeviceID),
+			stringPtrValue(row.MachineCode),
+			uint64PtrValue(row.OwnerUserID),
+			stringPtrValue(row.OwnerUserName),
+			timePtrValue(row.ActivatedAt),
+			timePtrValue(row.ExpiredAt),
+			row.CreateTime.Format("2006-01-02 15:04:05"),
+			stringPtrValue(row.Remark),
+		})
+	}
+
+	writer.Flush()
+}
+
+func stringPtrValue(value *string) string {
+	if value == nil {
+		return ""
+	}
+	return *value
+}
+
+func uint64PtrValue(value *uint64) string {
+	if value == nil {
+		return ""
+	}
+	return strconv.FormatUint(*value, 10)
+}
+
+func timePtrValue(value *time.Time) string {
+	if value == nil {
+		return ""
+	}
+	return value.Format("2006-01-02 15:04:05")
+}
diff --git a/go/controllers/platform_cursor_equipment.go b/go/controllers/platform_cursor_equipment.go
index a9569cc..092ae95 100644
--- a/go/controllers/platform_cursor_equipment.go
+++ b/go/controllers/platform_cursor_equipment.go
@@ -1,1093 +1,1089 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	"github.com/beego/beego/v2/client/orm"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// PlatformCursorEquipmentController 平台端 Cursor 设备管理
-type PlatformCursorEquipmentController struct {
-	beego.Controller
-}
-
-func (c *PlatformCursorEquipmentController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *PlatformCursorEquipmentController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-func (c *PlatformCursorEquipmentController) ok(data interface{}) {
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
-	_ = c.ServeJSON()
-}
-
-func cursorEquipmentTrimPtr(value *string) *string {
-	if value == nil {
-		return nil
-	}
-	v := strings.TrimSpace(*value)
-	if v == "" {
-		return nil
-	}
-	return &v
-}
-
-func cursorEquipmentTimePtr(value *string) *time.Time {
-	if value == nil {
-		return nil
-	}
-	v := strings.TrimSpace(*value)
-	if v == "" {
-		return nil
-	}
-	layouts := []string{
-		time.RFC3339,
-		"2006-01-02 15:04:05",
-		"2006-01-02 15:04",
-		"2006-01-02",
-	}
-	for _, layout := range layouts {
-		if t, err := time.ParseInLocation(layout, v, time.Local); err == nil {
-			return &t
-		}
-	}
-	return nil
-}
-
-func cursorEquipmentStatusValid(status int8) bool {
-	return status == 0 || status == 1 || status == 2 || status == 3
-}
-
-func (c *PlatformCursorEquipmentController) cursorActivationSummary(row *models.PlatformCursorEquipment) (int64, *models.PlatformCursorActivationCode) {
-	cond := orm.NewCondition().
-		And("delete_time__isnull", true).
-		AndCond(orm.NewCondition().
-			Or("bind_device_id", row.ID).
-			Or("machine_code", row.MachineCode))
-
-	qs := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).SetCond(cond)
-	count, _ := qs.Count()
-
-	var latest models.PlatformCursorActivationCode
-	if err := qs.OrderBy("-activated_at", "-id").One(&latest); err != nil {
-		return count, nil
-	}
-
-	return count, &latest
-}
-
-func (c *PlatformCursorEquipmentController) cursorExtractSummary(machineCode string) (int64, *models.PlatformAccountPoolCursor) {
-	qs := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).
-		Filter("delete_time__isnull", true).
-		Filter("is_extracted__gt", 0).
-		Filter("machine_code", machineCode)
-
-	count, _ := qs.Count()
-
-	var latest models.PlatformAccountPoolCursor
-	if err := qs.OrderBy("-extracted_time", "-id").One(&latest); err != nil {
-		return count, nil
-	}
-
-	return count, &latest
-}
-
-func (c *PlatformCursorEquipmentController) rowToMap(row *models.PlatformCursorEquipment) map[string]interface{} {
-	activationCount, latestActivation := c.cursorActivationSummary(row)
-	extractCount, latestExtract := c.cursorExtractSummary(row.MachineCode)
-
-	var bindActivationCode interface{}
-	var activationCodeId interface{}
-	var lastActivatedAt interface{} = row.ActivationTime
-	var expireTime interface{} = row.ExpireTime
-	var lastExtractedAt interface{}
-	if latestActivation != nil {
-		bindActivationCode = latestActivation.Code
-		activationCodeId = latestActivation.ID
-		if latestActivation.ActivatedAt != nil {
-			lastActivatedAt = latestActivation.ActivatedAt
-		}
-		if latestActivation.ExpiredAt != nil {
-			expireTime = latestActivation.ExpiredAt
-		}
-	}
-	if latestExtract != nil {
-		lastExtractedAt = latestExtract.ExtractedTime
-	}
-
-	// 查询该设备最近一条 IP 日志
-	var lastLoginIp interface{}
-	var lastLoginIpInfo interface{}
-	var latestIpLog models.PlatformCursorEquipmentIpLog
-	ipCond := orm.NewCondition().
-		AndCond(orm.NewCondition().
-			Or("equipment_id", row.ID).
-			Or("machine_code", row.MachineCode))
-	if err := models.Orm.QueryTable(new(models.PlatformCursorEquipmentIpLog)).
-		SetCond(ipCond).
-		OrderBy("-id").
-		One(&latestIpLog); err == nil {
-		lastLoginIp = latestIpLog.Query
-		lastLoginIpInfo = map[string]interface{}{
-			"id":          latestIpLog.ID,
-			"source":      latestIpLog.Source,
-			"status":      latestIpLog.Status,
-			"country":     latestIpLog.Country,
-			"countryCode": latestIpLog.CountryCode,
-			"region":      latestIpLog.Region,
-			"regionName":  latestIpLog.RegionName,
-			"city":        latestIpLog.City,
-			"zip":         latestIpLog.Zip,
-			"lat":         latestIpLog.Lat,
-			"lon":         latestIpLog.Lon,
-			"timezone":    latestIpLog.Timezone,
-			"isp":         latestIpLog.ISP,
-			"org":         latestIpLog.Org,
-			"asInfo":      latestIpLog.AsInfo,
-			"query":       latestIpLog.Query,
-			"createTime":  latestIpLog.CreateTime,
-		}
-	}
-
-	// 在线状态计算：若最后心跳时间在 5 分钟内，则认为在线
-	isOnline := false
-	if row.LastHeartbeatAt != nil && time.Since(*row.LastHeartbeatAt) < 5*time.Minute {
-		isOnline = true
-	}
-
-	return map[string]interface{}{
-		"id":                 row.ID,
-		"deviceInfo":         row.DeviceInfo,
-		"machineCode":        row.MachineCode,
-		"status":             row.Status,
-		"isOnline":           isOnline,
-		"lastHeartbeatAt":    row.LastHeartbeatAt,
-		"system":             row.System,
-		"os":                 row.System,
-		"version":            row.Version,
-		"bindAccount":        row.BindAccount,
-		"bindActivationCode": bindActivationCode,
-		"activationCode":     bindActivationCode,
-		"activationCodeId":   activationCodeId,
-		"ownerUserId":        row.OwnerUserID,
-		"ownerUserName":      row.OwnerUserName,
-		"activationTime":     lastActivatedAt,
-		"lastActivatedAt":    lastActivatedAt,
-		"expireTime":         expireTime,
-		"expiredAt":          expireTime,
-		"activationCount":    activationCount,
-		"extractCount":       extractCount,
-		"lastExtractedAt":    lastExtractedAt,
-		"lastLoginIp":        lastLoginIp,
-		"lastLoginIpInfo":    lastLoginIpInfo,
-		"remark":             row.Remark,
-		"createTime":         row.CreateTime,
-		"updateTime":         row.UpdateTime,
-	}
-}
-
-// List GET /platform/cursor/equipment/list
-// 优化：用 3 条批量 SQL 替代 N+1，列表只返回必要字段，详情由 Detail 接口按需加载完整数据。
-func (c *PlatformCursorEquipmentController) List() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 20)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 20
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	keyword := strings.TrimSpace(c.GetString("keyword"))
-	statusText := strings.TrimSpace(c.GetString("status"))
-	system := strings.TrimSpace(c.GetString("system"))
-	if system == "" {
-		system = strings.TrimSpace(c.GetString("os"))
-	}
-
-	qs := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).Filter("delete_time__isnull", true)
-
-	if keyword != "" {
-		cond := orm.NewCondition().
-			Or("machine_code__icontains", keyword).
-			Or("device_info__icontains", keyword).
-			Or("bind_account__icontains", keyword).
-			Or("owner_user_name__icontains", keyword).
-			Or("remark__icontains", keyword)
-		qs = qs.SetCond(cond)
-	}
-
-	if statusText != "" {
-		status, err := strconv.ParseInt(statusText, 10, 8)
-		if err == nil && cursorEquipmentStatusValid(int8(status)) {
-			qs = qs.Filter("status", int8(status))
-		}
-	}
-
-	if system != "" {
-		qs = qs.Filter("system__icontains", system)
-	}
-
-	total, _ := qs.Count()
-
-	var rows []models.PlatformCursorEquipment
-	_, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取设备列表失败: "+err.Error())
-		return
-	}
-
-	if len(rows) == 0 {
-		c.ok(map[string]interface{}{
-			"list":     []interface{}{},
-			"total":    total,
-			"page":     page,
-			"pageSize": pageSize,
-		})
-		return
-	}
-
-	// ── 收集本页所有设备的 ID 和机器码 ──────────────────────────────────
-	deviceIDs := make([]uint64, 0, len(rows))
-	machineCodes := make([]string, 0, len(rows))
-	codeToID := make(map[string]uint64, len(rows)) // machineCode -> equipmentID
-	for _, r := range rows {
-		deviceIDs = append(deviceIDs, r.ID)
-		machineCodes = append(machineCodes, r.MachineCode)
-		codeToID[r.MachineCode] = r.ID
-	}
-
-	// ── 批量查激活码（1 条 SQL）──────────────────────────────────────────
-	// 只取本页设备相关的所有激活码，按 id 降序，在内存里取每个设备的 latest
-	type actSummary struct {
-		code            string
-		codeID          uint64
-		count           int64
-		lastActivatedAt interface{}
-		expiredAt       interface{}
-	}
-	actMap := make(map[uint64]*actSummary, len(rows))
-
-	var allActs []models.PlatformCursorActivationCode
-	if len(deviceIDs) > 0 {
-		// Beego ORM 的 __in 过滤
-		ids := make([]interface{}, len(deviceIDs))
-		for i, id := range deviceIDs {
-			ids[i] = id
-		}
-		codes := make([]interface{}, len(machineCodes))
-		for i, mc := range machineCodes {
-			codes[i] = mc
-		}
-		actCond := orm.NewCondition().
-			And("delete_time__isnull", true).
-			AndCond(orm.NewCondition().
-				Or("bind_device_id__in", ids).
-				Or("machine_code__in", codes))
-		models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
-			SetCond(actCond).
-			OrderBy("-activated_at", "-id").
-			All(&allActs)
-	}
-	for i := range allActs {
-		a := &allActs[i]
-		// 确定归属设备 ID
-		var devID uint64
-		if a.BindDeviceID != nil && *a.BindDeviceID != 0 {
-			devID = *a.BindDeviceID
-		} else if a.MachineCode != nil {
-			devID = codeToID[*a.MachineCode]
-		}
-		if devID == 0 {
-			continue
-		}
-		s, exists := actMap[devID]
-		if !exists {
-			s = &actSummary{}
-			actMap[devID] = s
-		}
-		s.count++
-		// 第一条就是 latest（已按 -activated_at,-id 排序）
-		if s.codeID == 0 {
-			s.code = a.Code
-			s.codeID = a.ID
-			if a.ActivatedAt != nil {
-				s.lastActivatedAt = a.ActivatedAt
-			}
-			if a.ExpiredAt != nil {
-				s.expiredAt = a.ExpiredAt
-			}
-		}
-	}
-
-	// ── 批量查提取记录（1 条 SQL）──────────────────────────────────────────
-	type extractSummary struct {
-		count         int64
-		lastExtracted interface{}
-	}
-	extractMap := make(map[uint64]*extractSummary, len(rows))
-
-	type extractRow struct {
-		MachineCode   string
-		Cnt           int64
-		LastExtracted *string
-	}
-	var extractRows []extractRow
-	if len(machineCodes) > 0 {
-		inPlaceholders := make([]string, len(machineCodes))
-		inArgs := make([]interface{}, len(machineCodes))
-		for i, mc := range machineCodes {
-			inPlaceholders[i] = "?"
-			inArgs[i] = mc
-		}
-		sql := "SELECT machine_code, COUNT(*) AS cnt, MAX(extracted_time) AS last_extracted " +
-			"FROM yz_platform_account_pool_cursor " +
-			"WHERE is_extracted > 0 AND delete_time IS NULL " +
-			"AND machine_code IN (" + strings.Join(inPlaceholders, ",") + ") " +
-			"GROUP BY machine_code"
-		models.Orm.Raw(sql, inArgs...).QueryRows(&extractRows)
-	}
-	for _, er := range extractRows {
-		devID := codeToID[er.MachineCode]
-		if devID == 0 {
-			continue
-		}
-		es := &extractSummary{count: er.Cnt}
-		if er.LastExtracted != nil {
-			es.lastExtracted = *er.LastExtracted
-		}
-		extractMap[devID] = es
-	}
-
-	// ── 批量查最后登录 IP（1 条 SQL）────────────────────────────────────────
-	// 每个设备取 id 最大的一条
-	type ipRow struct {
-		EquipmentID uint64
-		MachineCode string
-		Query       string
-	}
-	ipMap := make(map[uint64]string, len(rows))
-	if len(deviceIDs) > 0 {
-		inPlaceholders := make([]string, len(deviceIDs))
-		inArgs := make([]interface{}, len(deviceIDs))
-		for i, id := range deviceIDs {
-			inPlaceholders[i] = "?"
-			inArgs[i] = id
-		}
-		codePlaceholders := make([]string, len(machineCodes))
-		codeArgs := make([]interface{}, len(machineCodes))
-		for i, mc := range machineCodes {
-			codePlaceholders[i] = "?"
-			codeArgs[i] = mc
-		}
-		allArgs := append(inArgs, codeArgs...)
-		ipSQL := "SELECT equipment_id, machine_code, query FROM yz_platform_cursor_equipment_ip_log " +
-			"WHERE id IN (" +
-			"  SELECT MAX(id) FROM yz_platform_cursor_equipment_ip_log " +
-			"  WHERE equipment_id IN (" + strings.Join(inPlaceholders, ",") + ")" +
-			"  OR machine_code IN (" + strings.Join(codePlaceholders, ",") + ")" +
-			"  GROUP BY COALESCE(NULLIF(equipment_id,0), machine_code)" +
-			")"
-		var ipRows []ipRow
-		models.Orm.Raw(ipSQL, allArgs...).QueryRows(&ipRows)
-		for _, ir := range ipRows {
-			devID := ir.EquipmentID
-			if devID == 0 {
-				devID = codeToID[ir.MachineCode]
-			}
-			if devID != 0 {
-				ipMap[devID] = ir.Query
-			}
-		}
-	}
-
-	// ── 组装列表（纯内存操作）────────────────────────────────────────────
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		r := &rows[i]
-
-		// 激活码信息
-		var bindActivationCode interface{}
-		var activationCodeId interface{}
-		var lastActivatedAt interface{} = r.ActivationTime
-		var expiredAt interface{} = r.ExpireTime
-		var activationCount int64
-		if s, ok := actMap[r.ID]; ok {
-			activationCount = s.count
-			bindActivationCode = s.code
-			activationCodeId = s.codeID
-			if s.lastActivatedAt != nil {
-				lastActivatedAt = s.lastActivatedAt
-			}
-			if s.expiredAt != nil {
-				expiredAt = s.expiredAt
-			}
-		}
-
-		// 提取记录
-		var extractCount int64
-		var lastExtractedAt interface{}
-		if es, ok := extractMap[r.ID]; ok {
-			extractCount = es.count
-			lastExtractedAt = es.lastExtracted
-		}
-
-		// 最后登录 IP
-		var lastLoginIp interface{}
-		if ip, ok := ipMap[r.ID]; ok && ip != "" {
-			lastLoginIp = ip
-		}
-
-		// 在线状态计算：若最后心跳时间在 5 分钟内，则认为在线
-		isOnline := false
-		if r.LastHeartbeatAt != nil && time.Since(*r.LastHeartbeatAt) < 5*time.Minute {
-			isOnline = true
-		}
-
-		list = append(list, map[string]interface{}{
-			"id":                 r.ID,
-			"deviceInfo":         r.DeviceInfo,
-			"machineCode":        r.MachineCode,
-			"status":             r.Status,
-			"isOnline":           isOnline,
-			"lastHeartbeatAt":    r.LastHeartbeatAt,
-			"system":             r.System,
-			"os":                 r.System,
-			"version":            r.Version,
-			"bindAccount":        r.BindAccount,
-			"bindActivationCode": bindActivationCode,
-			"activationCode":     bindActivationCode,
-			"activationCodeId":   activationCodeId,
-			"ownerUserId":        r.OwnerUserID,
-			"ownerUserName":      r.OwnerUserName,
-			"activationTime":     lastActivatedAt,
-			"lastActivatedAt":    lastActivatedAt,
-			"expireTime":         expiredAt,
-			"expiredAt":          expiredAt,
-			"activationCount":    activationCount,
-			"extractCount":       extractCount,
-			"lastExtractedAt":    lastExtractedAt,
-			"lastLoginIp":        lastLoginIp,
-			// 列表不返回 lastLoginIpInfo，点详情时由 Detail 接口加载完整 IP 信息
-			"remark":     r.Remark,
-			"createTime": r.CreateTime,
-			"updateTime": r.UpdateTime,
-		})
-	}
-
-	c.ok(map[string]interface{}{
-		"list":     list,
-		"total":    total,
-		"page":     page,
-		"pageSize": pageSize,
-	})
-}
-
-// Stats GET /platform/cursor/equipment/stats
-// 全量设备统计（不受分页与列表筛选影响）
-func (c *PlatformCursorEquipmentController) Stats() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	onlineSince := time.Now().Add(-5 * time.Minute)
-	type statsRow struct {
-		Total    int64
-		Inactive int64
-		Active   int64
-		Expired  int64
-		Disabled int64
-		Online   int64
-	}
-
-	var row statsRow
-	err := models.Orm.Raw(
-		"SELECT COUNT(*) AS total,"+
-			" SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS inactive,"+
-			" SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) AS active,"+
-			" SUM(CASE WHEN status = 2 THEN 1 ELSE 0 END) AS expired,"+
-			" SUM(CASE WHEN status = 3 THEN 1 ELSE 0 END) AS disabled,"+
-			" SUM(CASE WHEN last_heartbeat_at IS NOT NULL AND last_heartbeat_at >= ? THEN 1 ELSE 0 END) AS online"+
-			" FROM yz_platform_cursor_equipment WHERE delete_time IS NULL",
-		onlineSince,
-	).QueryRow(&row)
-	if err != nil {
-		c.jsonErr(500, 500, "获取设备统计失败: "+err.Error())
-		return
-	}
-
-	offline := row.Total - row.Online
-	if offline < 0 {
-		offline = 0
-	}
-
-	c.ok(map[string]interface{}{
-		"total":    row.Total,
-		"online":   row.Online,
-		"offline":  offline,
-		"active":   row.Active,
-		"inactive": row.Inactive,
-		"expired":  row.Expired,
-		"disabled": row.Disabled,
-	})
-}
-
-// Detail GET /platform/cursor/equipment/detail/:id
-func (c *PlatformCursorEquipmentController) Detail() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-
-	var row models.PlatformCursorEquipment
-	err = models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		One(&row)
-	if err != nil {
-		c.jsonErr(404, 404, "设备不存在")
-		return
-	}
-
-	c.ok(c.rowToMap(&row))
-}
-
-type platformCursorEquipmentPayload struct {
-	ID             *uint64 `json:"id"`
-	DeviceInfo     *string `json:"deviceInfo"`
-	MachineCode    *string `json:"machineCode"`
-	Status         *int8   `json:"status"`
-	System         *string `json:"system"`
-	Version        *string `json:"version"`
-	BindAccount    *string `json:"bindAccount"`
-	OwnerUserID    *uint64 `json:"ownerUserId"`
-	OwnerUserName  *string `json:"ownerUserName"`
-	ActivationTime *string `json:"activationTime"`
-	ExpireTime     *string `json:"expireTime"`
-	Remark         *string `json:"remark"`
-}
-
-func (c *PlatformCursorEquipmentController) readPayload() (*platformCursorEquipmentPayload, error) {
-	body, _ := io.ReadAll(c.Ctx.Request.Body)
-	var p platformCursorEquipmentPayload
-	if err := json.Unmarshal(body, &p); err != nil {
-		return nil, err
-	}
-	return &p, nil
-}
-
-func (c *PlatformCursorEquipmentController) payloadToUpdateMap(p *platformCursorEquipmentPayload, includeMachineCode bool) (map[string]interface{}, error) {
-	up := map[string]interface{}{}
-
-	if includeMachineCode {
-		if p.MachineCode == nil || strings.TrimSpace(*p.MachineCode) == "" {
-			return nil, fmt.Errorf("机器码不能为空")
-		}
-		up["machine_code"] = strings.TrimSpace(*p.MachineCode)
-	} else if p.MachineCode != nil {
-		if strings.TrimSpace(*p.MachineCode) == "" {
-			return nil, fmt.Errorf("机器码不能为空")
-		}
-		up["machine_code"] = strings.TrimSpace(*p.MachineCode)
-	}
-
-	if p.DeviceInfo != nil {
-		up["device_info"] = cursorEquipmentTrimPtr(p.DeviceInfo)
-	}
-	if p.Status != nil {
-		if !cursorEquipmentStatusValid(*p.Status) {
-			return nil, fmt.Errorf("状态不合法，支持：0 未激活、1 激活中、2 已过期、3 已禁用")
-		}
-		up["status"] = *p.Status
-	}
-	if p.System != nil {
-		up["system"] = cursorEquipmentTrimPtr(p.System)
-	}
-	if p.Version != nil {
-		up["version"] = cursorEquipmentTrimPtr(p.Version)
-	}
-	if p.BindAccount != nil {
-		up["bind_account"] = cursorEquipmentTrimPtr(p.BindAccount)
-	}
-	if p.OwnerUserID != nil {
-		if *p.OwnerUserID == 0 {
-			up["owner_user_id"] = nil
-		} else {
-			up["owner_user_id"] = *p.OwnerUserID
-		}
-	}
-	if p.OwnerUserName != nil {
-		up["owner_user_name"] = cursorEquipmentTrimPtr(p.OwnerUserName)
-	}
-	if p.ActivationTime != nil {
-		up["activation_time"] = cursorEquipmentTimePtr(p.ActivationTime)
-	}
-	if p.ExpireTime != nil {
-		up["expire_time"] = cursorEquipmentTimePtr(p.ExpireTime)
-	}
-	if p.Remark != nil {
-		up["remark"] = cursorEquipmentTrimPtr(p.Remark)
-	}
-
-	return up, nil
-}
-
-// Add POST /platform/cursor/equipment/add
-func (c *PlatformCursorEquipmentController) Add() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	p, err := c.readPayload()
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	up, err := c.payloadToUpdateMap(p, true)
-	if err != nil {
-		c.jsonErr(400, 400, err.Error())
-		return
-	}
-
-	status := int8(0)
-	if value, ok := up["status"]; ok {
-		status = value.(int8)
-	}
-
-	row := models.PlatformCursorEquipment{
-		MachineCode:    up["machine_code"].(string),
-		Status:         status,
-		DeviceInfo:     cursorEquipmentTrimPtr(p.DeviceInfo),
-		System:         cursorEquipmentTrimPtr(p.System),
-		Version:        cursorEquipmentTrimPtr(p.Version),
-		BindAccount:    cursorEquipmentTrimPtr(p.BindAccount),
-		OwnerUserID:    p.OwnerUserID,
-		OwnerUserName:  cursorEquipmentTrimPtr(p.OwnerUserName),
-		ActivationTime: cursorEquipmentTimePtr(p.ActivationTime),
-		ExpireTime:     cursorEquipmentTimePtr(p.ExpireTime),
-		Remark:         cursorEquipmentTrimPtr(p.Remark),
-		CreateTime:     time.Now(),
-	}
-
-	if row.OwnerUserID != nil && *row.OwnerUserID == 0 {
-		row.OwnerUserID = nil
-	}
-
-	id, err := models.Orm.Insert(&row)
-	if err != nil {
-		if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
-			c.jsonErr(400, 400, "机器码已存在")
-			return
-		}
-		c.jsonErr(500, 500, "新增设备失败: "+err.Error())
-		return
-	}
-
-	c.ok(map[string]interface{}{"id": id})
-}
-
-// Update POST /platform/cursor/equipment/update
-func (c *PlatformCursorEquipmentController) Update() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	p, err := c.readPayload()
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	if p.ID == nil || *p.ID == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-
-	up, err := c.payloadToUpdateMap(p, false)
-	if err != nil {
-		c.jsonErr(400, 400, err.Error())
-		return
-	}
-	if len(up) == 0 {
-		c.jsonErr(400, 400, "无更新字段")
-		return
-	}
-	now := time.Now()
-	up["update_time"] = now
-
-	n, err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-		Filter("id", *p.ID).
-		Filter("delete_time__isnull", true).
-		Update(up)
-	if err != nil {
-		if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
-			c.jsonErr(400, 400, "机器码已存在")
-			return
-		}
-		c.jsonErr(500, 500, "更新设备失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "设备不存在")
-		return
-	}
-
-	c.ok(nil)
-}
-
-// Delete POST /platform/cursor/equipment/delete/:id
-func (c *PlatformCursorEquipmentController) Delete() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now})
-	if err != nil {
-		c.jsonErr(500, 500, "删除设备失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "设备不存在")
-		return
-	}
-
-	c.ok(nil)
-}
-
-type platformCursorEquipmentActivatePayload struct {
-	ID uint64 `json:"id"`
-}
-
-// Activate POST /platform/cursor/equipment/activate
-func (c *PlatformCursorEquipmentController) Activate() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	body, _ := io.ReadAll(c.Ctx.Request.Body)
-	var p platformCursorEquipmentActivatePayload
-	if err := json.Unmarshal(body, &p); err != nil || p.ID == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-		Filter("id", p.ID).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{
-			"status":          int8(1),
-			"activation_time": now,
-			"update_time":     now,
-		})
-	if err != nil {
-		c.jsonErr(500, 500, "激活设备失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "设备不存在")
-		return
-	}
-
-	c.ok(nil)
-}
-
-// ActivationRecords GET /platform/cursor/equipment/activationRecords
-func (c *PlatformCursorEquipmentController) ActivationRecords() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	equipmentID, _ := c.GetUint64("equipmentId")
-	if equipmentID == 0 {
-		equipmentID, _ = c.GetUint64("id")
-	}
-	if equipmentID == 0 {
-		c.jsonErr(400, 400, "缺少设备ID")
-		return
-	}
-
-	var equipment models.PlatformCursorEquipment
-	if err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-		Filter("id", equipmentID).
-		Filter("delete_time__isnull", true).
-		One(&equipment); err != nil {
-		c.jsonErr(404, 404, "设备不存在")
-		return
-	}
-
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 20)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 20
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	cond := orm.NewCondition().
-		And("delete_time__isnull", true).
-		AndCond(orm.NewCondition().
-			Or("bind_device_id", equipment.ID).
-			Or("machine_code", equipment.MachineCode))
-
-	qs := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).SetCond(cond)
-	total, _ := qs.Count()
-
-	var rows []models.PlatformCursorActivationCode
-	if _, err := qs.OrderBy("-activated_at", "-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
-		c.jsonErr(500, 500, "获取激活记录失败: "+err.Error())
-		return
-	}
-
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		row := rows[i]
-		list = append(list, map[string]interface{}{
-			"id":             row.ID,
-			"code":           row.Code,
-			"activationCode": row.Code,
-			"status":         row.Status,
-			"durationDays":   row.DurationDays,
-			"machineCode":    row.MachineCode,
-			"deviceInfo":     row.DeviceInfo,
-			"ownerUserId":    row.OwnerUserID,
-			"ownerUserName":  row.OwnerUserName,
-			"activatedAt":    row.ActivatedAt,
-			"expiredAt":      row.ExpiredAt,
-			"createdAt":      row.CreateTime,
-			"remark":         row.Remark,
-		})
-	}
-
-	c.ok(map[string]interface{}{
-		"list":     list,
-		"total":    total,
-		"page":     page,
-		"pageSize": pageSize,
-	})
-}
-
-// ExtractRecords GET /platform/cursor/equipment/extractRecords
-func (c *PlatformCursorEquipmentController) ExtractRecords() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	equipmentID, _ := c.GetUint64("equipmentId")
-	if equipmentID == 0 {
-		equipmentID, _ = c.GetUint64("id")
-	}
-	if equipmentID == 0 {
-		c.jsonErr(400, 400, "缺少设备ID")
-		return
-	}
-
-	var equipment models.PlatformCursorEquipment
-	if err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-		Filter("id", equipmentID).
-		Filter("delete_time__isnull", true).
-		One(&equipment); err != nil {
-		c.jsonErr(404, 404, "设备不存在")
-		return
-	}
-
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 20)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 20
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	qs := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).
-		Filter("delete_time__isnull", true).
-		Filter("is_extracted__gt", 0).
-		Filter("machine_code", equipment.MachineCode)
-
-	total, _ := qs.Count()
-
-	var rows []models.PlatformAccountPoolCursor
-	if _, err := qs.OrderBy("-extracted_time", "-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
-		c.jsonErr(500, 500, "获取提取记录失败: "+err.Error())
-		return
-	}
-
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		row := rows[i]
-		content := buildCardResult(&row.Account, &row.Password, row.Token, row.DataType)
-		list = append(list, map[string]interface{}{
-			"id":                row.ID,
-			"status":            row.IsExtracted,
-			"isExtracted":       row.IsExtracted,
-			"platform":          row.ExtractedPlatform,
-			"extractedPlatform": row.ExtractedPlatform,
-			"dataType":          row.DataType,
-			"type":              row.DataType,
-			"account":           row.Account,
-			"password":          row.Password,
-			"token":             row.Token,
-			"content":           content,
-			"extractedAt":       row.ExtractedTime,
-			"createdAt":         row.ExtractedTime,
-			"remark":            row.Remark,
-		})
-	}
-
-	c.ok(map[string]interface{}{
-		"list":     list,
-		"total":    total,
-		"page":     page,
-		"pageSize": pageSize,
-	})
-}
-
-// IpLogs GET /platform/cursor/equipment/ipLogs?equipmentId=1
-func (c *PlatformCursorEquipmentController) IpLogs() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	equipmentID, _ := c.GetUint64("equipmentId")
-	if equipmentID == 0 {
-		equipmentID, _ = c.GetUint64("id")
-	}
-	if equipmentID == 0 {
-		c.jsonErr(400, 400, "缺少设备ID")
-		return
-	}
-
-	var equipment models.PlatformCursorEquipment
-	if err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
-		Filter("id", equipmentID).
-		Filter("delete_time__isnull", true).
-		One(&equipment); err != nil {
-		c.jsonErr(404, 404, "设备不存在")
-		return
-	}
-
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 20)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 20
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	ipCond := orm.NewCondition().
-		AndCond(orm.NewCondition().
-			Or("equipment_id", equipment.ID).
-			Or("machine_code", equipment.MachineCode))
-
-	qs := models.Orm.QueryTable(new(models.PlatformCursorEquipmentIpLog)).SetCond(ipCond)
-	total, _ := qs.Count()
-
-	var rows []models.PlatformCursorEquipmentIpLog
-	if _, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
-		c.jsonErr(500, 500, "获取 IP 日志失败: "+err.Error())
-		return
-	}
-
-	list := make([]map[string]interface{}, 0, len(rows))
-	for _, row := range rows {
-		list = append(list, map[string]interface{}{
-			"id":          row.ID,
-			"source":      row.Source,
-			"status":      row.Status,
-			"country":     row.Country,
-			"countryCode": row.CountryCode,
-			"region":      row.Region,
-			"regionName":  row.RegionName,
-			"city":        row.City,
-			"zip":         row.Zip,
-			"lat":         row.Lat,
-			"lon":         row.Lon,
-			"timezone":    row.Timezone,
-			"isp":         row.ISP,
-			"org":         row.Org,
-			"asInfo":      row.AsInfo,
-			"query":       row.Query,
-			"createTime":  row.CreateTime,
-		})
-	}
-
-	c.ok(map[string]interface{}{
-		"list":     list,
-		"total":    total,
-		"page":     page,
-		"pageSize": pageSize,
-	})
-}
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	"github.com/beego/beego/v2/client/orm"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// PlatformCursorEquipmentController 平台端 Cursor 设备管理
+type PlatformCursorEquipmentController struct {
+	beego.Controller
+}
+
+func (c *PlatformCursorEquipmentController) platformClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+func (c *PlatformCursorEquipmentController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+func (c *PlatformCursorEquipmentController) ok(data interface{}) {
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+func cursorEquipmentTrimPtr(value *string) *string {
+	if value == nil {
+		return nil
+	}
+	v := strings.TrimSpace(*value)
+	if v == "" {
+		return nil
+	}
+	return &v
+}
+
+func cursorEquipmentTimePtr(value *string) *time.Time {
+	if value == nil {
+		return nil
+	}
+	v := strings.TrimSpace(*value)
+	if v == "" {
+		return nil
+	}
+	layouts := []string{
+		time.RFC3339,
+		"2006-01-02 15:04:05",
+		"2006-01-02 15:04",
+		"2006-01-02",
+	}
+	for _, layout := range layouts {
+		if t, err := time.ParseInLocation(layout, v, time.Local); err == nil {
+			return &t
+		}
+	}
+	return nil
+}
+
+func cursorEquipmentStatusValid(status int8) bool {
+	return status == 0 || status == 1 || status == 2 || status == 3
+}
+
+func (c *PlatformCursorEquipmentController) cursorActivationSummary(row *models.PlatformCursorEquipment) (int64, *models.PlatformCursorActivationCode) {
+	cond := orm.NewCondition().
+		And("delete_time__isnull", true).
+		AndCond(orm.NewCondition().
+			Or("bind_device_id", row.ID).
+			Or("machine_code", row.MachineCode))
+
+	qs := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).SetCond(cond)
+	count, _ := qs.Count()
+
+	var latest models.PlatformCursorActivationCode
+	if err := qs.OrderBy("-activated_at", "-id").One(&latest); err != nil {
+		return count, nil
+	}
+
+	return count, &latest
+}
+
+func (c *PlatformCursorEquipmentController) cursorExtractSummary(machineCode string) (int64, *models.PlatformAccountPoolCursor) {
+	qs := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).
+		Filter("delete_time__isnull", true).
+		Filter("is_extracted__gt", 0).
+		Filter("machine_code", machineCode)
+
+	count, _ := qs.Count()
+
+	var latest models.PlatformAccountPoolCursor
+	if err := qs.OrderBy("-extracted_time", "-id").One(&latest); err != nil {
+		return count, nil
+	}
+
+	return count, &latest
+}
+
+func (c *PlatformCursorEquipmentController) rowToMap(row *models.PlatformCursorEquipment) map[string]interface{} {
+	activationCount, latestActivation := c.cursorActivationSummary(row)
+	extractCount, latestExtract := c.cursorExtractSummary(row.MachineCode)
+
+	var bindActivationCode interface{}
+	var activationCodeId interface{}
+	var lastActivatedAt interface{} = row.ActivationTime
+	var expireTime interface{} = row.ExpireTime
+	var lastExtractedAt interface{}
+	if latestActivation != nil {
+		bindActivationCode = latestActivation.Code
+		activationCodeId = latestActivation.ID
+		if latestActivation.ActivatedAt != nil {
+			lastActivatedAt = latestActivation.ActivatedAt
+		}
+		if latestActivation.ExpiredAt != nil {
+			expireTime = latestActivation.ExpiredAt
+		}
+	}
+	if latestExtract != nil {
+		lastExtractedAt = latestExtract.ExtractedTime
+	}
+
+	// 查询该设备最近一条 IP 日志
+	var lastLoginIp interface{}
+	var lastLoginIpInfo interface{}
+	var latestIpLog models.PlatformCursorEquipmentIpLog
+	ipCond := orm.NewCondition().
+		AndCond(orm.NewCondition().
+			Or("equipment_id", row.ID).
+			Or("machine_code", row.MachineCode))
+	if err := models.Orm.QueryTable(new(models.PlatformCursorEquipmentIpLog)).
+		SetCond(ipCond).
+		OrderBy("-id").
+		One(&latestIpLog); err == nil {
+		lastLoginIp = latestIpLog.Query
+		lastLoginIpInfo = map[string]interface{}{
+			"id":          latestIpLog.ID,
+			"source":      latestIpLog.Source,
+			"status":      latestIpLog.Status,
+			"country":     latestIpLog.Country,
+			"countryCode": latestIpLog.CountryCode,
+			"region":      latestIpLog.Region,
+			"regionName":  latestIpLog.RegionName,
+			"city":        latestIpLog.City,
+			"zip":         latestIpLog.Zip,
+			"lat":         latestIpLog.Lat,
+			"lon":         latestIpLog.Lon,
+			"timezone":    latestIpLog.Timezone,
+			"isp":         latestIpLog.ISP,
+			"org":         latestIpLog.Org,
+			"asInfo":      latestIpLog.AsInfo,
+			"query":       latestIpLog.Query,
+			"createTime":  latestIpLog.CreateTime,
+		}
+	}
+
+	// 在线状态计算：若最后心跳时间在 5 分钟内，则认为在线
+	isOnline := false
+	if row.LastHeartbeatAt != nil && time.Since(*row.LastHeartbeatAt) < 5*time.Minute {
+		isOnline = true
+	}
+
+	return map[string]interface{}{
+		"id":                 row.ID,
+		"deviceInfo":         row.DeviceInfo,
+		"machineCode":        row.MachineCode,
+		"status":             row.Status,
+		"isOnline":           isOnline,
+		"lastHeartbeatAt":    row.LastHeartbeatAt,
+		"system":             row.System,
+		"os":                 row.System,
+		"version":            row.Version,
+		"bindAccount":        row.BindAccount,
+		"bindActivationCode": bindActivationCode,
+		"activationCode":     bindActivationCode,
+		"activationCodeId":   activationCodeId,
+		"ownerUserId":        row.OwnerUserID,
+		"ownerUserName":      row.OwnerUserName,
+		"activationTime":     lastActivatedAt,
+		"lastActivatedAt":    lastActivatedAt,
+		"expireTime":         expireTime,
+		"expiredAt":          expireTime,
+		"activationCount":    activationCount,
+		"extractCount":       extractCount,
+		"lastExtractedAt":    lastExtractedAt,
+		"lastLoginIp":        lastLoginIp,
+		"lastLoginIpInfo":    lastLoginIpInfo,
+		"remark":             row.Remark,
+		"createTime":         row.CreateTime,
+		"updateTime":         row.UpdateTime,
+	}
+}
+
+// List GET /platform/cursor/equipment/list
+// 优化：用 3 条批量 SQL 替代 N+1，列表只返回必要字段，详情由 Detail 接口按需加载完整数据。
+func (c *PlatformCursorEquipmentController) List() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 20)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 20
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	keyword := strings.TrimSpace(c.GetString("keyword"))
+	statusText := strings.TrimSpace(c.GetString("status"))
+	system := strings.TrimSpace(c.GetString("system"))
+	if system == "" {
+		system = strings.TrimSpace(c.GetString("os"))
+	}
+
+	qs := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).Filter("delete_time__isnull", true)
+
+	if keyword != "" {
+		cond := orm.NewCondition().
+			Or("machine_code__icontains", keyword).
+			Or("device_info__icontains", keyword).
+			Or("bind_account__icontains", keyword).
+			Or("owner_user_name__icontains", keyword).
+			Or("remark__icontains", keyword)
+		qs = qs.SetCond(cond)
+	}
+
+	if statusText != "" {
+		status, err := strconv.ParseInt(statusText, 10, 8)
+		if err == nil && cursorEquipmentStatusValid(int8(status)) {
+			qs = qs.Filter("status", int8(status))
+		}
+	}
+
+	if system != "" {
+		qs = qs.Filter("system__icontains", system)
+	}
+
+	total, _ := qs.Count()
+
+	var rows []models.PlatformCursorEquipment
+	_, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取设备列表失败: "+err.Error())
+		return
+	}
+
+	if len(rows) == 0 {
+		c.ok(map[string]interface{}{
+			"list":     []interface{}{},
+			"total":    total,
+			"page":     page,
+			"pageSize": pageSize,
+		})
+		return
+	}
+
+	// ── 收集本页所有设备的 ID 和机器码 ──────────────────────────────────
+	deviceIDs := make([]uint64, 0, len(rows))
+	machineCodes := make([]string, 0, len(rows))
+	codeToID := make(map[string]uint64, len(rows)) // machineCode -> equipmentID
+	for _, r := range rows {
+		deviceIDs = append(deviceIDs, r.ID)
+		machineCodes = append(machineCodes, r.MachineCode)
+		codeToID[r.MachineCode] = r.ID
+	}
+
+	// ── 批量查激活码（1 条 SQL）──────────────────────────────────────────
+	// 只取本页设备相关的所有激活码，按 id 降序，在内存里取每个设备的 latest
+	type actSummary struct {
+		code            string
+		codeID          uint64
+		count           int64
+		lastActivatedAt interface{}
+		expiredAt       interface{}
+	}
+	actMap := make(map[uint64]*actSummary, len(rows))
+
+	var allActs []models.PlatformCursorActivationCode
+	if len(deviceIDs) > 0 {
+		// Beego ORM 的 __in 过滤
+		ids := make([]interface{}, len(deviceIDs))
+		for i, id := range deviceIDs {
+			ids[i] = id
+		}
+		codes := make([]interface{}, len(machineCodes))
+		for i, mc := range machineCodes {
+			codes[i] = mc
+		}
+		actCond := orm.NewCondition().
+			And("delete_time__isnull", true).
+			AndCond(orm.NewCondition().
+				Or("bind_device_id__in", ids).
+				Or("machine_code__in", codes))
+		models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).
+			SetCond(actCond).
+			OrderBy("-activated_at", "-id").
+			All(&allActs)
+	}
+	for i := range allActs {
+		a := &allActs[i]
+		// 确定归属设备 ID
+		var devID uint64
+		if a.BindDeviceID != nil && *a.BindDeviceID != 0 {
+			devID = *a.BindDeviceID
+		} else if a.MachineCode != nil {
+			devID = codeToID[*a.MachineCode]
+		}
+		if devID == 0 {
+			continue
+		}
+		s, exists := actMap[devID]
+		if !exists {
+			s = &actSummary{}
+			actMap[devID] = s
+		}
+		s.count++
+		// 第一条就是 latest（已按 -activated_at,-id 排序）
+		if s.codeID == 0 {
+			s.code = a.Code
+			s.codeID = a.ID
+			if a.ActivatedAt != nil {
+				s.lastActivatedAt = a.ActivatedAt
+			}
+			if a.ExpiredAt != nil {
+				s.expiredAt = a.ExpiredAt
+			}
+		}
+	}
+
+	// ── 批量查提取记录（1 条 SQL）──────────────────────────────────────────
+	type extractSummary struct {
+		count         int64
+		lastExtracted interface{}
+	}
+	extractMap := make(map[uint64]*extractSummary, len(rows))
+
+	type extractRow struct {
+		MachineCode   string
+		Cnt           int64
+		LastExtracted *string
+	}
+	var extractRows []extractRow
+	if len(machineCodes) > 0 {
+		inPlaceholders := make([]string, len(machineCodes))
+		inArgs := make([]interface{}, len(machineCodes))
+		for i, mc := range machineCodes {
+			inPlaceholders[i] = "?"
+			inArgs[i] = mc
+		}
+		sql := "SELECT machine_code, COUNT(*) AS cnt, MAX(extracted_time) AS last_extracted " +
+			"FROM yz_platform_account_pool_cursor " +
+			"WHERE is_extracted > 0 AND delete_time IS NULL " +
+			"AND machine_code IN (" + strings.Join(inPlaceholders, ",") + ") " +
+			"GROUP BY machine_code"
+		models.Orm.Raw(sql, inArgs...).QueryRows(&extractRows)
+	}
+	for _, er := range extractRows {
+		devID := codeToID[er.MachineCode]
+		if devID == 0 {
+			continue
+		}
+		es := &extractSummary{count: er.Cnt}
+		if er.LastExtracted != nil {
+			es.lastExtracted = *er.LastExtracted
+		}
+		extractMap[devID] = es
+	}
+
+	// ── 批量查最后登录 IP（1 条 SQL）────────────────────────────────────────
+	// 每个设备取 id 最大的一条
+	type ipRow struct {
+		EquipmentID uint64
+		MachineCode string
+		Query       string
+	}
+	ipMap := make(map[uint64]string, len(rows))
+	if len(deviceIDs) > 0 {
+		inPlaceholders := make([]string, len(deviceIDs))
+		inArgs := make([]interface{}, len(deviceIDs))
+		for i, id := range deviceIDs {
+			inPlaceholders[i] = "?"
+			inArgs[i] = id
+		}
+		codePlaceholders := make([]string, len(machineCodes))
+		codeArgs := make([]interface{}, len(machineCodes))
+		for i, mc := range machineCodes {
+			codePlaceholders[i] = "?"
+			codeArgs[i] = mc
+		}
+		allArgs := append(inArgs, codeArgs...)
+		ipSQL := "SELECT equipment_id, machine_code, query FROM yz_platform_cursor_equipment_ip_log " +
+			"WHERE id IN (" +
+			"  SELECT MAX(id) FROM yz_platform_cursor_equipment_ip_log " +
+			"  WHERE equipment_id IN (" + strings.Join(inPlaceholders, ",") + ")" +
+			"  OR machine_code IN (" + strings.Join(codePlaceholders, ",") + ")" +
+			"  GROUP BY COALESCE(NULLIF(equipment_id,0), machine_code)" +
+			")"
+		var ipRows []ipRow
+		models.Orm.Raw(ipSQL, allArgs...).QueryRows(&ipRows)
+		for _, ir := range ipRows {
+			devID := ir.EquipmentID
+			if devID == 0 {
+				devID = codeToID[ir.MachineCode]
+			}
+			if devID != 0 {
+				ipMap[devID] = ir.Query
+			}
+		}
+	}
+
+	// ── 组装列表（纯内存操作）────────────────────────────────────────────
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		r := &rows[i]
+
+		// 激活码信息
+		var bindActivationCode interface{}
+		var activationCodeId interface{}
+		var lastActivatedAt interface{} = r.ActivationTime
+		var expiredAt interface{} = r.ExpireTime
+		var activationCount int64
+		if s, ok := actMap[r.ID]; ok {
+			activationCount = s.count
+			bindActivationCode = s.code
+			activationCodeId = s.codeID
+			if s.lastActivatedAt != nil {
+				lastActivatedAt = s.lastActivatedAt
+			}
+			if s.expiredAt != nil {
+				expiredAt = s.expiredAt
+			}
+		}
+
+		// 提取记录
+		var extractCount int64
+		var lastExtractedAt interface{}
+		if es, ok := extractMap[r.ID]; ok {
+			extractCount = es.count
+			lastExtractedAt = es.lastExtracted
+		}
+
+		// 最后登录 IP
+		var lastLoginIp interface{}
+		if ip, ok := ipMap[r.ID]; ok && ip != "" {
+			lastLoginIp = ip
+		}
+
+		// 在线状态计算：若最后心跳时间在 5 分钟内，则认为在线
+		isOnline := false
+		if r.LastHeartbeatAt != nil && time.Since(*r.LastHeartbeatAt) < 5*time.Minute {
+			isOnline = true
+		}
+
+		list = append(list, map[string]interface{}{
+			"id":                 r.ID,
+			"deviceInfo":         r.DeviceInfo,
+			"machineCode":        r.MachineCode,
+			"status":             r.Status,
+			"isOnline":           isOnline,
+			"lastHeartbeatAt":    r.LastHeartbeatAt,
+			"system":             r.System,
+			"os":                 r.System,
+			"version":            r.Version,
+			"bindAccount":        r.BindAccount,
+			"bindActivationCode": bindActivationCode,
+			"activationCode":     bindActivationCode,
+			"activationCodeId":   activationCodeId,
+			"ownerUserId":        r.OwnerUserID,
+			"ownerUserName":      r.OwnerUserName,
+			"activationTime":     lastActivatedAt,
+			"lastActivatedAt":    lastActivatedAt,
+			"expireTime":         expiredAt,
+			"expiredAt":          expiredAt,
+			"activationCount":    activationCount,
+			"extractCount":       extractCount,
+			"lastExtractedAt":    lastExtractedAt,
+			"lastLoginIp":        lastLoginIp,
+			// 列表不返回 lastLoginIpInfo，点详情时由 Detail 接口加载完整 IP 信息
+			"remark":     r.Remark,
+			"createTime": r.CreateTime,
+			"updateTime": r.UpdateTime,
+		})
+	}
+
+	c.ok(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"page":     page,
+		"pageSize": pageSize,
+	})
+}
+
+// Stats GET /platform/cursor/equipment/stats
+// 全量设备统计（不受分页与列表筛选影响）
+func (c *PlatformCursorEquipmentController) Stats() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	onlineSince := time.Now().Add(-5 * time.Minute)
+	type statsRow struct {
+		Total    int64
+		Inactive int64
+		Active   int64
+		Expired  int64
+		Disabled int64
+		Online   int64
+	}
+
+	var row statsRow
+	err := models.Orm.Raw(
+		"SELECT COUNT(*) AS total,"+
+			" SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS inactive,"+
+			" SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) AS active,"+
+			" SUM(CASE WHEN status = 2 THEN 1 ELSE 0 END) AS expired,"+
+			" SUM(CASE WHEN status = 3 THEN 1 ELSE 0 END) AS disabled,"+
+			" SUM(CASE WHEN last_heartbeat_at IS NOT NULL AND last_heartbeat_at >= ? THEN 1 ELSE 0 END) AS online"+
+			" FROM yz_platform_cursor_equipment WHERE delete_time IS NULL",
+		onlineSince,
+	).QueryRow(&row)
+	if err != nil {
+		c.jsonErr(500, 500, "获取设备统计失败: "+err.Error())
+		return
+	}
+
+	offline := row.Total - row.Online
+	if offline < 0 {
+		offline = 0
+	}
+
+	c.ok(map[string]interface{}{
+		"total":    row.Total,
+		"online":   row.Online,
+		"offline":  offline,
+		"active":   row.Active,
+		"inactive": row.Inactive,
+		"expired":  row.Expired,
+		"disabled": row.Disabled,
+	})
+}
+
+// Detail GET /platform/cursor/equipment/detail/:id
+func (c *PlatformCursorEquipmentController) Detail() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+
+	var row models.PlatformCursorEquipment
+	err = models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		One(&row)
+	if err != nil {
+		c.jsonErr(404, 404, "设备不存在")
+		return
+	}
+
+	c.ok(c.rowToMap(&row))
+}
+
+type platformCursorEquipmentPayload struct {
+	ID             *uint64 `json:"id"`
+	DeviceInfo     *string `json:"deviceInfo"`
+	MachineCode    *string `json:"machineCode"`
+	Status         *int8   `json:"status"`
+	System         *string `json:"system"`
+	Version        *string `json:"version"`
+	BindAccount    *string `json:"bindAccount"`
+	OwnerUserID    *uint64 `json:"ownerUserId"`
+	OwnerUserName  *string `json:"ownerUserName"`
+	ActivationTime *string `json:"activationTime"`
+	ExpireTime     *string `json:"expireTime"`
+	Remark         *string `json:"remark"`
+}
+
+func (c *PlatformCursorEquipmentController) readPayload() (*platformCursorEquipmentPayload, error) {
+	body, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p platformCursorEquipmentPayload
+	if err := json.Unmarshal(body, &p); err != nil {
+		return nil, err
+	}
+	return &p, nil
+}
+
+func (c *PlatformCursorEquipmentController) payloadToUpdateMap(p *platformCursorEquipmentPayload, includeMachineCode bool) (map[string]interface{}, error) {
+	up := map[string]interface{}{}
+
+	if includeMachineCode {
+		if p.MachineCode == nil || strings.TrimSpace(*p.MachineCode) == "" {
+			return nil, fmt.Errorf("机器码不能为空")
+		}
+		up["machine_code"] = strings.TrimSpace(*p.MachineCode)
+	} else if p.MachineCode != nil {
+		if strings.TrimSpace(*p.MachineCode) == "" {
+			return nil, fmt.Errorf("机器码不能为空")
+		}
+		up["machine_code"] = strings.TrimSpace(*p.MachineCode)
+	}
+
+	if p.DeviceInfo != nil {
+		up["device_info"] = cursorEquipmentTrimPtr(p.DeviceInfo)
+	}
+	if p.Status != nil {
+		if !cursorEquipmentStatusValid(*p.Status) {
+			return nil, fmt.Errorf("状态不合法，支持：0 未激活、1 激活中、2 已过期、3 已禁用")
+		}
+		up["status"] = *p.Status
+	}
+	if p.System != nil {
+		up["system"] = cursorEquipmentTrimPtr(p.System)
+	}
+	if p.Version != nil {
+		up["version"] = cursorEquipmentTrimPtr(p.Version)
+	}
+	if p.BindAccount != nil {
+		up["bind_account"] = cursorEquipmentTrimPtr(p.BindAccount)
+	}
+	if p.OwnerUserID != nil {
+		if *p.OwnerUserID == 0 {
+			up["owner_user_id"] = nil
+		} else {
+			up["owner_user_id"] = *p.OwnerUserID
+		}
+	}
+	if p.OwnerUserName != nil {
+		up["owner_user_name"] = cursorEquipmentTrimPtr(p.OwnerUserName)
+	}
+	if p.ActivationTime != nil {
+		up["activation_time"] = cursorEquipmentTimePtr(p.ActivationTime)
+	}
+	if p.ExpireTime != nil {
+		up["expire_time"] = cursorEquipmentTimePtr(p.ExpireTime)
+	}
+	if p.Remark != nil {
+		up["remark"] = cursorEquipmentTrimPtr(p.Remark)
+	}
+
+	return up, nil
+}
+
+// Add POST /platform/cursor/equipment/add
+func (c *PlatformCursorEquipmentController) Add() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	p, err := c.readPayload()
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	up, err := c.payloadToUpdateMap(p, true)
+	if err != nil {
+		c.jsonErr(400, 400, err.Error())
+		return
+	}
+
+	status := int8(0)
+	if value, ok := up["status"]; ok {
+		status = value.(int8)
+	}
+
+	row := models.PlatformCursorEquipment{
+		MachineCode:    up["machine_code"].(string),
+		Status:         status,
+		DeviceInfo:     cursorEquipmentTrimPtr(p.DeviceInfo),
+		System:         cursorEquipmentTrimPtr(p.System),
+		Version:        cursorEquipmentTrimPtr(p.Version),
+		BindAccount:    cursorEquipmentTrimPtr(p.BindAccount),
+		OwnerUserID:    p.OwnerUserID,
+		OwnerUserName:  cursorEquipmentTrimPtr(p.OwnerUserName),
+		ActivationTime: cursorEquipmentTimePtr(p.ActivationTime),
+		ExpireTime:     cursorEquipmentTimePtr(p.ExpireTime),
+		Remark:         cursorEquipmentTrimPtr(p.Remark),
+		CreateTime:     time.Now(),
+	}
+
+	if row.OwnerUserID != nil && *row.OwnerUserID == 0 {
+		row.OwnerUserID = nil
+	}
+
+	id, err := models.Orm.Insert(&row)
+	if err != nil {
+		if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
+			c.jsonErr(400, 400, "机器码已存在")
+			return
+		}
+		c.jsonErr(500, 500, "新增设备失败: "+err.Error())
+		return
+	}
+
+	c.ok(map[string]interface{}{"id": id})
+}
+
+// Update POST /platform/cursor/equipment/update
+func (c *PlatformCursorEquipmentController) Update() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	p, err := c.readPayload()
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	if p.ID == nil || *p.ID == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+
+	up, err := c.payloadToUpdateMap(p, false)
+	if err != nil {
+		c.jsonErr(400, 400, err.Error())
+		return
+	}
+	if len(up) == 0 {
+		c.jsonErr(400, 400, "无更新字段")
+		return
+	}
+	now := time.Now()
+	up["update_time"] = now
+
+	n, err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+		Filter("id", *p.ID).
+		Filter("delete_time__isnull", true).
+		Update(up)
+	if err != nil {
+		if strings.Contains(strings.ToLower(err.Error()), "duplicate") {
+			c.jsonErr(400, 400, "机器码已存在")
+			return
+		}
+		c.jsonErr(500, 500, "更新设备失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "设备不存在")
+		return
+	}
+
+	c.ok(nil)
+}
+
+// Delete POST /platform/cursor/equipment/delete/:id
+func (c *PlatformCursorEquipmentController) Delete() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now})
+	if err != nil {
+		c.jsonErr(500, 500, "删除设备失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "设备不存在")
+		return
+	}
+
+	c.ok(nil)
+}
+
+type platformCursorEquipmentActivatePayload struct {
+	ID uint64 `json:"id"`
+}
+
+// Activate POST /platform/cursor/equipment/activate
+func (c *PlatformCursorEquipmentController) Activate() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	body, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p platformCursorEquipmentActivatePayload
+	if err := json.Unmarshal(body, &p); err != nil || p.ID == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+		Filter("id", p.ID).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{
+			"status":          int8(1),
+			"activation_time": now,
+			"update_time":     now,
+		})
+	if err != nil {
+		c.jsonErr(500, 500, "激活设备失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "设备不存在")
+		return
+	}
+
+	c.ok(nil)
+}
+
+// ActivationRecords GET /platform/cursor/equipment/activationRecords
+func (c *PlatformCursorEquipmentController) ActivationRecords() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	equipmentID, _ := c.GetUint64("equipmentId")
+	if equipmentID == 0 {
+		equipmentID, _ = c.GetUint64("id")
+	}
+	if equipmentID == 0 {
+		c.jsonErr(400, 400, "缺少设备ID")
+		return
+	}
+
+	var equipment models.PlatformCursorEquipment
+	if err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+		Filter("id", equipmentID).
+		Filter("delete_time__isnull", true).
+		One(&equipment); err != nil {
+		c.jsonErr(404, 404, "设备不存在")
+		return
+	}
+
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 20)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 20
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	cond := orm.NewCondition().
+		And("delete_time__isnull", true).
+		AndCond(orm.NewCondition().
+			Or("bind_device_id", equipment.ID).
+			Or("machine_code", equipment.MachineCode))
+
+	qs := models.Orm.QueryTable(new(models.PlatformCursorActivationCode)).SetCond(cond)
+	total, _ := qs.Count()
+
+	var rows []models.PlatformCursorActivationCode
+	if _, err := qs.OrderBy("-activated_at", "-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
+		c.jsonErr(500, 500, "获取激活记录失败: "+err.Error())
+		return
+	}
+
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		row := rows[i]
+		list = append(list, map[string]interface{}{
+			"id":             row.ID,
+			"code":           row.Code,
+			"activationCode": row.Code,
+			"status":         row.Status,
+			"durationDays":   row.DurationDays,
+			"machineCode":    row.MachineCode,
+			"deviceInfo":     row.DeviceInfo,
+			"ownerUserId":    row.OwnerUserID,
+			"ownerUserName":  row.OwnerUserName,
+			"activatedAt":    row.ActivatedAt,
+			"expiredAt":      row.ExpiredAt,
+			"createdAt":      row.CreateTime,
+			"remark":         row.Remark,
+		})
+	}
+
+	c.ok(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"page":     page,
+		"pageSize": pageSize,
+	})
+}
+
+// ExtractRecords GET /platform/cursor/equipment/extractRecords
+func (c *PlatformCursorEquipmentController) ExtractRecords() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	equipmentID, _ := c.GetUint64("equipmentId")
+	if equipmentID == 0 {
+		equipmentID, _ = c.GetUint64("id")
+	}
+	if equipmentID == 0 {
+		c.jsonErr(400, 400, "缺少设备ID")
+		return
+	}
+
+	var equipment models.PlatformCursorEquipment
+	if err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+		Filter("id", equipmentID).
+		Filter("delete_time__isnull", true).
+		One(&equipment); err != nil {
+		c.jsonErr(404, 404, "设备不存在")
+		return
+	}
+
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 20)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 20
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	qs := models.Orm.QueryTable(new(models.PlatformAccountPoolCursor)).
+		Filter("delete_time__isnull", true).
+		Filter("is_extracted__gt", 0).
+		Filter("machine_code", equipment.MachineCode)
+
+	total, _ := qs.Count()
+
+	var rows []models.PlatformAccountPoolCursor
+	if _, err := qs.OrderBy("-extracted_time", "-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
+		c.jsonErr(500, 500, "获取提取记录失败: "+err.Error())
+		return
+	}
+
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		row := rows[i]
+		content := buildCardResult(&row.Account, &row.Password, row.Token, row.DataType)
+		list = append(list, map[string]interface{}{
+			"id":                row.ID,
+			"status":            row.IsExtracted,
+			"isExtracted":       row.IsExtracted,
+			"platform":          row.ExtractedPlatform,
+			"extractedPlatform": row.ExtractedPlatform,
+			"dataType":          row.DataType,
+			"type":              row.DataType,
+			"account":           row.Account,
+			"password":          row.Password,
+			"token":             row.Token,
+			"content":           content,
+			"extractedAt":       row.ExtractedTime,
+			"createdAt":         row.ExtractedTime,
+			"remark":            row.Remark,
+		})
+	}
+
+	c.ok(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"page":     page,
+		"pageSize": pageSize,
+	})
+}
+
+// IpLogs GET /platform/cursor/equipment/ipLogs?equipmentId=1
+func (c *PlatformCursorEquipmentController) IpLogs() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	equipmentID, _ := c.GetUint64("equipmentId")
+	if equipmentID == 0 {
+		equipmentID, _ = c.GetUint64("id")
+	}
+	if equipmentID == 0 {
+		c.jsonErr(400, 400, "缺少设备ID")
+		return
+	}
+
+	var equipment models.PlatformCursorEquipment
+	if err := models.Orm.QueryTable(new(models.PlatformCursorEquipment)).
+		Filter("id", equipmentID).
+		Filter("delete_time__isnull", true).
+		One(&equipment); err != nil {
+		c.jsonErr(404, 404, "设备不存在")
+		return
+	}
+
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 20)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 20
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	ipCond := orm.NewCondition().
+		AndCond(orm.NewCondition().
+			Or("equipment_id", equipment.ID).
+			Or("machine_code", equipment.MachineCode))
+
+	qs := models.Orm.QueryTable(new(models.PlatformCursorEquipmentIpLog)).SetCond(ipCond)
+	total, _ := qs.Count()
+
+	var rows []models.PlatformCursorEquipmentIpLog
+	if _, err := qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows); err != nil {
+		c.jsonErr(500, 500, "获取 IP 日志失败: "+err.Error())
+		return
+	}
+
+	list := make([]map[string]interface{}, 0, len(rows))
+	for _, row := range rows {
+		list = append(list, map[string]interface{}{
+			"id":          row.ID,
+			"source":      row.Source,
+			"status":      row.Status,
+			"country":     row.Country,
+			"countryCode": row.CountryCode,
+			"region":      row.Region,
+			"regionName":  row.RegionName,
+			"city":        row.City,
+			"zip":         row.Zip,
+			"lat":         row.Lat,
+			"lon":         row.Lon,
+			"timezone":    row.Timezone,
+			"isp":         row.ISP,
+			"org":         row.Org,
+			"asInfo":      row.AsInfo,
+			"query":       row.Query,
+			"createTime":  row.CreateTime,
+		})
+	}
+
+	c.ok(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"page":     page,
+		"pageSize": pageSize,
+	})
+}
diff --git a/go/controllers/platform_dict.go b/go/controllers/platform_dict.go
index 27872d0..2703563 100644
--- a/go/controllers/platform_dict.go
+++ b/go/controllers/platform_dict.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -38,22 +39,7 @@ var dictTagTypes = map[string]bool{
 }
 
 func (c *PlatformDictController) dictClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformDictController) dictErr(httpStatus, bizCode int, msg string) {
@@ -142,7 +128,8 @@ func dictPathID(c *beego.Controller) uint64 {
 // 参数：page / pageSize / keyword（名称或编码模糊）/ status
 func (c *PlatformDictController) ListTypes() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	page, pageSize, offset := dictPageSize(&c.Controller)
@@ -184,7 +171,8 @@ func (c *PlatformDictController) ListTypes() {
 func (c *PlatformDictController) CreateType() {
 	claims, err := c.dictClaims()
 	if err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	p, err := parseDictTypeBody(&c.Controller)
@@ -236,7 +224,8 @@ func (c *PlatformDictController) CreateType() {
 // 编码是业务取值依据，不允许修改。
 func (c *PlatformDictController) UpdateType() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -281,7 +270,8 @@ func (c *PlatformDictController) UpdateType() {
 // 字典下还有字典项时拒绝删除，避免留下孤儿数据。
 func (c *PlatformDictController) DeleteType() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -322,7 +312,8 @@ func (c *PlatformDictController) DeleteType() {
 // 参数：dict_id（必填）/ page / pageSize / keyword（名称或值模糊）/ status
 func (c *PlatformDictController) ListItems() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	dictID, _ := c.GetInt64("dict_id")
@@ -370,7 +361,8 @@ func (c *PlatformDictController) ListItems() {
 // CreateItem POST /platform/dict/items
 func (c *PlatformDictController) CreateItem() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	p, err := parseDictItemBody(&c.Controller)
@@ -446,7 +438,8 @@ func (c *PlatformDictController) CreateItem() {
 // 字典项值是业务入库值，不允许修改，避免存量数据对不上。
 func (c *PlatformDictController) UpdateItem() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -498,7 +491,8 @@ func (c *PlatformDictController) UpdateItem() {
 // ToggleItemStatus POST /platform/dict/items/:id/status
 func (c *PlatformDictController) ToggleItemStatus() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -540,7 +534,8 @@ func (c *PlatformDictController) ToggleItemStatus() {
 // DeleteItem DELETE /platform/dict/items/:id
 func (c *PlatformDictController) DeleteItem() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	id := dictPathID(&c.Controller)
@@ -573,7 +568,8 @@ func (c *PlatformDictController) DeleteItem() {
 // 之后页面按任意 dict_code 都能同步读到，新增字典不用改前端。
 func (c *PlatformDictController) OptionsAll() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	result := map[string][]models.PlatformDictItem{}
@@ -622,7 +618,8 @@ func (c *PlatformDictController) OptionsAll() {
 // 注意：这里刻意与 GET /options/:code 分开成「同段不同方法」，避免静态段与通配段同级。
 func (c *PlatformDictController) OptionsBatch() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -695,7 +692,8 @@ func (c *PlatformDictController) OptionsBatch() {
 // 业务页面按编码取选项：只返回「字典与字典项都启用」的项，按 sort 升序。
 func (c *PlatformDictController) Options() {
 	if _, err := c.dictClaims(); err != nil {
-		c.dictErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.dictErr(code, code, err.Error())
 		return
 	}
 	code := strings.TrimSpace(c.Ctx.Input.Param(":code"))
diff --git a/go/controllers/platform_domain.go b/go/controllers/platform_domain.go
index 9e87c6f..ff9f096 100644
--- a/go/controllers/platform_domain.go
+++ b/go/controllers/platform_domain.go
@@ -1,711 +1,712 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	"github.com/beego/beego/v2/client/orm"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// PlatformDomainPoolController 主域名池管理
-type PlatformDomainPoolController struct {
-	beego.Controller
-}
-
-// PlatformTenantDomainController 租户域名管理
-type PlatformTenantDomainController struct {
-	beego.Controller
-}
-
-func requirePlatform(c *beego.Controller) (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-// ===== 主域名池 =====
-
-// Index GET /platform/domain/pool/index?page=&pageSize=&main_domain=&status=
-func (c *PlatformDomainPoolController) Index() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 10)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 10
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	mainDomain := strings.TrimSpace(c.GetString("main_domain"))
-	statusStr := strings.TrimSpace(c.GetString("status"))
-
-	qs := models.Orm.QueryTable(new(models.SystemDomainPool)).Filter("delete_time__isnull", true)
-	if mainDomain != "" {
-		qs = qs.Filter("main_domain__icontains", mainDomain)
-	}
-	if statusStr != "" {
-		if st, err := strconv.Atoi(statusStr); err == nil {
-			qs = qs.Filter("status", st)
-		}
-	}
-
-	total, err := qs.Count()
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取主域名池失败: "+err.Error())
-		return
-	}
-	var rows []models.SystemDomainPool
-	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取主域名池失败: "+err.Error())
-		return
-	}
-
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		item := map[string]interface{}{
-			"id":          rows[i].ID,
-			"main_domain": rows[i].MainDomain,
-			"status":      rows[i].Status,
-			"create_time": rows[i].CreateTime.Format("2006-01-02 15:04:05"),
-			"update_time": "",
-		}
-		if rows[i].UpdateTime != nil {
-			item["update_time"] = rows[i].UpdateTime.Format("2006-01-02 15:04:05")
-		}
-		list = append(list, item)
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"list":  list,
-			"total": total,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetEnabledDomains GET /platform/domain/pool/getEnabledDomains
-func (c *PlatformDomainPoolController) GetEnabledDomains() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	var rows []models.SystemDomainPool
-	_, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("status", 1).
-		Filter("delete_time__isnull", true).
-		OrderBy("-id").
-		All(&rows)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取主域名失败: "+err.Error())
-		return
-	}
-	out := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		out = append(out, map[string]interface{}{
-			"id":          rows[i].ID,
-			"main_domain": rows[i].MainDomain,
-			"status":      rows[i].Status,
-		})
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": out}
-	_ = c.ServeJSON()
-}
-
-// Create POST /platform/domain/pool/create
-func (c *PlatformDomainPoolController) Create() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p domainPoolPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	md := strings.TrimSpace(p.MainDomain)
-	if md == "" {
-		jsonErr(&c.Controller, 400, 400, "主域名不能为空")
-		return
-	}
-	if p.Status != 0 && p.Status != 1 {
-		p.Status = 1
-	}
-	// 简单去重
-	cnt, _ := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("main_domain", md).
-		Filter("delete_time__isnull", true).
-		Count()
-	if cnt > 0 {
-		jsonErr(&c.Controller, 400, 400, "主域名已存在")
-		return
-	}
-	row := &models.SystemDomainPool{MainDomain: md, Status: p.Status}
-	if _, err := models.Orm.Insert(row); err != nil {
-		jsonErr(&c.Controller, 500, 500, "创建失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "创建成功"}
-	_ = c.ServeJSON()
-}
-
-// Update POST /platform/domain/pool/update
-func (c *PlatformDomainPoolController) Update() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p domainPoolPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	if p.ID == 0 {
-		jsonErr(&c.Controller, 400, 400, "id 不能为空")
-		return
-	}
-	md := strings.TrimSpace(p.MainDomain)
-	if md == "" {
-		jsonErr(&c.Controller, 400, 400, "主域名不能为空")
-		return
-	}
-	if p.Status != 0 && p.Status != 1 {
-		p.Status = 1
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("id", p.ID).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"main_domain": md, "status": p.Status, "update_time": now})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "更新失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		jsonErr(&c.Controller, 404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "更新成功"}
-	_ = c.ServeJSON()
-}
-
-// Delete DELETE /platform/domain/pool/delete/:id
-func (c *PlatformDomainPoolController) Delete() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	idStr := c.Ctx.Input.Param(":id")
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil || id == 0 {
-		jsonErr(&c.Controller, 400, 400, "无效ID")
-		return
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now, "update_time": now})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "删除失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		jsonErr(&c.Controller, 404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
-	_ = c.ServeJSON()
-}
-
-// ToggleStatus POST /platform/domain/pool/toggleStatus  body:{id}
-func (c *PlatformDomainPoolController) ToggleStatus() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var row models.SystemDomainPool
-	if err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("id", p.ID).
-		Filter("delete_time__isnull", true).
-		One(&row); err != nil {
-		jsonErr(&c.Controller, 404, 404, "记录不存在")
-		return
-	}
-	newStatus := int8(1)
-	if row.Status == 1 {
-		newStatus = 0
-	}
-	now := time.Now()
-	_, err = models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("id", p.ID).
-		Update(map[string]interface{}{"status": newStatus, "update_time": now})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "切换失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// ===== 租户域名 =====
-
-// Index GET /platform/domain/tenant/index?page=&pageSize=&tid=&status=&sub_domain=
-func (c *PlatformTenantDomainController) Index() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 10)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 10
-	}
-	if pageSize > 200 {
-		pageSize = 200
-	}
-
-	tid, _ := c.GetUint64("tid")
-	statusStr := strings.TrimSpace(c.GetString("status"))
-	keyword := strings.TrimSpace(c.GetString("sub_domain"))
-	domainTypeStr := strings.TrimSpace(c.GetString("domain_type"))
-
-	// 条件一次性拼好：SetCond 会覆盖 Filter 累积的条件，不能混用
-	cond := orm.NewCondition().And("delete_time__isnull", true)
-	if tid > 0 {
-		cond = cond.And("tid", tid)
-	}
-	if statusStr != "" {
-		if st, err := strconv.Atoi(statusStr); err == nil {
-			cond = cond.And("status", st)
-		}
-	}
-	if domainTypeStr != "" {
-		if dt, err := strconv.Atoi(domainTypeStr); err == nil {
-			cond = cond.And("domain_type", dt)
-		}
-	}
-	// 关键字同时匹配二级前缀与完整域名：自有域名没有 sub_domain，只能靠 full_domain 命中
-	if keyword != "" {
-		cond = cond.AndCond(orm.NewCondition().
-			Or("sub_domain__icontains", keyword).
-			Or("full_domain__icontains", keyword))
-	}
-	qs := models.Orm.QueryTable(new(models.SystemTenantDomain)).SetCond(cond)
-
-	total, err := qs.Count()
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取租户域名失败: "+err.Error())
-		return
-	}
-	var rows []models.SystemTenantDomain
-	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取租户域名失败: "+err.Error())
-		return
-	}
-	list := tenantDomainList(rows)
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{"list": list, "total": total},
-	}
-	_ = c.ServeJSON()
-}
-
-// MyDomains GET /platform/domain/tenant/myDomains?tid=1
-// 平台端账号不归属租户，tid 必须显式传入（运营代租户查看）。
-func (c *PlatformTenantDomainController) MyDomains() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	tid, _ := c.GetUint64("tid")
-	if tid == 0 {
-		jsonErr(&c.Controller, 400, 400, "租户ID不能为空")
-		return
-	}
-	var rows []models.SystemTenantDomain
-	_, err := models.Orm.QueryTable(new(models.SystemTenantDomain)).
-		Filter("tid", tid).
-		Filter("delete_time__isnull", true).
-		OrderBy("-id").
-		All(&rows)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "获取失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": tenantDomainList(rows)}
-	_ = c.ServeJSON()
-}
-
-// BindCustom POST /platform/domain/tenant/bindCustom  body:{tid,domain}
-// 平台端代租户绑定自有域名，tid 必传。
-func (c *PlatformTenantDomainController) BindCustom() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p customDomainPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	id, status, errMsg := bindCustomDomain(p.Tid, p.Domain)
-	if errMsg != "" {
-		jsonErr(&c.Controller, status, status, errMsg)
-		return
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "绑定成功，请按提示配置解析后点击「检测解析」",
-		"data": map[string]interface{}{"id": id},
-	}
-	_ = c.ServeJSON()
-}
-
-// CheckCustomDns POST /platform/domain/tenant/checkCustomDns  body:{id}
-// 平台端不限制域名归属，可为任意租户触发检测与签发。
-func (c *PlatformTenantDomainController) CheckCustomDns() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p domainIDPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	data, status, errMsg := checkCustomDomainDNS(p.ID, 0)
-	if errMsg != "" {
-		jsonErr(&c.Controller, status, status, errMsg)
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
-	_ = c.ServeJSON()
-}
-
-// CustomDomainGuide GET /platform/domain/tenant/customDomainGuide
-func (c *PlatformTenantDomainController) CustomDomainGuide() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": customDomainGuideData()}
-	_ = c.ServeJSON()
-}
-
-// Apply POST /platform/domain/tenant/apply  body:{tid,sub_domain,main_domain}
-func (c *PlatformTenantDomainController) Apply() {
-	claims, err := requirePlatform(&c.Controller)
-	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		Tid        uint64 `json:"tid"`
-		SubDomain  string `json:"sub_domain"`
-		MainDomain string `json:"main_domain"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	if p.Tid == 0 {
-		jsonErr(&c.Controller, 400, 400, "租户ID不能为空")
-		return
-	}
-	sub := strings.TrimSpace(p.SubDomain)
-	main := strings.TrimSpace(p.MainDomain)
-	if sub == "" {
-		jsonErr(&c.Controller, 400, 400, "二级域名前缀不能为空")
-		return
-	}
-	if main == "" {
-		jsonErr(&c.Controller, 400, 400, "请选择主域名")
-		return
-	}
-	if !subDomainRe.MatchString(sub) {
-		jsonErr(&c.Controller, 400, 400, "二级域名前缀格式不正确")
-		return
-	}
-
-	// 该租户是否已申请过平台二级域名（自有域名单独计数，两者可以共存）
-	cnt, _ := models.Orm.QueryTable(new(models.SystemTenantDomain)).
-		Filter("tid", p.Tid).
-		Filter("domain_type", models.DomainTypePlatformSub).
-		Filter("delete_time__isnull", true).
-		Count()
-	if cnt > 0 {
-		jsonErr(&c.Controller, 400, 400, "该租户已有二级域名，请删除后再次申请")
-		return
-	}
-
-	// 主域名存在且启用
-	var pool models.SystemDomainPool
-	if err := models.Orm.QueryTable(new(models.SystemDomainPool)).
-		Filter("main_domain", main).
-		Filter("status", 1).
-		Filter("delete_time__isnull", true).
-		One(&pool); err != nil {
-		jsonErr(&c.Controller, 400, 400, "主域名不存在或已禁用")
-		return
-	}
-
-	// 二级域名是否已被使用（同主域名下）
-	used, _ := models.Orm.QueryTable(new(models.SystemTenantDomain)).
-		Filter("sub_domain", sub).
-		Filter("main_domain", main).
-		Filter("delete_time__isnull", true).
-		Count()
-	if used > 0 {
-		jsonErr(&c.Controller, 400, 400, "该二级域名已被使用")
-		return
-	}
-
-	full := sub + "." + main
-	now := time.Now()
-	tid := p.Tid
-	row := &models.SystemTenantDomain{
-		Tid:        &tid,
-		DomainType: models.DomainTypePlatformSub,
-		SubDomain:  &sub,
-		MainDomain: &main,
-		FullDomain: &full,
-		Status:     0,
-		CreateTime: now,
-		UpdateTime: &now,
-	}
-	id, err := models.Orm.Insert(row)
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "申请失败: "+err.Error())
-		return
-	}
-	// 进入平台侧审批流（严格：未配置流程/无有效审批人则提交失败并回滚）
-	if errMsg := submitDomainApprovalChecked(uint64(id), p.Tid, uint64(claims.UserID), claims.Username, full); errMsg != "" {
-		jsonErr(&c.Controller, 400, 400, errMsg)
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "申请提交成功，等待审批", "data": map[string]interface{}{"id": uint64(id)}}
-	_ = c.ServeJSON()
-}
-
-// Audit POST /platform/domain/tenant/audit body:{id,action,comment} action=approve/reject
-// 引擎驱动：已配置审批流则走多级流转，仅当前待办人可操作；
-// 未配置流程（无在途实例）则回退到单级直改状态，保证兼容。
-func (c *PlatformTenantDomainController) Audit() {
-	claims, err := requirePlatform(&c.Controller)
-	if err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID      uint64 `json:"id"`
-		Action  string `json:"action"`
-		Comment string `json:"comment"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var row models.SystemTenantDomain
-	if err := models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).One(&row); err != nil {
-		jsonErr(&c.Controller, 404, 404, "域名不存在")
-		return
-	}
-	if row.DomainType == models.DomainTypeCustom {
-		jsonErr(&c.Controller, 400, 400, "自有域名无需人工审核，解析检测与证书签发通过后自动生效")
-		return
-	}
-	if row.Status != 0 {
-		jsonErr(&c.Controller, 400, 400, "该域名已审核过了")
-		return
-	}
-	pass := strings.ToLower(strings.TrimSpace(p.Action)) == "approve"
-	var bizTid uint64
-	if row.Tid != nil {
-		bizTid = *row.Tid
-	}
-
-	// 严格引擎驱动：必须命中在途实例与当前待办，否则拒绝（已移除单级兼容回退）
-	msg, code := engineDomainAudit(p.ID, uint64(claims.UserID), pass, p.Comment, bizTid)
-	if code != 200 {
-		jsonErr(&c.Controller, code, code, msg)
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-// AuditProgress GET /platform/domain/tenant/audit/progress/:id
-// 返回该域名的审批进度（节点 + 各审批人状态），供平台端展示流转。
-func (c *PlatformTenantDomainController) AuditProgress() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "ok", "data": domainApprovalProgress(id)}
-	_ = c.ServeJSON()
-}
-
-// ToggleStatus POST /platform/domain/tenant/toggleStatus body:{id}
-func (c *PlatformTenantDomainController) ToggleStatus() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	var row models.SystemTenantDomain
-	if err := models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).One(&row); err != nil {
-		jsonErr(&c.Controller, 404, 404, "域名不存在")
-		return
-	}
-	if row.Status == 0 {
-		if row.DomainType == models.DomainTypeCustom {
-			jsonErr(&c.Controller, 400, 400, "该域名尚未生效（解析或证书未就绪），无需禁用")
-		} else {
-			jsonErr(&c.Controller, 400, 400, "审核中不可操作")
-		}
-		return
-	}
-	newStatus := 2
-	if row.Status == 2 {
-		// 自有域名重新启用要求证书还在，否则启用后访问会报证书错误
-		if row.DomainType == models.DomainTypeCustom && row.SSLStatus != models.SSLStatusIssued {
-			jsonErr(&c.Controller, 400, 400, "该域名的 HTTPS 证书未就绪，请先检测解析并等待证书签发")
-			return
-		}
-		newStatus = 1
-	}
-	now := time.Now()
-	_, err = models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).Update(map[string]interface{}{
-		"status":      newStatus,
-		"update_time": now,
-	})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "操作失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// Delete DELETE /platform/domain/tenant/delete/:id
-func (c *PlatformTenantDomainController) Delete() {
-	if _, err := requirePlatform(&c.Controller); err != nil {
-		jsonErr(&c.Controller, 401, 401, err.Error())
-		return
-	}
-	idStr := c.Ctx.Input.Param(":id")
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil || id == 0 {
-		jsonErr(&c.Controller, 400, 400, "参数错误")
-		return
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.SystemTenantDomain)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now, "update_time": now})
-	if err != nil {
-		jsonErr(&c.Controller, 500, 500, "删除失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		jsonErr(&c.Controller, 404, 404, "域名不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
-	_ = c.ServeJSON()
-}
-
-// 用于复杂筛选时可扩展：当前保留 orm.Condition import，避免被 gofmt 删除
-var _ = orm.NewCondition
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	"github.com/beego/beego/v2/client/orm"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// PlatformDomainPoolController 主域名池管理
+type PlatformDomainPoolController struct {
+	beego.Controller
+}
+
+// PlatformTenantDomainController 租户域名管理
+type PlatformTenantDomainController struct {
+	beego.Controller
+}
+
+func requirePlatform(c *beego.Controller) (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+// ===== 主域名池 =====
+
+// Index GET /platform/domain/pool/index?page=&pageSize=&main_domain=&status=
+func (c *PlatformDomainPoolController) Index() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 10)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 10
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	mainDomain := strings.TrimSpace(c.GetString("main_domain"))
+	statusStr := strings.TrimSpace(c.GetString("status"))
+
+	qs := models.Orm.QueryTable(new(models.SystemDomainPool)).Filter("delete_time__isnull", true)
+	if mainDomain != "" {
+		qs = qs.Filter("main_domain__icontains", mainDomain)
+	}
+	if statusStr != "" {
+		if st, err := strconv.Atoi(statusStr); err == nil {
+			qs = qs.Filter("status", st)
+		}
+	}
+
+	total, err := qs.Count()
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取主域名池失败: "+err.Error())
+		return
+	}
+	var rows []models.SystemDomainPool
+	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取主域名池失败: "+err.Error())
+		return
+	}
+
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		item := map[string]interface{}{
+			"id":          rows[i].ID,
+			"main_domain": rows[i].MainDomain,
+			"status":      rows[i].Status,
+			"create_time": rows[i].CreateTime.Format("2006-01-02 15:04:05"),
+			"update_time": "",
+		}
+		if rows[i].UpdateTime != nil {
+			item["update_time"] = rows[i].UpdateTime.Format("2006-01-02 15:04:05")
+		}
+		list = append(list, item)
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"list":  list,
+			"total": total,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetEnabledDomains GET /platform/domain/pool/getEnabledDomains
+func (c *PlatformDomainPoolController) GetEnabledDomains() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	var rows []models.SystemDomainPool
+	_, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("status", 1).
+		Filter("delete_time__isnull", true).
+		OrderBy("-id").
+		All(&rows)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取主域名失败: "+err.Error())
+		return
+	}
+	out := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		out = append(out, map[string]interface{}{
+			"id":          rows[i].ID,
+			"main_domain": rows[i].MainDomain,
+			"status":      rows[i].Status,
+		})
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": out}
+	_ = c.ServeJSON()
+}
+
+// Create POST /platform/domain/pool/create
+func (c *PlatformDomainPoolController) Create() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p domainPoolPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	md := strings.TrimSpace(p.MainDomain)
+	if md == "" {
+		jsonErr(&c.Controller, 400, 400, "主域名不能为空")
+		return
+	}
+	if p.Status != 0 && p.Status != 1 {
+		p.Status = 1
+	}
+	// 简单去重
+	cnt, _ := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("main_domain", md).
+		Filter("delete_time__isnull", true).
+		Count()
+	if cnt > 0 {
+		jsonErr(&c.Controller, 400, 400, "主域名已存在")
+		return
+	}
+	row := &models.SystemDomainPool{MainDomain: md, Status: p.Status}
+	if _, err := models.Orm.Insert(row); err != nil {
+		jsonErr(&c.Controller, 500, 500, "创建失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "创建成功"}
+	_ = c.ServeJSON()
+}
+
+// Update POST /platform/domain/pool/update
+func (c *PlatformDomainPoolController) Update() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p domainPoolPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	if p.ID == 0 {
+		jsonErr(&c.Controller, 400, 400, "id 不能为空")
+		return
+	}
+	md := strings.TrimSpace(p.MainDomain)
+	if md == "" {
+		jsonErr(&c.Controller, 400, 400, "主域名不能为空")
+		return
+	}
+	if p.Status != 0 && p.Status != 1 {
+		p.Status = 1
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("id", p.ID).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"main_domain": md, "status": p.Status, "update_time": now})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "更新失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		jsonErr(&c.Controller, 404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "更新成功"}
+	_ = c.ServeJSON()
+}
+
+// Delete DELETE /platform/domain/pool/delete/:id
+func (c *PlatformDomainPoolController) Delete() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	idStr := c.Ctx.Input.Param(":id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil || id == 0 {
+		jsonErr(&c.Controller, 400, 400, "无效ID")
+		return
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now, "update_time": now})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "删除失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		jsonErr(&c.Controller, 404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
+	_ = c.ServeJSON()
+}
+
+// ToggleStatus POST /platform/domain/pool/toggleStatus  body:{id}
+func (c *PlatformDomainPoolController) ToggleStatus() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var row models.SystemDomainPool
+	if err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("id", p.ID).
+		Filter("delete_time__isnull", true).
+		One(&row); err != nil {
+		jsonErr(&c.Controller, 404, 404, "记录不存在")
+		return
+	}
+	newStatus := int8(1)
+	if row.Status == 1 {
+		newStatus = 0
+	}
+	now := time.Now()
+	_, err = models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("id", p.ID).
+		Update(map[string]interface{}{"status": newStatus, "update_time": now})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "切换失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// ===== 租户域名 =====
+
+// Index GET /platform/domain/tenant/index?page=&pageSize=&tid=&status=&sub_domain=
+func (c *PlatformTenantDomainController) Index() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 10)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 10
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	tid, _ := c.GetUint64("tid")
+	statusStr := strings.TrimSpace(c.GetString("status"))
+	keyword := strings.TrimSpace(c.GetString("sub_domain"))
+	domainTypeStr := strings.TrimSpace(c.GetString("domain_type"))
+
+	// 条件一次性拼好：SetCond 会覆盖 Filter 累积的条件，不能混用
+	cond := orm.NewCondition().And("delete_time__isnull", true)
+	if tid > 0 {
+		cond = cond.And("tid", tid)
+	}
+	if statusStr != "" {
+		if st, err := strconv.Atoi(statusStr); err == nil {
+			cond = cond.And("status", st)
+		}
+	}
+	if domainTypeStr != "" {
+		if dt, err := strconv.Atoi(domainTypeStr); err == nil {
+			cond = cond.And("domain_type", dt)
+		}
+	}
+	// 关键字同时匹配二级前缀与完整域名：自有域名没有 sub_domain，只能靠 full_domain 命中
+	if keyword != "" {
+		cond = cond.AndCond(orm.NewCondition().
+			Or("sub_domain__icontains", keyword).
+			Or("full_domain__icontains", keyword))
+	}
+	qs := models.Orm.QueryTable(new(models.SystemTenantDomain)).SetCond(cond)
+
+	total, err := qs.Count()
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取租户域名失败: "+err.Error())
+		return
+	}
+	var rows []models.SystemTenantDomain
+	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取租户域名失败: "+err.Error())
+		return
+	}
+	list := tenantDomainList(rows)
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{"list": list, "total": total},
+	}
+	_ = c.ServeJSON()
+}
+
+// MyDomains GET /platform/domain/tenant/myDomains?tid=1
+// 平台端账号不归属租户，tid 必须显式传入（运营代租户查看）。
+func (c *PlatformTenantDomainController) MyDomains() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	tid, _ := c.GetUint64("tid")
+	if tid == 0 {
+		jsonErr(&c.Controller, 400, 400, "租户ID不能为空")
+		return
+	}
+	var rows []models.SystemTenantDomain
+	_, err := models.Orm.QueryTable(new(models.SystemTenantDomain)).
+		Filter("tid", tid).
+		Filter("delete_time__isnull", true).
+		OrderBy("-id").
+		All(&rows)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "获取失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": tenantDomainList(rows)}
+	_ = c.ServeJSON()
+}
+
+// BindCustom POST /platform/domain/tenant/bindCustom  body:{tid,domain}
+// 平台端代租户绑定自有域名，tid 必传。
+func (c *PlatformTenantDomainController) BindCustom() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p customDomainPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	id, status, errMsg := bindCustomDomain(p.Tid, p.Domain)
+	if errMsg != "" {
+		jsonErr(&c.Controller, status, status, errMsg)
+		return
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "绑定成功，请按提示配置解析后点击「检测解析」",
+		"data": map[string]interface{}{"id": id},
+	}
+	_ = c.ServeJSON()
+}
+
+// CheckCustomDns POST /platform/domain/tenant/checkCustomDns  body:{id}
+// 平台端不限制域名归属，可为任意租户触发检测与签发。
+func (c *PlatformTenantDomainController) CheckCustomDns() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p domainIDPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	data, status, errMsg := checkCustomDomainDNS(p.ID, 0)
+	if errMsg != "" {
+		jsonErr(&c.Controller, status, status, errMsg)
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": data}
+	_ = c.ServeJSON()
+}
+
+// CustomDomainGuide GET /platform/domain/tenant/customDomainGuide
+func (c *PlatformTenantDomainController) CustomDomainGuide() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": customDomainGuideData()}
+	_ = c.ServeJSON()
+}
+
+// Apply POST /platform/domain/tenant/apply  body:{tid,sub_domain,main_domain}
+func (c *PlatformTenantDomainController) Apply() {
+	claims, err := requirePlatform(&c.Controller)
+	if err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		Tid        uint64 `json:"tid"`
+		SubDomain  string `json:"sub_domain"`
+		MainDomain string `json:"main_domain"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	if p.Tid == 0 {
+		jsonErr(&c.Controller, 400, 400, "租户ID不能为空")
+		return
+	}
+	sub := strings.TrimSpace(p.SubDomain)
+	main := strings.TrimSpace(p.MainDomain)
+	if sub == "" {
+		jsonErr(&c.Controller, 400, 400, "二级域名前缀不能为空")
+		return
+	}
+	if main == "" {
+		jsonErr(&c.Controller, 400, 400, "请选择主域名")
+		return
+	}
+	if !subDomainRe.MatchString(sub) {
+		jsonErr(&c.Controller, 400, 400, "二级域名前缀格式不正确")
+		return
+	}
+
+	// 该租户是否已申请过平台二级域名（自有域名单独计数，两者可以共存）
+	cnt, _ := models.Orm.QueryTable(new(models.SystemTenantDomain)).
+		Filter("tid", p.Tid).
+		Filter("domain_type", models.DomainTypePlatformSub).
+		Filter("delete_time__isnull", true).
+		Count()
+	if cnt > 0 {
+		jsonErr(&c.Controller, 400, 400, "该租户已有二级域名，请删除后再次申请")
+		return
+	}
+
+	// 主域名存在且启用
+	var pool models.SystemDomainPool
+	if err := models.Orm.QueryTable(new(models.SystemDomainPool)).
+		Filter("main_domain", main).
+		Filter("status", 1).
+		Filter("delete_time__isnull", true).
+		One(&pool); err != nil {
+		jsonErr(&c.Controller, 400, 400, "主域名不存在或已禁用")
+		return
+	}
+
+	// 二级域名是否已被使用（同主域名下）
+	used, _ := models.Orm.QueryTable(new(models.SystemTenantDomain)).
+		Filter("sub_domain", sub).
+		Filter("main_domain", main).
+		Filter("delete_time__isnull", true).
+		Count()
+	if used > 0 {
+		jsonErr(&c.Controller, 400, 400, "该二级域名已被使用")
+		return
+	}
+
+	full := sub + "." + main
+	now := time.Now()
+	tid := p.Tid
+	row := &models.SystemTenantDomain{
+		Tid:        &tid,
+		DomainType: models.DomainTypePlatformSub,
+		SubDomain:  &sub,
+		MainDomain: &main,
+		FullDomain: &full,
+		Status:     0,
+		CreateTime: now,
+		UpdateTime: &now,
+	}
+	id, err := models.Orm.Insert(row)
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "申请失败: "+err.Error())
+		return
+	}
+	// 进入平台侧审批流（严格：未配置流程/无有效审批人则提交失败并回滚）
+	if errMsg := submitDomainApprovalChecked(uint64(id), p.Tid, uint64(claims.UserID), claims.Username, full); errMsg != "" {
+		jsonErr(&c.Controller, 400, 400, errMsg)
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "申请提交成功，等待审批", "data": map[string]interface{}{"id": uint64(id)}}
+	_ = c.ServeJSON()
+}
+
+// Audit POST /platform/domain/tenant/audit body:{id,action,comment} action=approve/reject
+// 引擎驱动：已配置审批流则走多级流转，仅当前待办人可操作；
+// 未配置流程（无在途实例）则回退到单级直改状态，保证兼容。
+func (c *PlatformTenantDomainController) Audit() {
+	claims, err := requirePlatform(&c.Controller)
+	if err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID      uint64 `json:"id"`
+		Action  string `json:"action"`
+		Comment string `json:"comment"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var row models.SystemTenantDomain
+	if err := models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).One(&row); err != nil {
+		jsonErr(&c.Controller, 404, 404, "域名不存在")
+		return
+	}
+	if row.DomainType == models.DomainTypeCustom {
+		jsonErr(&c.Controller, 400, 400, "自有域名无需人工审核，解析检测与证书签发通过后自动生效")
+		return
+	}
+	if row.Status != 0 {
+		jsonErr(&c.Controller, 400, 400, "该域名已审核过了")
+		return
+	}
+	pass := strings.ToLower(strings.TrimSpace(p.Action)) == "approve"
+	var bizTid uint64
+	if row.Tid != nil {
+		bizTid = *row.Tid
+	}
+
+	// 严格引擎驱动：必须命中在途实例与当前待办，否则拒绝（已移除单级兼容回退）
+	msg, code := engineDomainAudit(p.ID, uint64(claims.UserID), pass, p.Comment, bizTid)
+	if code != 200 {
+		jsonErr(&c.Controller, code, code, msg)
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// AuditProgress GET /platform/domain/tenant/audit/progress/:id
+// 返回该域名的审批进度（节点 + 各审批人状态），供平台端展示流转。
+func (c *PlatformTenantDomainController) AuditProgress() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "ok", "data": domainApprovalProgress(id)}
+	_ = c.ServeJSON()
+}
+
+// ToggleStatus POST /platform/domain/tenant/toggleStatus body:{id}
+func (c *PlatformTenantDomainController) ToggleStatus() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	var row models.SystemTenantDomain
+	if err := models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).One(&row); err != nil {
+		jsonErr(&c.Controller, 404, 404, "域名不存在")
+		return
+	}
+	if row.Status == 0 {
+		if row.DomainType == models.DomainTypeCustom {
+			jsonErr(&c.Controller, 400, 400, "该域名尚未生效（解析或证书未就绪），无需禁用")
+		} else {
+			jsonErr(&c.Controller, 400, 400, "审核中不可操作")
+		}
+		return
+	}
+	newStatus := 2
+	if row.Status == 2 {
+		// 自有域名重新启用要求证书还在，否则启用后访问会报证书错误
+		if row.DomainType == models.DomainTypeCustom && row.SSLStatus != models.SSLStatusIssued {
+			jsonErr(&c.Controller, 400, 400, "该域名的 HTTPS 证书未就绪，请先检测解析并等待证书签发")
+			return
+		}
+		newStatus = 1
+	}
+	now := time.Now()
+	_, err = models.Orm.QueryTable(new(models.SystemTenantDomain)).Filter("id", p.ID).Update(map[string]interface{}{
+		"status":      newStatus,
+		"update_time": now,
+	})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "操作失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// Delete DELETE /platform/domain/tenant/delete/:id
+func (c *PlatformTenantDomainController) Delete() {
+	if _, err := requirePlatform(&c.Controller); err != nil {
+		code := identity.Status(err)
+		jsonErr(&c.Controller, code, code, err.Error())
+		return
+	}
+	idStr := c.Ctx.Input.Param(":id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil || id == 0 {
+		jsonErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.SystemTenantDomain)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now, "update_time": now})
+	if err != nil {
+		jsonErr(&c.Controller, 500, 500, "删除失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		jsonErr(&c.Controller, 404, 404, "域名不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
+	_ = c.ServeJSON()
+}
+
+// 用于复杂筛选时可扩展：当前保留 orm.Condition import，避免被 gofmt 删除
+var _ = orm.NewCondition
diff --git a/go/controllers/platform_email.go b/go/controllers/platform_email.go
index af4904b..2f3884c 100644
--- a/go/controllers/platform_email.go
+++ b/go/controllers/platform_email.go
@@ -1,298 +1,287 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-
-	"server/models"
-	"server/pkg/jwtutil"
-	"server/services"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// PlatformEmailController 系统邮箱配置（yz_system_email）
-type PlatformEmailController struct {
-	beego.Controller
-}
-
-func (c *PlatformEmailController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *PlatformEmailController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-func emailRowToMap(m models.SystemEmail) map[string]interface{} {
-	out := map[string]interface{}{
-		"id":           m.ID,
-		"from_address": m.FromAddress,
-		"host":         m.Host,
-		"port":         m.Port,
-		"password":     m.Password,
-		"encryption":   m.Encryption,
-		"timeout":      m.Timeout,
-		"status":       m.Status,
-		"create_time":  m.CreateTime.Format("2006-01-02 15:04:05"),
-		"update_time":  m.UpdateTime.Format("2006-01-02 15:04:05"),
-	}
-	if m.FromName != nil {
-		out["from_name"] = *m.FromName
-	} else {
-		out["from_name"] = ""
-	}
-	if m.Remark != nil {
-		out["remark"] = *m.Remark
-	} else {
-		out["remark"] = ""
-	}
-	return out
-}
-
-// GetInfo GET /platform/email/info
-func (c *PlatformEmailController) GetInfo() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	rows, err := services.ListSystemEmails()
-	if err != nil {
-		c.jsonErr(500, 500, "获取邮箱配置失败: "+err.Error())
-		return
-	}
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		list = append(list, emailRowToMap(rows[i]))
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": list}
-	_ = c.ServeJSON()
-}
-
-type emailFormPayload struct {
-	FromAddress string      `json:"fromAddress"`
-	FromName    string      `json:"fromName"`
-	Host        string      `json:"host"`
-	Port        interface{} `json:"port"`
-	Password    string      `json:"password"`
-	Encryption  string      `json:"encryption"`
-	Timeout     interface{} `json:"timeout"`
-	Status      interface{} `json:"status"`
-}
-type testEmailPayload struct {
-	emailFormPayload
-	TestEmail string `json:"testEmail"`
-}
-
-func parseInt8Flexible(v interface{}) int8 {
-	if v == nil {
-		return 1
-	}
-	switch x := v.(type) {
-	case bool:
-		if x {
-			return 1
-		}
-		return 0
-	case float64:
-		return int8(x)
-	case int:
-		return int8(x)
-	case int8:
-		return x
-	case string:
-		s := strings.TrimSpace(x)
-		if s == "" {
-			return 1
-		}
-		n, err := strconv.ParseInt(s, 10, 8)
-		if err != nil {
-			return 1
-		}
-		return int8(n)
-	default:
-		return 1
-	}
-}
-
-func parseUintFlexible(v interface{}) uint {
-	if v == nil {
-		return 0
-	}
-	switch x := v.(type) {
-	case float64:
-		if x < 0 {
-			return 0
-		}
-		return uint(x)
-	case string:
-		n, err := parseUintString(x)
-		if err != nil {
-			return 0
-		}
-		return n
-	default:
-		return 0
-	}
-}
-
-func parseUintString(s string) (uint, error) {
-	s = strings.TrimSpace(s)
-	if s == "" {
-		return 0, fmt.Errorf("empty")
-	}
-	n, err := strconv.ParseUint(s, 10, 32)
-	if err != nil {
-		return 0, err
-	}
-	return uint(n), nil
-}
-
-func normalizeEncryption(s string) string {
-	s = strings.ToLower(strings.TrimSpace(s))
-	switch s {
-	case "ssl", "tls", "none":
-		return s
-	default:
-		return "ssl"
-	}
-}
-
-// EditInfo POST /platform/email/editinfo
-func (c *PlatformEmailController) EditInfo() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p emailFormPayload
-	if uerr := json.Unmarshal(raw, &p); uerr != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	from := strings.TrimSpace(p.FromAddress)
-	host := strings.TrimSpace(p.Host)
-	if from == "" || host == "" {
-		c.jsonErr(400, 400, "发件人邮箱与 SMTP 主机不能为空")
-		return
-	}
-	port := parseUintFlexible(p.Port)
-	if port == 0 {
-		port = 465
-	}
-	timeout := parseUintFlexible(p.Timeout)
-	if timeout == 0 {
-		timeout = 30
-	}
-	enc := normalizeEncryption(p.Encryption)
-	cnt, cerr := models.Orm.QueryTable(new(models.SystemEmail)).Count()
-	if cerr != nil {
-		c.jsonErr(500, 500, "读取邮箱配置失败: "+cerr.Error())
-		return
-	}
-	if strings.TrimSpace(p.Password) == "" && cnt == 0 {
-		c.jsonErr(400, 400, "授权码/密码不能为空")
-		return
-	}
-	var fn *string
-	if strings.TrimSpace(p.FromName) != "" {
-		s := strings.TrimSpace(p.FromName)
-		fn = &s
-	}
-	status := parseInt8Flexible(p.Status)
-	err = services.UpsertFirstSystemEmail(from, fn, host, port, strings.TrimSpace(p.Password), enc, timeout, status, nil)
-	if err != nil {
-		c.jsonErr(500, 500, "保存邮箱配置失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
-	_ = c.ServeJSON()
-}
-
-// SendTestEmail POST /platform/email/sendtestemail
-func (c *PlatformEmailController) SendTestEmail() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p testEmailPayload
-	if uerr := json.Unmarshal(raw, &p); uerr != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	to := strings.TrimSpace(p.TestEmail)
-	if to == "" {
-		c.jsonErr(400, 400, "测试收件邮箱不能为空")
-		return
-	}
-	from := strings.TrimSpace(p.FromAddress)
-	host := strings.TrimSpace(p.Host)
-	if from == "" || host == "" {
-		c.jsonErr(400, 400, "发件人邮箱与 SMTP 主机不能为空")
-		return
-	}
-	port := parseUintFlexible(p.Port)
-	if port == 0 {
-		port = 465
-	}
-	timeout := parseUintFlexible(p.Timeout)
-	if timeout == 0 {
-		timeout = 30
-	}
-	enc := normalizeEncryption(p.Encryption)
-	pass := strings.TrimSpace(p.Password)
-	if pass == "" {
-		rows, lerr := services.ListSystemEmails()
-		if lerr == nil && len(rows) > 0 {
-			pass = rows[0].Password
-		}
-	}
-	if pass == "" {
-		c.jsonErr(400, 400, "授权码/密码不能为空（请填写或先保存配置）")
-		return
-	}
-	cfg := services.SMTPConfig{
-		FromAddress: from,
-		FromName:    strings.TrimSpace(p.FromName),
-		Host:        host,
-		Port:        port,
-		Password:    pass,
-		Encryption:  enc,
-		Timeout:     timeout,
-	}
-	if err := services.SendTestEmailSMTP(cfg, to); err != nil {
-		c.jsonErr(500, 500, "发送失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "发送成功"}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+	"server/services"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// PlatformEmailController 系统邮箱配置（yz_system_email）
+type PlatformEmailController struct {
+	beego.Controller
+}
+
+func (c *PlatformEmailController) platformClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+func (c *PlatformEmailController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+func emailRowToMap(m models.SystemEmail) map[string]interface{} {
+	out := map[string]interface{}{
+		"id":           m.ID,
+		"from_address": m.FromAddress,
+		"host":         m.Host,
+		"port":         m.Port,
+		"password":     m.Password,
+		"encryption":   m.Encryption,
+		"timeout":      m.Timeout,
+		"status":       m.Status,
+		"create_time":  m.CreateTime.Format("2006-01-02 15:04:05"),
+		"update_time":  m.UpdateTime.Format("2006-01-02 15:04:05"),
+	}
+	if m.FromName != nil {
+		out["from_name"] = *m.FromName
+	} else {
+		out["from_name"] = ""
+	}
+	if m.Remark != nil {
+		out["remark"] = *m.Remark
+	} else {
+		out["remark"] = ""
+	}
+	return out
+}
+
+// GetInfo GET /platform/email/info
+func (c *PlatformEmailController) GetInfo() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	rows, err := services.ListSystemEmails()
+	if err != nil {
+		c.jsonErr(500, 500, "获取邮箱配置失败: "+err.Error())
+		return
+	}
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		list = append(list, emailRowToMap(rows[i]))
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": list}
+	_ = c.ServeJSON()
+}
+
+type emailFormPayload struct {
+	FromAddress string      `json:"fromAddress"`
+	FromName    string      `json:"fromName"`
+	Host        string      `json:"host"`
+	Port        interface{} `json:"port"`
+	Password    string      `json:"password"`
+	Encryption  string      `json:"encryption"`
+	Timeout     interface{} `json:"timeout"`
+	Status      interface{} `json:"status"`
+}
+type testEmailPayload struct {
+	emailFormPayload
+	TestEmail string `json:"testEmail"`
+}
+
+func parseInt8Flexible(v interface{}) int8 {
+	if v == nil {
+		return 1
+	}
+	switch x := v.(type) {
+	case bool:
+		if x {
+			return 1
+		}
+		return 0
+	case float64:
+		return int8(x)
+	case int:
+		return int8(x)
+	case int8:
+		return x
+	case string:
+		s := strings.TrimSpace(x)
+		if s == "" {
+			return 1
+		}
+		n, err := strconv.ParseInt(s, 10, 8)
+		if err != nil {
+			return 1
+		}
+		return int8(n)
+	default:
+		return 1
+	}
+}
+
+func parseUintFlexible(v interface{}) uint {
+	if v == nil {
+		return 0
+	}
+	switch x := v.(type) {
+	case float64:
+		if x < 0 {
+			return 0
+		}
+		return uint(x)
+	case string:
+		n, err := parseUintString(x)
+		if err != nil {
+			return 0
+		}
+		return n
+	default:
+		return 0
+	}
+}
+
+func parseUintString(s string) (uint, error) {
+	s = strings.TrimSpace(s)
+	if s == "" {
+		return 0, fmt.Errorf("empty")
+	}
+	n, err := strconv.ParseUint(s, 10, 32)
+	if err != nil {
+		return 0, err
+	}
+	return uint(n), nil
+}
+
+func normalizeEncryption(s string) string {
+	s = strings.ToLower(strings.TrimSpace(s))
+	switch s {
+	case "ssl", "tls", "none":
+		return s
+	default:
+		return "ssl"
+	}
+}
+
+// EditInfo POST /platform/email/editinfo
+func (c *PlatformEmailController) EditInfo() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p emailFormPayload
+	if uerr := json.Unmarshal(raw, &p); uerr != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	from := strings.TrimSpace(p.FromAddress)
+	host := strings.TrimSpace(p.Host)
+	if from == "" || host == "" {
+		c.jsonErr(400, 400, "发件人邮箱与 SMTP 主机不能为空")
+		return
+	}
+	port := parseUintFlexible(p.Port)
+	if port == 0 {
+		port = 465
+	}
+	timeout := parseUintFlexible(p.Timeout)
+	if timeout == 0 {
+		timeout = 30
+	}
+	enc := normalizeEncryption(p.Encryption)
+	cnt, cerr := models.Orm.QueryTable(new(models.SystemEmail)).Count()
+	if cerr != nil {
+		c.jsonErr(500, 500, "读取邮箱配置失败: "+cerr.Error())
+		return
+	}
+	if strings.TrimSpace(p.Password) == "" && cnt == 0 {
+		c.jsonErr(400, 400, "授权码/密码不能为空")
+		return
+	}
+	var fn *string
+	if strings.TrimSpace(p.FromName) != "" {
+		s := strings.TrimSpace(p.FromName)
+		fn = &s
+	}
+	status := parseInt8Flexible(p.Status)
+	err = services.UpsertFirstSystemEmail(from, fn, host, port, strings.TrimSpace(p.Password), enc, timeout, status, nil)
+	if err != nil {
+		c.jsonErr(500, 500, "保存邮箱配置失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
+	_ = c.ServeJSON()
+}
+
+// SendTestEmail POST /platform/email/sendtestemail
+func (c *PlatformEmailController) SendTestEmail() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p testEmailPayload
+	if uerr := json.Unmarshal(raw, &p); uerr != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	to := strings.TrimSpace(p.TestEmail)
+	if to == "" {
+		c.jsonErr(400, 400, "测试收件邮箱不能为空")
+		return
+	}
+	from := strings.TrimSpace(p.FromAddress)
+	host := strings.TrimSpace(p.Host)
+	if from == "" || host == "" {
+		c.jsonErr(400, 400, "发件人邮箱与 SMTP 主机不能为空")
+		return
+	}
+	port := parseUintFlexible(p.Port)
+	if port == 0 {
+		port = 465
+	}
+	timeout := parseUintFlexible(p.Timeout)
+	if timeout == 0 {
+		timeout = 30
+	}
+	enc := normalizeEncryption(p.Encryption)
+	pass := strings.TrimSpace(p.Password)
+	if pass == "" {
+		rows, lerr := services.ListSystemEmails()
+		if lerr == nil && len(rows) > 0 {
+			pass = rows[0].Password
+		}
+	}
+	if pass == "" {
+		c.jsonErr(400, 400, "授权码/密码不能为空（请填写或先保存配置）")
+		return
+	}
+	cfg := services.SMTPConfig{
+		FromAddress: from,
+		FromName:    strings.TrimSpace(p.FromName),
+		Host:        host,
+		Port:        port,
+		Password:    pass,
+		Encryption:  enc,
+		Timeout:     timeout,
+	}
+	if err := services.SendTestEmailSMTP(cfg, to); err != nil {
+		c.jsonErr(500, 500, "发送失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "发送成功"}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/platform_file.go b/go/controllers/platform_file.go
index 2c71cc5..9840670 100644
--- a/go/controllers/platform_file.go
+++ b/go/controllers/platform_file.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -44,22 +45,7 @@ var platformAllowedExtByCategory = map[string][]string{
 }
 
 func (c *PlatformFileController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformFileController) effectiveTid(claims *jwtutil.Claims) uint64 {
@@ -151,7 +137,8 @@ func platformRemovePhysicalBySrc(webSrc string) {
 func (c *PlatformFileController) GetAllFiles() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -203,7 +190,8 @@ func (c *PlatformFileController) GetAllFiles() {
 func (c *PlatformFileController) GetUserCate() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -244,7 +232,8 @@ type platformCreateCateBody struct {
 func (c *PlatformFileController) CreateFileCate() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -319,7 +308,8 @@ func isProtectedFileCate(name string) bool {
 func (c *PlatformFileController) RenameFileCate() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -381,7 +371,8 @@ func (c *PlatformFileController) RenameFileCate() {
 func (c *PlatformFileController) DeleteFileCate() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -441,7 +432,8 @@ func (c *PlatformFileController) DeleteFileCate() {
 func (c *PlatformFileController) GetCateFiles() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -497,7 +489,8 @@ func (c *PlatformFileController) GetCateFiles() {
 func (c *PlatformFileController) GetFileByID() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -524,7 +517,8 @@ func (c *PlatformFileController) GetFileByID() {
 func (c *PlatformFileController) UploadFile() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	if err := c.Ctx.Request.ParseMultipartForm(platformFileUploadMaxBytes); err != nil {
@@ -665,7 +659,8 @@ type platformUpdateFileBody struct {
 func (c *PlatformFileController) UpdateFile() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -719,7 +714,8 @@ func (c *PlatformFileController) UpdateFile() {
 func (c *PlatformFileController) DeleteFile() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -751,7 +747,8 @@ func (c *PlatformFileController) DeleteFile() {
 func (c *PlatformFileController) DeleteFilePermanently() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -789,7 +786,8 @@ func (c *PlatformFileController) DeleteFilePermanently() {
 func (c *PlatformFileController) MoveFile() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -827,7 +825,8 @@ type platformIdsBody struct {
 func (c *PlatformFileController) BatchDeleteFiles() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -867,7 +866,8 @@ func (c *PlatformFileController) BatchDeleteFiles() {
 func (c *PlatformFileController) BatchDeleteFilesPermanently() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -931,7 +931,8 @@ func (c *PlatformFileController) UpdateAvatar() {
 func (c *PlatformFileController) BatchMoveFiles() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
diff --git a/go/controllers/platform_home.go b/go/controllers/platform_home.go
index 55e8978..70b4387 100644
--- a/go/controllers/platform_home.go
+++ b/go/controllers/platform_home.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
@@ -114,7 +115,8 @@ ORDER BY d
 // 按天统计各号池「已提取」数量，依据 extracted_time 落在当天的记录。
 func (c *PlatformHomeController) AccountPoolDailyExtract() {
 	if _, err := requirePlatformAuth(&c.Controller); err != nil {
-		poolJSONErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		poolJSONErr(&c.Controller, code, code, err.Error())
 		return
 	}
 	n, _ := c.GetInt("days", 14)
@@ -202,7 +204,8 @@ func countPoolInventory(mi interface{}, soldOnly bool) (int64, error) {
 // 各号池：账号总数（未删）、已售卖（is_extracted 为 1 或 2）
 func (c *PlatformHomeController) AccountPoolInventoryTotals() {
 	if _, err := requirePlatformAuth(&c.Controller); err != nil {
-		poolJSONErr(&c.Controller, 401, 401, err.Error())
+		code := identity.Status(err)
+		poolJSONErr(&c.Controller, code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/platform_login_log.go b/go/controllers/platform_login_log.go
index 15416e8..a577741 100644
--- a/go/controllers/platform_login_log.go
+++ b/go/controllers/platform_login_log.go
@@ -2,13 +2,13 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -27,28 +27,14 @@ func (c *PlatformLoginLogController) jsonErr(httpStatus, bizCode int, msg string
 }
 
 func (c *PlatformLoginLogController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 // List GET /platform/loginLogs?page=1&pageSize=20&keyword=&status=&loginType=&startTime=&endTime=
 func (c *PlatformLoginLogController) List() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -156,7 +142,8 @@ func (c *PlatformLoginLogController) List() {
 // Detail GET /platform/loginLogs/:id
 func (c *PlatformLoginLogController) Detail() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -195,7 +182,8 @@ func (c *PlatformLoginLogController) Detail() {
 // Delete DELETE /platform/loginLogs/:id
 func (c *PlatformLoginLogController) Delete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -228,7 +216,8 @@ type platformLoginLogBatchDeletePayload struct {
 // BatchDelete POST /platform/loginLogs/batchDelete
 func (c *PlatformLoginLogController) BatchDelete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	raw, err := io.ReadAll(c.Ctx.Request.Body)
diff --git a/go/controllers/platform_modules.go b/go/controllers/platform_modules.go
index f837a12..a7942d5 100644
--- a/go/controllers/platform_modules.go
+++ b/go/controllers/platform_modules.go
@@ -1,462 +1,446 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-	"server/services"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// validatePlatforms 校验展示端取值，返回空串表示合法。
-// 只允许 web / app，避免出现拼错的值导致菜单在某端永远不可见。
-func validatePlatforms(list []string) string {
-	for _, s := range list {
-		switch strings.ToLower(strings.TrimSpace(s)) {
-		case models.PlatformWeb, models.PlatformApp:
-		default:
-			if strings.TrimSpace(s) == "" {
-				continue
-			}
-			return "展示端取值非法，仅支持 web（Web端）与 app（移动端）"
-		}
-	}
-	return ""
-}
-
-// platformList 把模块展示端配置输出给管理端：统一返回数组，空配置回落为全端
-func platformList(m *models.SystemModules) []string {
-	if m == nil {
-		return []string{models.PlatformWeb, models.PlatformApp}
-	}
-	list := services.ParsePlatforms(m.Platforms)
-	if len(list) == 0 {
-		return []string{models.PlatformWeb, models.PlatformApp}
-	}
-	return list
-}
-
-// PlatformModulesController 模块管理（yz_system_modules）
-type PlatformModulesController struct {
-	beego.Controller
-}
-
-func (c *PlatformModulesController) modulesClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	// 语义更正：
-	// - /platform/* 只能 platform 访问
-	// - /backend/* 只能 backend 访问
-	// 兼容：历史 token 可能缺少 user_type（按 user 处理），此时都拒绝访问以避免越权。
-	path := strings.ToLower(c.Ctx.Request.URL.Path)
-	if strings.HasPrefix(path, "/platform/") {
-		if claims.UserType != "platform" {
-			return nil, fmt.Errorf("无权访问")
-		}
-	} else if strings.HasPrefix(path, "/backend/") {
-		if claims.UserType != "backend" {
-			return nil, fmt.Errorf("无权访问")
-		}
-	}
-	return claims, nil
-}
-
-func (c *PlatformModulesController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-// GetList GET /platform/modules/list
-func (c *PlatformModulesController) GetList() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	var rows []models.SystemModules
-	_, err := models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("delete_time__isnull", true).
-		OrderBy("sort", "id").
-		All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取失败："+err.Error())
-		return
-	}
-	// 展示端统一以数组形式下发（空配置回落为全端），方便管理端回填多选框
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		list = append(list, map[string]interface{}{
-			"id":          rows[i].ID,
-			"mid":         rows[i].Mid,
-			"name":        rows[i].Name,
-			"code":        rows[i].Code,
-			"path":        rows[i].Path,
-			"icon":        rows[i].Icon,
-			"description": rows[i].Description,
-			"type":        rows[i].Type,
-			"sort":        rows[i].Sort,
-			"status":      rows[i].Status,
-			"is_show":     rows[i].IsShow,
-			"platforms":   platformList(&rows[i]),
-		})
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "获取成功",
-		"data": map[string]interface{}{
-			"list":  list,
-			"total": len(list),
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetTenantList GET /platform/modules/getTenantList
-// 兼容旧接口命名：返回当前账号可见的模块。当前实现：返回 status=1 且 is_show=1 的全部模块。
-func (c *PlatformModulesController) GetTenantList() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	var rows []models.SystemModules
-	_, err := models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("delete_time__isnull", true).
-		Filter("status", 1).
-		Filter("is_show", 1).
-		OrderBy("sort", "id").
-		All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取失败："+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "获取成功",
-		"data": map[string]interface{}{
-			"list":  rows,
-			"total": len(rows),
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetDetail GET /platform/modules/:id
-func (c *PlatformModulesController) GetDetail() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	idStr := c.Ctx.Input.Param(":id")
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var row models.SystemModules
-	err = models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		One(&row)
-	if err != nil {
-		c.jsonErr(404, 404, "模块不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "获取成功", "data": row}
-	_ = c.ServeJSON()
-}
-
-type modulePayload struct {
-	Mid         *uint64  `json:"mid"`
-	Name        string   `json:"name"`
-	Code        string   `json:"code"`
-	Path        string   `json:"path"`
-	Icon        string   `json:"icon"`
-	Description string   `json:"description"`
-	Type        int      `json:"type"`
-	Sort        int      `json:"sort"`
-	Status      int8     `json:"status"`
-	IsShow      int8     `json:"is_show"`
-	Platforms   []string `json:"platforms"` // 展示端：["web"] ["app"] ["web","app"]；空=全端
-}
-
-// Add POST /platform/modules
-func (c *PlatformModulesController) Add() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p modulePayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	if errMsg := validatePlatforms(p.Platforms); errMsg != "" {
-		c.jsonErr(400, 400, errMsg)
-		return
-	}
-	p.Name = strings.TrimSpace(p.Name)
-	p.Code = strings.TrimSpace(p.Code)
-	if p.Name == "" || p.Code == "" {
-		c.jsonErr(400, 400, "模块名称和编码不能为空")
-		return
-	}
-	// code 唯一（排除软删）
-	cnt, _ := models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("code", p.Code).
-		Filter("delete_time__isnull", true).
-		Count()
-	if cnt > 0 {
-		c.jsonErr(400, 400, "模块编码已存在")
-		return
-	}
-	now := time.Now()
-	platforms := services.NormalizePlatforms(p.Platforms)
-	row := &models.SystemModules{
-		Mid:         p.Mid,
-		Name:        p.Name,
-		Code:        p.Code,
-		Path:        strings.TrimSpace(p.Path),
-		Icon:        strings.TrimSpace(p.Icon),
-		Description: strings.TrimSpace(p.Description),
-		Type:        p.Type,
-		Sort:        p.Sort,
-		Status:      p.Status,
-		IsShow:      p.IsShow,
-		CreateTime:  &now,
-		UpdateTime:  &now,
-	}
-	if platforms != "" {
-		row.Platforms = &platforms
-	}
-	id, err := models.Orm.Insert(row)
-	if err != nil {
-		c.jsonErr(500, 500, "添加失败："+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "添加成功", "data": map[string]interface{}{"id": uint64(id)}}
-	_ = c.ServeJSON()
-}
-
-// Edit PUT /platform/modules/:id
-func (c *PlatformModulesController) Edit() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	idStr := c.Ctx.Input.Param(":id")
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p modulePayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	p.Name = strings.TrimSpace(p.Name)
-	p.Code = strings.TrimSpace(p.Code)
-	if p.Name == "" || p.Code == "" {
-		c.jsonErr(400, 400, "模块名称和编码不能为空")
-		return
-	}
-	if errMsg := validatePlatforms(p.Platforms); errMsg != "" {
-		c.jsonErr(400, 400, errMsg)
-		return
-	}
-	// code 唯一（排除自身与软删）
-	cnt, _ := models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("code", p.Code).
-		Filter("id__ne", id).
-		Filter("delete_time__isnull", true).
-		Count()
-	if cnt > 0 {
-		c.jsonErr(400, 400, "模块编码已存在")
-		return
-	}
-	now := time.Now()
-	// 展示端为空串表示「全端」，需显式落库以覆盖历史值
-	up := map[string]interface{}{
-		"mid":         p.Mid,
-		"name":        p.Name,
-		"code":        p.Code,
-		"path":        strings.TrimSpace(p.Path),
-		"icon":        strings.TrimSpace(p.Icon),
-		"description": strings.TrimSpace(p.Description),
-		"type":        p.Type,
-		"sort":        p.Sort,
-		"status":      p.Status,
-		"is_show":     p.IsShow,
-		"platforms":   services.NormalizePlatforms(p.Platforms),
-		"update_time": now,
-	}
-	n, err := models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(up)
-	if err != nil {
-		c.jsonErr(500, 500, "编辑失败："+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "模块不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "编辑成功"}
-	_ = c.ServeJSON()
-}
-
-// Delete DELETE /platform/modules/:id（软删）
-func (c *PlatformModulesController) Delete() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	idStr := c.Ctx.Input.Param(":id")
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("id", id).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now, "update_time": now})
-	if err != nil {
-		c.jsonErr(500, 500, "删除失败："+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "模块不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
-	_ = c.ServeJSON()
-}
-
-// BatchDelete POST /platform/modules/batchDelete body:{ids:[]}
-func (c *PlatformModulesController) BatchDelete() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		IDs []uint64 `json:"ids"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil || len(p.IDs) == 0 {
-		c.jsonErr(400, 400, "请选择要删除的模块")
-		return
-	}
-	now := time.Now()
-	_, err = models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("id__in", p.IDs).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"delete_time": now, "update_time": now})
-	if err != nil {
-		c.jsonErr(500, 500, "批量删除失败："+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "批量删除成功"}
-	_ = c.ServeJSON()
-}
-
-// ChangeStatus POST /platform/modules/status body:{id,status}
-// 兼容前端：这里的 status 实际用于切换 is_show（显示开关）。
-func (c *PlatformModulesController) ChangeStatus() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID     uint64 `json:"id"`
-		Status int8   `json:"status"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	if p.Status != 0 && p.Status != 1 {
-		p.Status = 1
-	}
-	now := time.Now()
-	n, err := models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("id", p.ID).
-		Filter("delete_time__isnull", true).
-		Update(map[string]interface{}{"is_show": p.Status, "update_time": now})
-	if err != nil {
-		c.jsonErr(500, 500, "状态修改失败："+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "模块不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// GetSelectList GET /platform/modules/select/list
-func (c *PlatformModulesController) GetSelectList() {
-	if _, err := c.modulesClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	var rows []models.SystemModules
-	_, err := models.Orm.QueryTable(new(models.SystemModules)).
-		Filter("delete_time__isnull", true).
-		Filter("status", 1).
-		OrderBy("sort", "id").
-		All(&rows, "ID", "Name", "Code")
-	if err != nil {
-		c.jsonErr(500, 500, "获取失败："+err.Error())
-		return
-	}
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		list = append(list, map[string]interface{}{
-			"id":   rows[i].ID,
-			"name": rows[i].Name,
-			"code": rows[i].Code,
-		})
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": list}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+	"server/services"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// validatePlatforms 校验展示端取值，返回空串表示合法。
+// 只允许 web / app，避免出现拼错的值导致菜单在某端永远不可见。
+func validatePlatforms(list []string) string {
+	for _, s := range list {
+		switch strings.ToLower(strings.TrimSpace(s)) {
+		case models.PlatformWeb, models.PlatformApp:
+		default:
+			if strings.TrimSpace(s) == "" {
+				continue
+			}
+			return "展示端取值非法，仅支持 web（Web端）与 app（移动端）"
+		}
+	}
+	return ""
+}
+
+// platformList 把模块展示端配置输出给管理端：统一返回数组，空配置回落为全端
+func platformList(m *models.SystemModules) []string {
+	if m == nil {
+		return []string{models.PlatformWeb, models.PlatformApp}
+	}
+	list := services.ParsePlatforms(m.Platforms)
+	if len(list) == 0 {
+		return []string{models.PlatformWeb, models.PlatformApp}
+	}
+	return list
+}
+
+// PlatformModulesController 模块管理（yz_system_modules）
+type PlatformModulesController struct {
+	beego.Controller
+}
+
+func (c *PlatformModulesController) modulesClaims() (*jwtutil.Claims, error) {
+	return identity.ClaimsByPath(c.Ctx.Request.Header.Get("Authorization"), c.Ctx.Request.URL.Path)
+}
+
+
+func (c *PlatformModulesController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// GetList GET /platform/modules/list
+func (c *PlatformModulesController) GetList() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	var rows []models.SystemModules
+	_, err := models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("delete_time__isnull", true).
+		OrderBy("sort", "id").
+		All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取失败："+err.Error())
+		return
+	}
+	// 展示端统一以数组形式下发（空配置回落为全端），方便管理端回填多选框
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		list = append(list, map[string]interface{}{
+			"id":          rows[i].ID,
+			"mid":         rows[i].Mid,
+			"name":        rows[i].Name,
+			"code":        rows[i].Code,
+			"path":        rows[i].Path,
+			"icon":        rows[i].Icon,
+			"description": rows[i].Description,
+			"type":        rows[i].Type,
+			"sort":        rows[i].Sort,
+			"status":      rows[i].Status,
+			"is_show":     rows[i].IsShow,
+			"platforms":   platformList(&rows[i]),
+		})
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "获取成功",
+		"data": map[string]interface{}{
+			"list":  list,
+			"total": len(list),
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetTenantList GET /platform/modules/getTenantList
+// 兼容旧接口命名：返回当前账号可见的模块。当前实现：返回 status=1 且 is_show=1 的全部模块。
+func (c *PlatformModulesController) GetTenantList() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	var rows []models.SystemModules
+	_, err := models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("delete_time__isnull", true).
+		Filter("status", 1).
+		Filter("is_show", 1).
+		OrderBy("sort", "id").
+		All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取失败："+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "获取成功",
+		"data": map[string]interface{}{
+			"list":  rows,
+			"total": len(rows),
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetDetail GET /platform/modules/:id
+func (c *PlatformModulesController) GetDetail() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	idStr := c.Ctx.Input.Param(":id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var row models.SystemModules
+	err = models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		One(&row)
+	if err != nil {
+		c.jsonErr(404, 404, "模块不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "获取成功", "data": row}
+	_ = c.ServeJSON()
+}
+
+type modulePayload struct {
+	Mid         *uint64  `json:"mid"`
+	Name        string   `json:"name"`
+	Code        string   `json:"code"`
+	Path        string   `json:"path"`
+	Icon        string   `json:"icon"`
+	Description string   `json:"description"`
+	Type        int      `json:"type"`
+	Sort        int      `json:"sort"`
+	Status      int8     `json:"status"`
+	IsShow      int8     `json:"is_show"`
+	Platforms   []string `json:"platforms"` // 展示端：["web"] ["app"] ["web","app"]；空=全端
+}
+
+// Add POST /platform/modules
+func (c *PlatformModulesController) Add() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p modulePayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	if errMsg := validatePlatforms(p.Platforms); errMsg != "" {
+		c.jsonErr(400, 400, errMsg)
+		return
+	}
+	p.Name = strings.TrimSpace(p.Name)
+	p.Code = strings.TrimSpace(p.Code)
+	if p.Name == "" || p.Code == "" {
+		c.jsonErr(400, 400, "模块名称和编码不能为空")
+		return
+	}
+	// code 唯一（排除软删）
+	cnt, _ := models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("code", p.Code).
+		Filter("delete_time__isnull", true).
+		Count()
+	if cnt > 0 {
+		c.jsonErr(400, 400, "模块编码已存在")
+		return
+	}
+	now := time.Now()
+	platforms := services.NormalizePlatforms(p.Platforms)
+	row := &models.SystemModules{
+		Mid:         p.Mid,
+		Name:        p.Name,
+		Code:        p.Code,
+		Path:        strings.TrimSpace(p.Path),
+		Icon:        strings.TrimSpace(p.Icon),
+		Description: strings.TrimSpace(p.Description),
+		Type:        p.Type,
+		Sort:        p.Sort,
+		Status:      p.Status,
+		IsShow:      p.IsShow,
+		CreateTime:  &now,
+		UpdateTime:  &now,
+	}
+	if platforms != "" {
+		row.Platforms = &platforms
+	}
+	id, err := models.Orm.Insert(row)
+	if err != nil {
+		c.jsonErr(500, 500, "添加失败："+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "添加成功", "data": map[string]interface{}{"id": uint64(id)}}
+	_ = c.ServeJSON()
+}
+
+// Edit PUT /platform/modules/:id
+func (c *PlatformModulesController) Edit() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	idStr := c.Ctx.Input.Param(":id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p modulePayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	p.Name = strings.TrimSpace(p.Name)
+	p.Code = strings.TrimSpace(p.Code)
+	if p.Name == "" || p.Code == "" {
+		c.jsonErr(400, 400, "模块名称和编码不能为空")
+		return
+	}
+	if errMsg := validatePlatforms(p.Platforms); errMsg != "" {
+		c.jsonErr(400, 400, errMsg)
+		return
+	}
+	// code 唯一（排除自身与软删）
+	cnt, _ := models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("code", p.Code).
+		Filter("id__ne", id).
+		Filter("delete_time__isnull", true).
+		Count()
+	if cnt > 0 {
+		c.jsonErr(400, 400, "模块编码已存在")
+		return
+	}
+	now := time.Now()
+	// 展示端为空串表示「全端」，需显式落库以覆盖历史值
+	up := map[string]interface{}{
+		"mid":         p.Mid,
+		"name":        p.Name,
+		"code":        p.Code,
+		"path":        strings.TrimSpace(p.Path),
+		"icon":        strings.TrimSpace(p.Icon),
+		"description": strings.TrimSpace(p.Description),
+		"type":        p.Type,
+		"sort":        p.Sort,
+		"status":      p.Status,
+		"is_show":     p.IsShow,
+		"platforms":   services.NormalizePlatforms(p.Platforms),
+		"update_time": now,
+	}
+	n, err := models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(up)
+	if err != nil {
+		c.jsonErr(500, 500, "编辑失败："+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "模块不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "编辑成功"}
+	_ = c.ServeJSON()
+}
+
+// Delete DELETE /platform/modules/:id（软删）
+func (c *PlatformModulesController) Delete() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	idStr := c.Ctx.Input.Param(":id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("id", id).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now, "update_time": now})
+	if err != nil {
+		c.jsonErr(500, 500, "删除失败："+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "模块不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
+	_ = c.ServeJSON()
+}
+
+// BatchDelete POST /platform/modules/batchDelete body:{ids:[]}
+func (c *PlatformModulesController) BatchDelete() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		IDs []uint64 `json:"ids"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil || len(p.IDs) == 0 {
+		c.jsonErr(400, 400, "请选择要删除的模块")
+		return
+	}
+	now := time.Now()
+	_, err = models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("id__in", p.IDs).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"delete_time": now, "update_time": now})
+	if err != nil {
+		c.jsonErr(500, 500, "批量删除失败："+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "批量删除成功"}
+	_ = c.ServeJSON()
+}
+
+// ChangeStatus POST /platform/modules/status body:{id,status}
+// 兼容前端：这里的 status 实际用于切换 is_show（显示开关）。
+func (c *PlatformModulesController) ChangeStatus() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID     uint64 `json:"id"`
+		Status int8   `json:"status"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil || p.ID == 0 {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	if p.Status != 0 && p.Status != 1 {
+		p.Status = 1
+	}
+	now := time.Now()
+	n, err := models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("id", p.ID).
+		Filter("delete_time__isnull", true).
+		Update(map[string]interface{}{"is_show": p.Status, "update_time": now})
+	if err != nil {
+		c.jsonErr(500, 500, "状态修改失败："+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "模块不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// GetSelectList GET /platform/modules/select/list
+func (c *PlatformModulesController) GetSelectList() {
+	if _, err := c.modulesClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	var rows []models.SystemModules
+	_, err := models.Orm.QueryTable(new(models.SystemModules)).
+		Filter("delete_time__isnull", true).
+		Filter("status", 1).
+		OrderBy("sort", "id").
+		All(&rows, "ID", "Name", "Code")
+	if err != nil {
+		c.jsonErr(500, 500, "获取失败："+err.Error())
+		return
+	}
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		list = append(list, map[string]interface{}{
+			"id":   rows[i].ID,
+			"name": rows[i].Name,
+			"code": rows[i].Code,
+		})
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": list}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/platform_notebook.go b/go/controllers/platform_notebook.go
index ac51779..8091526 100644
--- a/go/controllers/platform_notebook.go
+++ b/go/controllers/platform_notebook.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"io"
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"strconv"
 	"strings"
@@ -19,22 +20,7 @@ type PlatformNotebookController struct {
 
 // requireAuth 验证平台用户权限
 func requireNotebookAuth(c *beego.Controller) (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, orm.ErrNoRows
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, orm.ErrNoRows
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, err
-	}
-	if claims.UserType != "platform" {
-		return nil, orm.ErrNoRows
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 // jsonResponse 统一JSON响应
@@ -56,7 +42,8 @@ func jsonResponse(c *beego.Controller, httpStatus, code int, msg string, data in
 func (c *PlatformNotebookController) List() {
 	claims, err := requireNotebookAuth(&c.Controller)
 	if err != nil {
-		jsonResponse(&c.Controller, 401, 401, "未登录或无权限", nil)
+		code := identity.Status(err)
+		jsonResponse(&c.Controller, code, code, err.Error(), nil)
 		return
 	}
 
@@ -111,7 +98,8 @@ func (c *PlatformNotebookController) List() {
 func (c *PlatformNotebookController) Detail() {
 	claims, err := requireNotebookAuth(&c.Controller)
 	if err != nil {
-		jsonResponse(&c.Controller, 401, 401, "未登录或无权限", nil)
+		code := identity.Status(err)
+		jsonResponse(&c.Controller, code, code, err.Error(), nil)
 		return
 	}
 
@@ -145,7 +133,8 @@ func (c *PlatformNotebookController) Detail() {
 func (c *PlatformNotebookController) Create() {
 	claims, err := requireNotebookAuth(&c.Controller)
 	if err != nil {
-		jsonResponse(&c.Controller, 401, 401, "未登录或无权限", nil)
+		code := identity.Status(err)
+		jsonResponse(&c.Controller, code, code, err.Error(), nil)
 		return
 	}
 
@@ -196,7 +185,8 @@ func (c *PlatformNotebookController) Create() {
 func (c *PlatformNotebookController) Update() {
 	claims, err := requireNotebookAuth(&c.Controller)
 	if err != nil {
-		jsonResponse(&c.Controller, 401, 401, "未登录或无权限", nil)
+		code := identity.Status(err)
+		jsonResponse(&c.Controller, code, code, err.Error(), nil)
 		return
 	}
 
@@ -273,7 +263,8 @@ func (c *PlatformNotebookController) Update() {
 func (c *PlatformNotebookController) Delete() {
 	claims, err := requireNotebookAuth(&c.Controller)
 	if err != nil {
-		jsonResponse(&c.Controller, 401, 401, "未登录或无权限", nil)
+		code := identity.Status(err)
+		jsonResponse(&c.Controller, code, code, err.Error(), nil)
 		return
 	}
 
diff --git a/go/controllers/platform_operation_log.go b/go/controllers/platform_operation_log.go
index 208c45a..29ec9df 100644
--- a/go/controllers/platform_operation_log.go
+++ b/go/controllers/platform_operation_log.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -22,22 +23,7 @@ type PlatformOperationLogController struct {
 }
 
 func (c *PlatformOperationLogController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformOperationLogController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -49,7 +35,8 @@ func (c *PlatformOperationLogController) jsonErr(httpStatus, bizCode int, msg st
 // List GET /platform/operationLogs?page=1&pageSize=20&keyword=&module=&action=&status=&startTime=&endTime=
 func (c *PlatformOperationLogController) List() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -175,7 +162,8 @@ func (c *PlatformOperationLogController) List() {
 // Detail GET /platform/operationLogs/:id
 func (c *PlatformOperationLogController) Detail() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -220,7 +208,8 @@ func (c *PlatformOperationLogController) Detail() {
 // Delete DELETE /platform/operationLogs/:id
 func (c *PlatformOperationLogController) Delete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	idStr := c.Ctx.Input.Param(":id")
@@ -253,7 +242,8 @@ type batchDeletePayload struct {
 // BatchDelete POST /platform/operationLogs/batchDelete
 func (c *PlatformOperationLogController) BatchDelete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	raw, err := io.ReadAll(c.Ctx.Request.Body)
@@ -287,7 +277,8 @@ func (c *PlatformOperationLogController) BatchDelete() {
 // 供前端筛选项：modules/actions
 func (c *PlatformOperationLogController) Statistics() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/platform_payment.go b/go/controllers/platform_payment.go
index 0f770c7..3962dfe 100644
--- a/go/controllers/platform_payment.go
+++ b/go/controllers/platform_payment.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services/payment"
 
@@ -32,22 +33,7 @@ func (c *PlatformPaymentController) platformClaims() (*jwtutil.Claims, error) {
 
 // paymentPlatformClaims 平台端鉴权（支付相关控制器共用），传各控制器内嵌的 &c.Controller
 func paymentPlatformClaims(c *beego.Controller) (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformPaymentController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -153,7 +139,8 @@ func loadMergedConfig(channel string, p *paymentChannelPayload) (*payment.Channe
 // ListChannels GET /platform/payment/channels 渠道概览
 func (c *PlatformPaymentController) ListChannels() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var rows []models.PlatformPaymentChannel
@@ -178,7 +165,8 @@ func (c *PlatformPaymentController) ListChannels() {
 // GetChannel GET /platform/payment/channels/:channel 渠道配置详情（敏感字段掩码）
 func (c *PlatformPaymentController) GetChannel() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	channel := c.Ctx.Input.Param(":channel")
@@ -203,7 +191,8 @@ func (c *PlatformPaymentController) GetChannel() {
 func (c *PlatformPaymentController) SaveChannel() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	channel := c.Ctx.Input.Param(":channel")
@@ -282,7 +271,8 @@ func (c *PlatformPaymentController) SaveChannel() {
 // TestChannel POST /platform/payment/channels/:channel/test 测试连接（支持未保存参数）
 func (c *PlatformPaymentController) TestChannel() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	channel := c.Ctx.Input.Param(":channel")
@@ -322,7 +312,8 @@ func (c *PlatformPaymentController) TestChannel() {
 // ToggleChannel POST /platform/payment/channels/:channel/status 启用/停用
 func (c *PlatformPaymentController) ToggleChannel() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	channel := c.Ctx.Input.Param(":channel")
@@ -365,7 +356,8 @@ func b2i(v bool) int8 {
 // 文件路径写入 cert_json，密钥内容绝不入库、不回显。
 func (c *PlatformPaymentController) UploadCertificate() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	channel := c.Ctx.Input.Param(":channel")
@@ -461,7 +453,8 @@ func paymentOrderDTO(row *models.PlatformPaymentOrder) map[string]interface{} {
 // ListOrders GET /platform/payment/orders 支付单列表
 func (c *PlatformPaymentController) ListOrders() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	page, _ := strconv.Atoi(c.GetString("page", "1"))
@@ -521,7 +514,8 @@ func (c *PlatformPaymentController) ListOrders() {
 // OrderDetail GET /platform/payment/orders/:payNo 支付单详情（含状态流转 + 最近回调原文）
 func (c *PlatformPaymentController) OrderDetail() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	payNo := c.Ctx.Input.Param(":payNo")
@@ -565,7 +559,8 @@ func (c *PlatformPaymentController) OrderDetail() {
 // QueryOrder POST /platform/payment/orders/:payNo/query 手动查询渠道状态（兜底回调丢失）
 func (c *PlatformPaymentController) QueryOrder() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	payNo := c.Ctx.Input.Param(":payNo")
@@ -592,7 +587,8 @@ func (c *PlatformPaymentController) QueryOrder() {
 func (c *PlatformPaymentController) Refund() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
diff --git a/go/controllers/platform_payment_reconcile.go b/go/controllers/platform_payment_reconcile.go
index bba5acd..e759173 100644
--- a/go/controllers/platform_payment_reconcile.go
+++ b/go/controllers/platform_payment_reconcile.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services/payment"
 
@@ -51,7 +52,8 @@ func reconcileDiffDTO(row *models.PlatformPaymentReconcileDiff) map[string]inter
 // ListReconcile GET /platform/payment/reconcile 对账差异列表
 func (c *PlatformPaymentReconcileController) ListReconcile() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	page, _ := strconv.Atoi(c.GetString("page", "1"))
@@ -82,7 +84,8 @@ func (c *PlatformPaymentReconcileController) ListReconcile() {
 func (c *PlatformPaymentReconcileController) HandleReconcile() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -113,7 +116,8 @@ func (c *PlatformPaymentReconcileController) HandleReconcile() {
 // RunReconcile POST /platform/payment/reconcile/run 执行对账比对
 func (c *PlatformPaymentReconcileController) RunReconcile() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -139,7 +143,8 @@ func (c *PlatformPaymentReconcileController) RunReconcile() {
 // 两种方式：multipart 上传 CSV（字段 file + channel + bill_date），或 JSON {channel, bill_date, rows:[...]}
 func (c *PlatformPaymentReconcileController) ImportBill() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var channel, billDate string
diff --git a/go/controllers/platform_reimburse_expense_type.go b/go/controllers/platform_reimburse_expense_type.go
index 3e6853c..3fc0734 100644
--- a/go/controllers/platform_reimburse_expense_type.go
+++ b/go/controllers/platform_reimburse_expense_type.go
@@ -2,13 +2,13 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -21,22 +21,7 @@ type PlatformReimburseExpenseTypeController struct {
 }
 
 func (c *PlatformReimburseExpenseTypeController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformReimburseExpenseTypeController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -69,7 +54,8 @@ func (c *PlatformReimburseExpenseTypeController) findGlobalType(id uint64) (*mod
 // List GET /platform/reimburseExpenseTypes
 func (c *PlatformReimburseExpenseTypeController) List() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var rows []models.BackendReimbursementExpenseType
@@ -100,7 +86,8 @@ type platformExpenseTypePayload struct {
 func (c *PlatformReimburseExpenseTypeController) Create() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -138,7 +125,8 @@ func (c *PlatformReimburseExpenseTypeController) Create() {
 // Update POST /platform/reimburseExpenseTypes/:id
 func (c *PlatformReimburseExpenseTypeController) Update() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -182,7 +170,8 @@ func (c *PlatformReimburseExpenseTypeController) Update() {
 // Delete DELETE /platform/reimburseExpenseTypes/:id
 func (c *PlatformReimburseExpenseTypeController) Delete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/platform_reminder.go b/go/controllers/platform_reminder.go
index 5378cde..d34664f 100644
--- a/go/controllers/platform_reminder.go
+++ b/go/controllers/platform_reminder.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -22,22 +23,7 @@ type PlatformReminderController struct {
 }
 
 func (c *PlatformReminderController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformReminderController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -75,7 +61,8 @@ type reminderFormPayload struct {
 // GetReminderList GET /platform/reminder/list
 func (c *PlatformReminderController) GetReminderList() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -151,7 +138,8 @@ func (c *PlatformReminderController) GetReminderList() {
 // GetReminderDetail GET /platform/reminder/:id
 func (c *PlatformReminderController) GetReminderDetail() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -222,7 +210,8 @@ func (c *PlatformReminderController) GetReminderDetail() {
 func (c *PlatformReminderController) CreateReminder() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -316,7 +305,8 @@ func (c *PlatformReminderController) CreateReminder() {
 // UpdateReminder PUT /platform/reminder/:id
 func (c *PlatformReminderController) UpdateReminder() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -443,7 +433,8 @@ func (c *PlatformReminderController) UpdateReminder() {
 // DeleteReminder DELETE /platform/reminder/:id
 func (c *PlatformReminderController) DeleteReminder() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -499,7 +490,8 @@ type reminderBatchDeletePayload struct {
 // BatchDeleteReminder POST /platform/reminder/batchDelete
 func (c *PlatformReminderController) BatchDeleteReminder() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -559,7 +551,8 @@ func (c *PlatformReminderController) BatchDeleteReminder() {
 // 切换日程提醒的结束状态：若尚有提醒未结束则全部置为已结束；若已全部结束则恢复为待提醒。
 func (c *PlatformReminderController) FinishReminder() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -618,7 +611,8 @@ type reminderTestPayload struct {
 func (c *PlatformReminderController) TestReminder() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/platform_role.go b/go/controllers/platform_role.go
index b531773..7ff4b4e 100644
--- a/go/controllers/platform_role.go
+++ b/go/controllers/platform_role.go
@@ -1,201 +1,215 @@
-package controllers
-
-import (
-	"encoding/json"
-	"io"
-	"strconv"
-	"strings"
-
-	"server/models"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// PlatformRoleController 平台角色管理（yz_system_admin_role）
-type PlatformRoleController struct {
-	beego.Controller
-}
-
-type rolePayload struct {
-	Cid    *uint8      `json:"cid"`
-	Name   string      `json:"name"`
-	Status *uint8      `json:"status"`
-	Rights interface{} `json:"rights"`
-}
-
-func normalizeRights(v interface{}) *string {
-	if v == nil {
-		return nil
-	}
-	switch t := v.(type) {
-	case string:
-		s := strings.TrimSpace(t)
-		if s == "" {
-			return nil
-		}
-		return &s
-	default:
-		b, err := json.Marshal(v)
-		if err != nil {
-			return nil
-		}
-		s := string(b)
-		return &s
-	}
-}
-
-// GetAllRoles 获取角色列表
-// GET /platform/allRoles
-func (c *PlatformRoleController) GetAllRoles() {
-	var rows []models.AdminRole
-	_, err := models.Orm.QueryTable(new(models.AdminRole)).
-		OrderBy("-id").
-		All(&rows)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "查询失败"}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": rows}
-	_ = c.ServeJSON()
-}
-
-// GetRoleByID 获取角色详情
-// GET /platform/roles/:id
-func (c *PlatformRoleController) GetRoleByID() {
-	idStr := c.Ctx.Input.Param(":id")
-	id, _ := strconv.ParseUint(idStr, 10, 64)
-	if id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "id 不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-	role := models.AdminRole{ID: id}
-	if err := models.Orm.Read(&role); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "角色不存在"}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": role}
-	_ = c.ServeJSON()
-}
-
-// CreateRole 创建角色
-// POST /platform/roles
-func (c *PlatformRoleController) CreateRole() {
-	var p rolePayload
-	raw, _ := io.ReadAll(c.Ctx.Request.Body)
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
-		_ = c.ServeJSON()
-		return
-	}
-	p.Name = strings.TrimSpace(p.Name)
-	if p.Name == "" {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "name 不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	status := uint8(1)
-	if p.Status != nil {
-		status = *p.Status
-	}
-	cid := uint8(1)
-	if p.Cid != nil {
-		cid = *p.Cid
-	}
-	if cid != 1 && cid != 2 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "cid 仅支持 1/2"}
-		_ = c.ServeJSON()
-		return
-	}
-	rights := normalizeRights(p.Rights)
-	role := &models.AdminRole{
-		Cid:    cid,
-		Name:   p.Name,
-		Status: status,
-		Rights: rights,
-	}
-	id, err := models.Orm.Insert(role)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "创建失败"}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": map[string]interface{}{"id": id}}
-	_ = c.ServeJSON()
-}
-
-// UpdateRole 更新角色
-// PUT /platform/roles/:id
-func (c *PlatformRoleController) UpdateRole() {
-	idStr := c.Ctx.Input.Param(":id")
-	id, _ := strconv.ParseUint(idStr, 10, 64)
-	if id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "id 不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	var p rolePayload
-	raw, _ := io.ReadAll(c.Ctx.Request.Body)
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	update := map[string]interface{}{}
-	if strings.TrimSpace(p.Name) != "" {
-		update["name"] = strings.TrimSpace(p.Name)
-	}
-	if p.Status != nil {
-		update["status"] = *p.Status
-	}
-	if p.Cid != nil {
-		if *p.Cid != 1 && *p.Cid != 2 {
-			c.Data["json"] = map[string]interface{}{"code": 400, "msg": "cid 仅支持 1/2"}
-			_ = c.ServeJSON()
-			return
-		}
-		update["cid"] = *p.Cid
-	}
-	if p.Rights != nil {
-		update["rights"] = normalizeRights(p.Rights)
-	}
-	if len(update) == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无更新字段"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	_, err := models.Orm.QueryTable(new(models.AdminRole)).Filter("id", id).Update(update)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败"}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// DeleteRole 删除角色
-// DELETE /platform/roles/:id
-func (c *PlatformRoleController) DeleteRole() {
-	idStr := c.Ctx.Input.Param(":id")
-	id, _ := strconv.ParseUint(idStr, 10, 64)
-	if id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "id 不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-	_, err := models.Orm.QueryTable(new(models.AdminRole)).Filter("id", id).Delete()
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "删除失败"}
-		_ = c.ServeJSON()
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+
+	"server/models"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// PlatformRoleController 平台角色管理（yz_system_admin_role）
+type PlatformRoleController struct {
+	beego.Controller
+}
+
+type rolePayload struct {
+	Cid    *uint8      `json:"cid"`
+	Name   string      `json:"name"`
+	Status *uint8      `json:"status"`
+	Rights interface{} `json:"rights"`
+}
+
+func normalizeRights(v interface{}) *string {
+	if v == nil {
+		return nil
+	}
+	switch t := v.(type) {
+	case string:
+		s := strings.TrimSpace(t)
+		if s == "" {
+			return nil
+		}
+		return &s
+	default:
+		b, err := json.Marshal(v)
+		if err != nil {
+			return nil
+		}
+		s := string(b)
+		return &s
+	}
+}
+
+// GetAllRoles 获取角色列表
+// GET /platform/allRoles
+func (c *PlatformRoleController) GetAllRoles() {
+	var rows []models.AdminRole
+	_, err := models.Orm.QueryTable(new(models.AdminRole)).
+		OrderBy("-id").
+		All(&rows)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "查询失败"}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": rows}
+	_ = c.ServeJSON()
+}
+
+// GetRoleByID 获取角色详情
+// GET /platform/roles/:id
+func (c *PlatformRoleController) GetRoleByID() {
+	idStr := c.Ctx.Input.Param(":id")
+	id, _ := strconv.ParseUint(idStr, 10, 64)
+	if id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "id 不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+	role := models.AdminRole{ID: id}
+	if err := models.Orm.Read(&role); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "角色不存在"}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": role}
+	_ = c.ServeJSON()
+}
+
+// CreateRole 创建角色
+// POST /platform/roles
+func (c *PlatformRoleController) CreateRole() {
+	var p rolePayload
+	raw, _ := io.ReadAll(c.Ctx.Request.Body)
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
+		_ = c.ServeJSON()
+		return
+	}
+	p.Name = strings.TrimSpace(p.Name)
+	if p.Name == "" {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "name 不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	status := uint8(1)
+	if p.Status != nil {
+		status = *p.Status
+	}
+	cid := uint8(1)
+	if p.Cid != nil {
+		cid = *p.Cid
+	}
+	if cid != 1 && cid != 2 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "cid 仅支持 1/2"}
+		_ = c.ServeJSON()
+		return
+	}
+	rights := normalizeRights(p.Rights)
+	// 平台建的租户角色（cid=2）就是「下发到租户后台」，对租户只读；
+	// 平台角色（cid=1）不下发，锁定位无意义。
+	isLocked := uint8(0)
+	if cid == 2 {
+		isLocked = 1
+	}
+	role := &models.AdminRole{
+		Cid:      cid,
+		IsLocked: isLocked,
+		Name:     p.Name,
+		Status:   status,
+		Rights:   rights,
+	}
+	id, err := models.Orm.Insert(role)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "创建失败"}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": map[string]interface{}{"id": id}}
+	_ = c.ServeJSON()
+}
+
+// UpdateRole 更新角色
+// PUT /platform/roles/:id
+func (c *PlatformRoleController) UpdateRole() {
+	idStr := c.Ctx.Input.Param(":id")
+	id, _ := strconv.ParseUint(idStr, 10, 64)
+	if id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "id 不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	var p rolePayload
+	raw, _ := io.ReadAll(c.Ctx.Request.Body)
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "参数错误"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	update := map[string]interface{}{}
+	if strings.TrimSpace(p.Name) != "" {
+		update["name"] = strings.TrimSpace(p.Name)
+	}
+	if p.Status != nil {
+		update["status"] = *p.Status
+	}
+	if p.Cid != nil {
+		if *p.Cid != 1 && *p.Cid != 2 {
+			c.Data["json"] = map[string]interface{}{"code": 400, "msg": "cid 仅支持 1/2"}
+			_ = c.ServeJSON()
+			return
+		}
+		update["cid"] = *p.Cid
+		// 锁定位必须跟着 cid 走：改成 cid=2 即下发给租户，必须只读；
+		// 改回 cid=1 收回平台，就不能再留着锁定标记。
+		if *p.Cid == 2 {
+			update["is_locked"] = uint8(1)
+		} else {
+			update["is_locked"] = uint8(0)
+		}
+	}
+	if p.Rights != nil {
+		update["rights"] = normalizeRights(p.Rights)
+	}
+	if len(update) == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无更新字段"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	_, err := models.Orm.QueryTable(new(models.AdminRole)).Filter("id", id).Update(update)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败"}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// DeleteRole 删除角色
+// DELETE /platform/roles/:id
+func (c *PlatformRoleController) DeleteRole() {
+	idStr := c.Ctx.Input.Param(":id")
+	id, _ := strconv.ParseUint(idStr, 10, 64)
+	if id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "id 不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+	_, err := models.Orm.QueryTable(new(models.AdminRole)).Filter("id", id).Delete()
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "删除失败"}
+		_ = c.ServeJSON()
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/platform_site_settings.go b/go/controllers/platform_site_settings.go
index 2bcd722..f025c72 100644
--- a/go/controllers/platform_site_settings.go
+++ b/go/controllers/platform_site_settings.go
@@ -1,271 +1,249 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// PlatformSiteSettingsController 租户站点设置（站点基本信息）
-// 对应前端 normalSettings.vue 的：
-// - GET  /backend/normalInfos
-// - POST /backend/saveNormalInfos
-// - GET  /platform/normalInfos
-// - POST /platform/saveNormalInfos
-type PlatformSiteSettingsController struct {
-	beego.Controller
-}
-
-func (c *PlatformSiteSettingsController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-func (c *PlatformSiteSettingsController) claimsByPath() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-
-	path := strings.ToLower(c.Ctx.Request.URL.Path)
-	if strings.HasPrefix(path, "/platform/") {
-		if claims.UserType != "platform" {
-			return nil, fmt.Errorf("无权访问")
-		}
-	} else if strings.HasPrefix(path, "/backend/") {
-		if claims.UserType != "backend" {
-			return nil, fmt.Errorf("无权访问")
-		}
-	}
-
-	return claims, nil
-}
-
-func parseUint64Flexible(v interface{}) uint64 {
-	if v == nil {
-		return 0
-	}
-	switch x := v.(type) {
-	case float64:
-		if x <= 0 {
-			return 0
-		}
-		return uint64(x)
-	case string:
-		s := strings.TrimSpace(x)
-		if s == "" {
-			return 0
-		}
-		n, err := strconv.ParseUint(s, 10, 64)
-		if err != nil || n == 0 {
-			return 0
-		}
-		return n
-	default:
-		return 0
-	}
-}
-
-type normalInfosOutput struct {
-	Sitename            string `json:"sitename"`
-	Companyintroduction string `json:"companyintroduction"`
-	Description         string `json:"description"`
-	Copyright           string `json:"copyright"`
-	Companyname         string `json:"companyname"`
-	Icp                 string `json:"icp"`
-	Logo                string `json:"logo"`
-	Logow               string `json:"logow"`
-	Ico                 string `json:"ico"`
-}
-
-// GetNormalInfos GET /backend/normalInfos 或 /platform/normalInfos
-func (c *PlatformSiteSettingsController) GetNormalInfos() {
-	claims, err := c.claimsByPath()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	// 优先使用 token 中的租户 id；若为 0，则允许前端通过查询参数传入（兼容历史/平台端）。
-	tid := uint64(claims.TenantId)
-	if tid == 0 {
-		tidStr := strings.TrimSpace(c.GetString("tid"))
-		if tidStr != "" {
-			if n, err := strconv.ParseUint(tidStr, 10, 64); err == nil {
-				tid = n
-			}
-		}
-	}
-
-	out := normalInfosOutput{
-		Sitename:            "",
-		Companyintroduction: "",
-		Description:         "",
-		Copyright:           "",
-		Companyname:         "",
-		Icp:                 "",
-		Logo:                "",
-		Logow:               "",
-		Ico:                 "",
-	}
-
-	// tid 缺失时不报错，直接返回空对象给前端渲染（避免 UI 直接崩）。
-	if tid == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": out}
-		_ = c.ServeJSON()
-		return
-	}
-
-	var rows []models.TenantSiteSetting
-	_, err = models.Orm.QueryTable(new(models.TenantSiteSetting)).
-		Filter("tid", tid).
-		Filter("delete_time__isnull", true).
-		Limit(1).
-		All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取失败: "+err.Error())
-		return
-	}
-	if len(rows) > 0 {
-		r := rows[0]
-		out.Sitename = r.Sitename
-		out.Companyintroduction = r.Companyintroduction
-		out.Logo = r.Logo
-		out.Logow = r.Logow
-		out.Ico = r.Ico
-		out.Description = r.Description
-		out.Copyright = r.Copyright
-		out.Companyname = r.Companyname
-		out.Icp = r.Icp
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": out}
-	_ = c.ServeJSON()
-}
-
-type normalInfosPayload struct {
-	// 前端会传 tid（但我们仍优先使用 token 的 tenant_id）
-	Tid interface{} `json:"tid"`
-
-	Sitename            string `json:"sitename"`
-	Companyintroduction string `json:"companyintroduction"`
-	Logo                string `json:"logo"`
-	Logow               string `json:"logow"`
-	Ico                 string `json:"ico"`
-	Description         string `json:"description"`
-	Copyright           string `json:"copyright"`
-	Companyname         string `json:"companyname"`
-	Icp                 string `json:"icp"`
-}
-
-// SaveNormalInfos POST /backend/saveNormalInfos 或 /platform/saveNormalInfos
-func (c *PlatformSiteSettingsController) SaveNormalInfos() {
-	claims, err := c.claimsByPath()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	var p normalInfosPayload
-	if uerr := json.Unmarshal(raw, &p); uerr != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	tid := uint64(claims.TenantId)
-	if tid == 0 {
-		tid = parseUint64Flexible(p.Tid)
-	}
-	if tid == 0 {
-		c.jsonErr(400, 400, "tid不能为空")
-		return
-	}
-
-	sitename := strings.TrimSpace(p.Sitename)
-	if sitename == "" {
-		c.jsonErr(400, 400, "站点名称不能为空")
-		return
-	}
-
-	now := time.Now()
-
-	up := map[string]interface{}{
-		"tid":                 tid,
-		"sitename":            sitename,
-		"companyintroduction": strings.TrimSpace(p.Companyintroduction),
-		"logo":                strings.TrimSpace(p.Logo),
-		"logow":               strings.TrimSpace(p.Logow),
-		"ico":                 strings.TrimSpace(p.Ico),
-		"description":         strings.TrimSpace(p.Description),
-		"copyright":           strings.TrimSpace(p.Copyright),
-		"companyname":         strings.TrimSpace(p.Companyname),
-		"icp":                 strings.TrimSpace(p.Icp),
-		"update_time":         now,
-	}
-
-	cnt, err := models.Orm.QueryTable(new(models.TenantSiteSetting)).
-		Filter("tid", tid).
-		Filter("delete_time__isnull", true).
-		Count()
-	if err != nil {
-		c.jsonErr(500, 500, "保存失败: "+err.Error())
-		return
-	}
-
-	if cnt == 0 {
-		row := &models.TenantSiteSetting{
-			Tid:                 tid,
-			Sitename:            sitename,
-			Companyintroduction: strings.TrimSpace(p.Companyintroduction),
-			Logo:                strings.TrimSpace(p.Logo),
-			Logow:               strings.TrimSpace(p.Logow),
-			Ico:                 strings.TrimSpace(p.Ico),
-			Description:         strings.TrimSpace(p.Description),
-			Copyright:           strings.TrimSpace(p.Copyright),
-			Companyname:         strings.TrimSpace(p.Companyname),
-			Icp:                 strings.TrimSpace(p.Icp),
-			CreateTime:          now,
-			UpdateTime:          &now,
-		}
-		_, err = models.Orm.Insert(row)
-		if err != nil {
-			c.jsonErr(500, 500, "保存失败: "+err.Error())
-			return
-		}
-	} else {
-		_, err = models.Orm.QueryTable(new(models.TenantSiteSetting)).
-			Filter("tid", tid).
-			Filter("delete_time__isnull", true).
-			Update(up)
-		if err != nil {
-			c.jsonErr(500, 500, "保存失败: "+err.Error())
-			return
-		}
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// PlatformSiteSettingsController 租户站点设置（站点基本信息）
+// 对应前端 normalSettings.vue 的：
+// - GET  /backend/normalInfos
+// - POST /backend/saveNormalInfos
+// - GET  /platform/normalInfos
+// - POST /platform/saveNormalInfos
+type PlatformSiteSettingsController struct {
+	beego.Controller
+}
+
+func (c *PlatformSiteSettingsController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+func (c *PlatformSiteSettingsController) claimsByPath() (*jwtutil.Claims, error) {
+	return identity.ClaimsByPath(c.Ctx.Request.Header.Get("Authorization"), c.Ctx.Request.URL.Path)
+}
+
+func parseUint64Flexible(v interface{}) uint64 {
+	if v == nil {
+		return 0
+	}
+	switch x := v.(type) {
+	case float64:
+		if x <= 0 {
+			return 0
+		}
+		return uint64(x)
+	case string:
+		s := strings.TrimSpace(x)
+		if s == "" {
+			return 0
+		}
+		n, err := strconv.ParseUint(s, 10, 64)
+		if err != nil || n == 0 {
+			return 0
+		}
+		return n
+	default:
+		return 0
+	}
+}
+
+type normalInfosOutput struct {
+	Sitename            string `json:"sitename"`
+	Companyintroduction string `json:"companyintroduction"`
+	Description         string `json:"description"`
+	Copyright           string `json:"copyright"`
+	Companyname         string `json:"companyname"`
+	Icp                 string `json:"icp"`
+	Logo                string `json:"logo"`
+	Logow               string `json:"logow"`
+	Ico                 string `json:"ico"`
+}
+
+// GetNormalInfos GET /backend/normalInfos 或 /platform/normalInfos
+func (c *PlatformSiteSettingsController) GetNormalInfos() {
+	claims, err := c.claimsByPath()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	// 优先使用 token 中的租户 id；若为 0，则允许前端通过查询参数传入（兼容历史/平台端）。
+	tid := uint64(claims.TenantId)
+	if tid == 0 {
+		tidStr := strings.TrimSpace(c.GetString("tid"))
+		if tidStr != "" {
+			if n, err := strconv.ParseUint(tidStr, 10, 64); err == nil {
+				tid = n
+			}
+		}
+	}
+
+	out := normalInfosOutput{
+		Sitename:            "",
+		Companyintroduction: "",
+		Description:         "",
+		Copyright:           "",
+		Companyname:         "",
+		Icp:                 "",
+		Logo:                "",
+		Logow:               "",
+		Ico:                 "",
+	}
+
+	// tid 缺失时不报错，直接返回空对象给前端渲染（避免 UI 直接崩）。
+	if tid == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": out}
+		_ = c.ServeJSON()
+		return
+	}
+
+	var rows []models.TenantSiteSetting
+	_, err = models.Orm.QueryTable(new(models.TenantSiteSetting)).
+		Filter("tid", tid).
+		Filter("delete_time__isnull", true).
+		Limit(1).
+		All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取失败: "+err.Error())
+		return
+	}
+	if len(rows) > 0 {
+		r := rows[0]
+		out.Sitename = r.Sitename
+		out.Companyintroduction = r.Companyintroduction
+		out.Logo = r.Logo
+		out.Logow = r.Logow
+		out.Ico = r.Ico
+		out.Description = r.Description
+		out.Copyright = r.Copyright
+		out.Companyname = r.Companyname
+		out.Icp = r.Icp
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": out}
+	_ = c.ServeJSON()
+}
+
+type normalInfosPayload struct {
+	// 前端会传 tid（但我们仍优先使用 token 的 tenant_id）
+	Tid interface{} `json:"tid"`
+
+	Sitename            string `json:"sitename"`
+	Companyintroduction string `json:"companyintroduction"`
+	Logo                string `json:"logo"`
+	Logow               string `json:"logow"`
+	Ico                 string `json:"ico"`
+	Description         string `json:"description"`
+	Copyright           string `json:"copyright"`
+	Companyname         string `json:"companyname"`
+	Icp                 string `json:"icp"`
+}
+
+// SaveNormalInfos POST /backend/saveNormalInfos 或 /platform/saveNormalInfos
+func (c *PlatformSiteSettingsController) SaveNormalInfos() {
+	claims, err := c.claimsByPath()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	var p normalInfosPayload
+	if uerr := json.Unmarshal(raw, &p); uerr != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	tid := uint64(claims.TenantId)
+	if tid == 0 {
+		tid = parseUint64Flexible(p.Tid)
+	}
+	if tid == 0 {
+		c.jsonErr(400, 400, "tid不能为空")
+		return
+	}
+
+	sitename := strings.TrimSpace(p.Sitename)
+	if sitename == "" {
+		c.jsonErr(400, 400, "站点名称不能为空")
+		return
+	}
+
+	now := time.Now()
+
+	up := map[string]interface{}{
+		"tid":                 tid,
+		"sitename":            sitename,
+		"companyintroduction": strings.TrimSpace(p.Companyintroduction),
+		"logo":                strings.TrimSpace(p.Logo),
+		"logow":               strings.TrimSpace(p.Logow),
+		"ico":                 strings.TrimSpace(p.Ico),
+		"description":         strings.TrimSpace(p.Description),
+		"copyright":           strings.TrimSpace(p.Copyright),
+		"companyname":         strings.TrimSpace(p.Companyname),
+		"icp":                 strings.TrimSpace(p.Icp),
+		"update_time":         now,
+	}
+
+	cnt, err := models.Orm.QueryTable(new(models.TenantSiteSetting)).
+		Filter("tid", tid).
+		Filter("delete_time__isnull", true).
+		Count()
+	if err != nil {
+		c.jsonErr(500, 500, "保存失败: "+err.Error())
+		return
+	}
+
+	if cnt == 0 {
+		row := &models.TenantSiteSetting{
+			Tid:                 tid,
+			Sitename:            sitename,
+			Companyintroduction: strings.TrimSpace(p.Companyintroduction),
+			Logo:                strings.TrimSpace(p.Logo),
+			Logow:               strings.TrimSpace(p.Logow),
+			Ico:                 strings.TrimSpace(p.Ico),
+			Description:         strings.TrimSpace(p.Description),
+			Copyright:           strings.TrimSpace(p.Copyright),
+			Companyname:         strings.TrimSpace(p.Companyname),
+			Icp:                 strings.TrimSpace(p.Icp),
+			CreateTime:          now,
+			UpdateTime:          &now,
+		}
+		_, err = models.Orm.Insert(row)
+		if err != nil {
+			c.jsonErr(500, 500, "保存失败: "+err.Error())
+			return
+		}
+	} else {
+		_, err = models.Orm.QueryTable(new(models.TenantSiteSetting)).
+			Filter("tid", tid).
+			Filter("delete_time__isnull", true).
+			Update(up)
+		if err != nil {
+			c.jsonErr(500, 500, "保存失败: "+err.Error())
+			return
+		}
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/platform_sitereminder.go b/go/controllers/platform_sitereminder.go
index 9562f9d..dbcf970 100644
--- a/go/controllers/platform_sitereminder.go
+++ b/go/controllers/platform_sitereminder.go
@@ -1,367 +1,362 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-
-	"server/pkg/jwtutil"
-	"server/services"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type PlatformSiteReminderController struct {
-	beego.Controller
-}
-
-func (c *PlatformSiteReminderController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-// mergeReminderTargetIDs 合并多选目标ID与旧版单值入参。
-// 旧版：role → target_role_id，tenant → target_tenant_id；多选参数优先。
-func mergeReminderTargetIDs(targetType string, targetIDs []uint64, legacyRoleID, legacyTenantID uint64) []uint64 {
-	ids := make([]uint64, 0, len(targetIDs)+1)
-	for _, id := range targetIDs {
-		if id > 0 {
-			ids = append(ids, id)
-		}
-	}
-	if len(ids) == 0 {
-		switch targetType {
-		case "role":
-			if legacyRoleID > 0 {
-				ids = append(ids, legacyRoleID)
-			}
-		case "tenant":
-			if legacyTenantID > 0 {
-				ids = append(ids, legacyTenantID)
-			}
-		}
-	}
-	return ids
-}
-
-func (c *PlatformSiteReminderController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-// GetConfig GET /platform/sitereminder/config
-func (c *PlatformSiteReminderController) GetConfig() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	cfg, err := services.GetSiteReminderConfig()
-	if err != nil {
-		c.jsonErr(500, 500, "获取配置失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": cfg}
-	_ = c.ServeJSON()
-}
-
-// SaveConfig POST /platform/sitereminder/config
-func (c *PlatformSiteReminderController) SaveConfig() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		RetentionDays int  `json:"retention_days"`
-		AutoRead      int8 `json:"auto_read"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	if err := services.SaveSiteReminderConfig(p.RetentionDays, p.AutoRead); err != nil {
-		c.jsonErr(500, 500, "保存配置失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
-	_ = c.ServeJSON()
-}
-
-// Send POST /platform/sitereminder/send
-func (c *PlatformSiteReminderController) Send() {
-	claims, err := c.platformClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		Title          string   `json:"title"`
-		Content        string   `json:"content"`
-		TargetType     string   `json:"target_type"` // all, platform, tenant_all, tenant_role, tenant, tenant_user
-		TargetIDs      []uint64 `json:"target_ids"`
-		TargetRoleID   uint64   `json:"target_role_id"`   // 兼容旧入参
-		TargetTenantID uint64   `json:"target_tenant_id"` // 兼容旧入参
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	p.Title = strings.TrimSpace(p.Title)
-	p.Content = strings.TrimSpace(p.Content)
-	if p.Title == "" || p.Content == "" {
-		c.jsonErr(400, 400, "标题与内容不能为空")
-		return
-	}
-	if p.TargetType == "" {
-		c.jsonErr(400, 400, "发送目标类型不能为空")
-		return
-	}
-
-	targetIDs := mergeReminderTargetIDs(p.TargetType, p.TargetIDs, p.TargetRoleID, p.TargetTenantID)
-	err = services.SendSiteReminder(p.Title, p.Content, uint64(claims.UserID), "platform", p.TargetType, targetIDs)
-	if err != nil {
-		c.jsonErr(500, 500, "发送失败: "+err.Error())
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "发送成功"}
-	_ = c.ServeJSON()
-}
-
-// GetMyList GET /platform/sitereminder/myList
-func (c *PlatformSiteReminderController) GetMyList() {
-	claims, err := c.platformClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 10)
-	var isRead *int8
-	if isReadStr := c.GetString("isRead"); isReadStr != "" {
-		if val, err := strconv.Atoi(isReadStr); err == nil {
-			v := int8(val)
-			isRead = &v
-		}
-	}
-
-	list, total, err := services.ListReminders(uint64(claims.UserID), "platform", page, pageSize, isRead)
-	if err != nil {
-		c.jsonErr(500, 500, "获取消息列表失败: "+err.Error())
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"list":  list,
-			"total": total,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// MarkRead POST /platform/sitereminder/read
-func (c *PlatformSiteReminderController) MarkRead() {
-	claims, err := c.platformClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	err = services.MarkReminderRead(p.ID, uint64(claims.UserID), "platform")
-	if err != nil {
-		c.jsonErr(500, 500, "操作失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// MarkAllRead POST /platform/sitereminder/readall
-func (c *PlatformSiteReminderController) MarkAllRead() {
-	claims, err := c.platformClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	err = services.MarkAllRemindersRead(uint64(claims.UserID), "platform")
-	if err != nil {
-		c.jsonErr(500, 500, "操作失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// Delete POST /platform/sitereminder/delete
-func (c *PlatformSiteReminderController) Delete() {
-	claims, err := c.platformClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		ID uint64 `json:"id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	err = services.DeleteReminder(p.ID, uint64(claims.UserID), "platform")
-	if err != nil {
-		c.jsonErr(500, 500, "删除失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// GetSentList GET /platform/sitereminder/sentList
-func (c *PlatformSiteReminderController) GetSentList() {
-	claims, err := c.platformClaims()
-	if err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 10)
-
-	list, total, err := services.ListSentReminders(uint64(claims.UserID), page, pageSize)
-	if err != nil {
-		c.jsonErr(500, 500, "获取发送列表失败: "+err.Error())
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"list":  list,
-			"total": total,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// UpdateSent POST /platform/sitereminder/updateSent
-func (c *PlatformSiteReminderController) UpdateSent() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		BatchID        string   `json:"batch_id"`
-		Title          string   `json:"title"`
-		Content        string   `json:"content"`
-		TargetType     string   `json:"target_type"` // all, platform, tenant_all, tenant_role, tenant, tenant_user
-		TargetIDs      []uint64 `json:"target_ids"`
-		TargetRoleID   uint64   `json:"target_role_id"`   // 兼容旧入参
-		TargetTenantID uint64   `json:"target_tenant_id"` // 兼容旧入参
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	p.Title = strings.TrimSpace(p.Title)
-	p.Content = strings.TrimSpace(p.Content)
-	if p.BatchID == "" || p.Title == "" || p.Content == "" {
-		c.jsonErr(400, 400, "批次号、标题与内容不能为空")
-		return
-	}
-	if p.TargetType == "" {
-		c.jsonErr(400, 400, "发送目标类型不能为空")
-		return
-	}
-
-	targetIDs := mergeReminderTargetIDs(p.TargetType, p.TargetIDs, p.TargetRoleID, p.TargetTenantID)
-	err = services.UpdateSentReminder(p.BatchID, p.Title, p.Content, p.TargetType, targetIDs)
-	if err != nil {
-		c.jsonErr(500, 500, "修改失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "修改成功"}
-	_ = c.ServeJSON()
-}
-
-// DeleteSentBatch POST /platform/sitereminder/deleteSent
-func (c *PlatformSiteReminderController) DeleteSentBatch() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p struct {
-		BatchID string `json:"batch_id"`
-	}
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	if p.BatchID == "" {
-		c.jsonErr(400, 400, "批次号不能为空")
-		return
-	}
-
-	err = services.DeleteSentReminderBatch(p.BatchID)
-	if err != nil {
-		c.jsonErr(500, 500, "删除失败: "+err.Error())
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"io"
+	"strconv"
+	"strings"
+
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+	"server/services"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+type PlatformSiteReminderController struct {
+	beego.Controller
+}
+
+func (c *PlatformSiteReminderController) platformClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+// mergeReminderTargetIDs 合并多选目标ID与旧版单值入参。
+// 旧版：role → target_role_id，tenant → target_tenant_id；多选参数优先。
+func mergeReminderTargetIDs(targetType string, targetIDs []uint64, legacyRoleID, legacyTenantID uint64) []uint64 {
+	ids := make([]uint64, 0, len(targetIDs)+1)
+	for _, id := range targetIDs {
+		if id > 0 {
+			ids = append(ids, id)
+		}
+	}
+	if len(ids) == 0 {
+		switch targetType {
+		case "role":
+			if legacyRoleID > 0 {
+				ids = append(ids, legacyRoleID)
+			}
+		case "tenant":
+			if legacyTenantID > 0 {
+				ids = append(ids, legacyTenantID)
+			}
+		}
+	}
+	return ids
+}
+
+func (c *PlatformSiteReminderController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// GetConfig GET /platform/sitereminder/config
+func (c *PlatformSiteReminderController) GetConfig() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	cfg, err := services.GetSiteReminderConfig()
+	if err != nil {
+		c.jsonErr(500, 500, "获取配置失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "data": cfg}
+	_ = c.ServeJSON()
+}
+
+// SaveConfig POST /platform/sitereminder/config
+func (c *PlatformSiteReminderController) SaveConfig() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		RetentionDays int  `json:"retention_days"`
+		AutoRead      int8 `json:"auto_read"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	if err := services.SaveSiteReminderConfig(p.RetentionDays, p.AutoRead); err != nil {
+		c.jsonErr(500, 500, "保存配置失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "保存成功"}
+	_ = c.ServeJSON()
+}
+
+// Send POST /platform/sitereminder/send
+func (c *PlatformSiteReminderController) Send() {
+	claims, err := c.platformClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		Title          string   `json:"title"`
+		Content        string   `json:"content"`
+		TargetType     string   `json:"target_type"` // all, platform, tenant_all, tenant_role, tenant, tenant_user
+		TargetIDs      []uint64 `json:"target_ids"`
+		TargetRoleID   uint64   `json:"target_role_id"`   // 兼容旧入参
+		TargetTenantID uint64   `json:"target_tenant_id"` // 兼容旧入参
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	p.Title = strings.TrimSpace(p.Title)
+	p.Content = strings.TrimSpace(p.Content)
+	if p.Title == "" || p.Content == "" {
+		c.jsonErr(400, 400, "标题与内容不能为空")
+		return
+	}
+	if p.TargetType == "" {
+		c.jsonErr(400, 400, "发送目标类型不能为空")
+		return
+	}
+
+	targetIDs := mergeReminderTargetIDs(p.TargetType, p.TargetIDs, p.TargetRoleID, p.TargetTenantID)
+	err = services.SendSiteReminder(p.Title, p.Content, uint64(claims.UserID), "platform", p.TargetType, targetIDs)
+	if err != nil {
+		c.jsonErr(500, 500, "发送失败: "+err.Error())
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "发送成功"}
+	_ = c.ServeJSON()
+}
+
+// GetMyList GET /platform/sitereminder/myList
+func (c *PlatformSiteReminderController) GetMyList() {
+	claims, err := c.platformClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 10)
+	var isRead *int8
+	if isReadStr := c.GetString("isRead"); isReadStr != "" {
+		if val, err := strconv.Atoi(isReadStr); err == nil {
+			v := int8(val)
+			isRead = &v
+		}
+	}
+
+	list, total, err := services.ListReminders(uint64(claims.UserID), "platform", page, pageSize, isRead)
+	if err != nil {
+		c.jsonErr(500, 500, "获取消息列表失败: "+err.Error())
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"list":  list,
+			"total": total,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// MarkRead POST /platform/sitereminder/read
+func (c *PlatformSiteReminderController) MarkRead() {
+	claims, err := c.platformClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	err = services.MarkReminderRead(p.ID, uint64(claims.UserID), "platform")
+	if err != nil {
+		c.jsonErr(500, 500, "操作失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// MarkAllRead POST /platform/sitereminder/readall
+func (c *PlatformSiteReminderController) MarkAllRead() {
+	claims, err := c.platformClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	err = services.MarkAllRemindersRead(uint64(claims.UserID), "platform")
+	if err != nil {
+		c.jsonErr(500, 500, "操作失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// Delete POST /platform/sitereminder/delete
+func (c *PlatformSiteReminderController) Delete() {
+	claims, err := c.platformClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		ID uint64 `json:"id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	err = services.DeleteReminder(p.ID, uint64(claims.UserID), "platform")
+	if err != nil {
+		c.jsonErr(500, 500, "删除失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// GetSentList GET /platform/sitereminder/sentList
+func (c *PlatformSiteReminderController) GetSentList() {
+	claims, err := c.platformClaims()
+	if err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 10)
+
+	list, total, err := services.ListSentReminders(uint64(claims.UserID), page, pageSize)
+	if err != nil {
+		c.jsonErr(500, 500, "获取发送列表失败: "+err.Error())
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"list":  list,
+			"total": total,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// UpdateSent POST /platform/sitereminder/updateSent
+func (c *PlatformSiteReminderController) UpdateSent() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		BatchID        string   `json:"batch_id"`
+		Title          string   `json:"title"`
+		Content        string   `json:"content"`
+		TargetType     string   `json:"target_type"` // all, platform, tenant_all, tenant_role, tenant, tenant_user
+		TargetIDs      []uint64 `json:"target_ids"`
+		TargetRoleID   uint64   `json:"target_role_id"`   // 兼容旧入参
+		TargetTenantID uint64   `json:"target_tenant_id"` // 兼容旧入参
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	p.Title = strings.TrimSpace(p.Title)
+	p.Content = strings.TrimSpace(p.Content)
+	if p.BatchID == "" || p.Title == "" || p.Content == "" {
+		c.jsonErr(400, 400, "批次号、标题与内容不能为空")
+		return
+	}
+	if p.TargetType == "" {
+		c.jsonErr(400, 400, "发送目标类型不能为空")
+		return
+	}
+
+	targetIDs := mergeReminderTargetIDs(p.TargetType, p.TargetIDs, p.TargetRoleID, p.TargetTenantID)
+	err = services.UpdateSentReminder(p.BatchID, p.Title, p.Content, p.TargetType, targetIDs)
+	if err != nil {
+		c.jsonErr(500, 500, "修改失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "修改成功"}
+	_ = c.ServeJSON()
+}
+
+// DeleteSentBatch POST /platform/sitereminder/deleteSent
+func (c *PlatformSiteReminderController) DeleteSentBatch() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p struct {
+		BatchID string `json:"batch_id"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	if p.BatchID == "" {
+		c.jsonErr(400, 400, "批次号不能为空")
+		return
+	}
+
+	err = services.DeleteSentReminderBatch(p.BatchID)
+	if err != nil {
+		c.jsonErr(500, 500, "删除失败: "+err.Error())
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "删除成功"}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/platform_sms.go b/go/controllers/platform_sms.go
index 41eb2af..444cd3a 100644
--- a/go/controllers/platform_sms.go
+++ b/go/controllers/platform_sms.go
@@ -1,498 +1,488 @@
-package controllers
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/pkg/jwtutil"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// PlatformSMSController 短信配置（yz_system_sms），兼容旧前端 /platform/sms/* 接口
-type PlatformSMSController struct {
-	beego.Controller
-}
-
-func (c *PlatformSMSController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
-}
-
-func (c *PlatformSMSController) jsonErr(httpStatus, bizCode int, msg string) {
-	c.Ctx.Output.SetStatus(httpStatus)
-	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
-	_ = c.ServeJSON()
-}
-
-// GetSmsInfo GET /platform/sms/info
-// 返回 data[0]，字段兼容 backend_url/api_key 与 backendUrl/apiKey（沿用旧前端）
-func (c *PlatformSMSController) GetSmsInfo() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	backendURL := models.GetPlatformSettingValue("sms_custom_url", "")
-	apiKey := models.GetPlatformSettingValue("sms_custom_key", "")
-
-	data := []map[string]interface{}{{
-		"backend_url": backendURL,
-		"api_key":     apiKey,
-		"backendUrl":  backendURL,
-		"apiKey":      apiKey,
-	}}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "获取成功", "data": data}
-	_ = c.ServeJSON()
-}
-
-type smsEditPayload struct {
-	BackendUrl string `json:"backendUrl"`
-	BackendURL string `json:"backend_url"`
-	ApiKey     string `json:"apiKey"`
-	APIKey     string `json:"api_key"`
-}
-
-// EditSmsInfo POST /platform/sms/editinfo
-// 将旧前端的 backendUrl/apiKey 落到 yz_platform_normal_setting 表中
-func (c *PlatformSMSController) EditSmsInfo() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p smsEditPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	backendURL := strings.TrimSpace(p.BackendUrl)
-	if backendURL == "" {
-		backendURL = strings.TrimSpace(p.BackendURL)
-	}
-	apiKey := strings.TrimSpace(p.ApiKey)
-	if apiKey == "" {
-		apiKey = strings.TrimSpace(p.APIKey)
-	}
-	if backendURL == "" {
-		c.jsonErr(400, 400, "请输入短信网关地址")
-		return
-	}
-	if apiKey == "" {
-		c.jsonErr(400, 400, "请输入API KEY")
-		return
-	}
-
-	settings := []struct {
-		code   string
-		name   string
-		value  string
-		remark string
-	}{
-		{"sms_custom_url", "自定义短信网关地址", backendURL, ""},
-		{"sms_custom_key", "自定义短信API KEY", apiKey, ""},
-	}
-
-	for _, item := range settings {
-		var setting models.PlatformNormalSetting
-		err := models.Orm.QueryTable(new(models.PlatformNormalSetting)).
-			Filter("code", item.code).
-			Filter("delete_time__isnull", true).
-			One(&setting)
-		if err == nil {
-			setting.Value = item.value
-			setting.Name = item.name
-			setting.Remark = item.remark
-			now := time.Now()
-			setting.UpdateTime = &now
-			_, err = models.Orm.Update(&setting, "Value", "Name", "Remark", "UpdateTime")
-			if err != nil {
-				c.jsonErr(500, 500, "保存失败: "+err.Error())
-				return
-			}
-		} else {
-			newSetting := models.PlatformNormalSetting{
-				Name:       item.name,
-				Code:       item.code,
-				Value:      item.value,
-				Remark:     item.remark,
-				CreateTime: time.Now(),
-			}
-			_, err = models.Orm.Insert(&newSetting)
-			if err != nil {
-				c.jsonErr(500, 500, "保存失败: "+err.Error())
-				return
-			}
-		}
-	}
-
-	updated := []map[string]interface{}{{
-		"backend_url": backendURL,
-		"api_key":     apiKey,
-	}}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "更新成功", "data": updated}
-	_ = c.ServeJSON()
-}
-
-type smsTestPayload struct {
-	BackendUrl string  `json:"backendUrl"`
-	BackendURL string  `json:"backend_url"`
-	ApiKey     string  `json:"apiKey"`
-	APIKey     string  `json:"api_key"`
-	Tid        *uint64 `json:"tid"`
-	Phone      string  `json:"phone"`
-	Content    string  `json:"content"`
-}
-
-// SendTestSms POST /platform/sms/sendtest
-// 调用短信网关入队接口：{backendUrl}/api/v1/business/outbound-tasks，header: X-Api-Key
-func (c *PlatformSMSController) SendTestSms() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p smsTestPayload
-	if err := json.Unmarshal(raw, &p); err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-
-	phone := strings.TrimSpace(p.Phone)
-	if phone == "" {
-		c.jsonErr(400, 400, "缺少测试手机号")
-		return
-	}
-	if !strings.HasPrefix(phone, "+") {
-		c.jsonErr(400, 400, "请使用国际格式手机号（以 + 开头，后为数字）")
-		return
-	}
-	for _, ch := range phone[1:] {
-		if ch < '0' || ch > '9' {
-			c.jsonErr(400, 400, "请使用国际格式手机号（以 + 开头，后为数字）")
-			return
-		}
-	}
-
-	backendURL := strings.TrimSpace(p.BackendUrl)
-	if backendURL == "" {
-		backendURL = strings.TrimSpace(p.BackendURL)
-	}
-	apiKey := strings.TrimSpace(p.ApiKey)
-	if apiKey == "" {
-		apiKey = strings.TrimSpace(p.APIKey)
-	}
-
-	// 兜底：body 未带时从默认配置取
-	if backendURL == "" || apiKey == "" {
-		if backendURL == "" {
-			backendURL = models.GetPlatformSettingValue("sms_custom_url", "")
-		}
-		if apiKey == "" {
-			apiKey = models.GetPlatformSettingValue("sms_custom_key", "")
-		}
-	}
-	if backendURL == "" {
-		c.jsonErr(400, 400, "请先配置短信网关地址 backendUrl")
-		return
-	}
-	if apiKey == "" {
-		c.jsonErr(400, 400, "请先配置短信网关 API KEY")
-		return
-	}
-
-	content := strings.TrimSpace(p.Content)
-	code := randomDigits6()
-	if content == "" {
-		content = "短信测试验证码：" + code
-	}
-
-	enqueueURL := strings.TrimRight(backendURL, "/") + "/api/v1/business/outbound-tasks"
-	payload := map[string]interface{}{
-		"phone":   phone,
-		"content": content,
-	}
-	bs, _ := json.Marshal(payload)
-
-	client := &http.Client{Timeout: 10 * time.Second}
-	req, err := http.NewRequest("POST", enqueueURL, bytes.NewReader(bs))
-	if err != nil {
-		c.jsonErr(500, 500, "创建请求失败: "+err.Error())
-		return
-	}
-	req.Header.Set("X-Api-Key", apiKey)
-	req.Header.Set("Content-Type", "application/json; charset=utf-8")
-	req.Header.Set("Accept", "application/json")
-
-	resp, err := client.Do(req)
-	if err != nil {
-		c.jsonErr(500, 500, "短信网关入队失败: "+err.Error())
-		return
-	}
-	defer resp.Body.Close()
-	body, _ := io.ReadAll(resp.Body)
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		msg := strings.TrimSpace(string(body))
-		if msg == "" {
-			msg = resp.Status
-		}
-		c.jsonErr(500, 500, "短信网关入队失败: "+msg)
-		return
-	}
-
-	bodyStr := string(body)
-	report := strings.TrimSpace(bodyStr)
-	var reportPtr *string
-	if report != "" {
-		reportPtr = &bodyStr
-	}
-
-	// 网关 HTTP 2xx：平台侧视为「已受理并成功提交」；与前端 tasklist 中 status=3「发送成功」对齐
-	taskStatus := 3
-
-	// 若网关返回 JSON 且含通用状态字段，则优先映射（便于以后网关回传异步状态）
-	var gw map[string]interface{}
-	if json.Unmarshal(body, &gw) == nil {
-		if v, ok := gw["status"]; ok {
-			switch x := v.(type) {
-			case float64:
-				taskStatus = mapGatewayStatus(int(x))
-			case string:
-				if n, e := strconv.Atoi(strings.TrimSpace(x)); e == nil {
-					taskStatus = mapGatewayStatus(n)
-				}
-			}
-		}
-	}
-
-	// 写入本地任务表（用于前端列表/对账）
-	now := time.Now()
-	task := &models.SystemSMSTask{
-		Tid:        p.Tid, // 测试可为空
-		ApiKey:     apiKey,
-		Phone:      phone,
-		Content:    &content,
-		Status:     taskStatus,
-		Code:       code,
-		ReportRaw:  reportPtr,
-		CreateTime: &now,
-		UpdateTime: &now,
-	}
-	taskID, terr := models.Orm.Insert(task)
-	if terr != nil {
-		// 入队已成功，任务写库失败也不影响短信发送，只返回提示
-		c.Data["json"] = map[string]interface{}{
-			"code": 200,
-			"msg":  "短信测试任务入队成功（任务写库失败）",
-			"data": map[string]interface{}{
-				"taskId":      nil,
-				"code":        code,
-				"gatewayResp": json.RawMessage(body),
-			},
-		}
-		_ = c.ServeJSON()
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "短信测试任务入队成功",
-		"data": map[string]interface{}{
-			"taskId":      uint64(taskID),
-			"code":        code,
-			"gatewayResp": json.RawMessage(body),
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetSmsTaskList GET /platform/sms/taskList
-func (c *PlatformSMSController) GetSmsTaskList() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	statusStr := strings.TrimSpace(c.GetString("status"))
-	phoneKw := strings.TrimSpace(c.GetString("phone"))
-	tidStr := strings.TrimSpace(c.GetString("tid"))
-
-	qs := models.Orm.QueryTable(new(models.SystemSMSTask)).Filter("delete_time__isnull", true)
-	if statusStr != "" {
-		if st, err := strconv.Atoi(statusStr); err == nil {
-			qs = qs.Filter("status", st)
-		}
-	}
-	if phoneKw != "" {
-		qs = qs.Filter("phone__icontains", phoneKw)
-	}
-	if tidStr != "" {
-		if tid, err := strconv.ParseUint(tidStr, 10, 64); err == nil && tid > 0 {
-			qs = qs.Filter("tid", tid)
-		}
-	}
-
-	var rows []models.SystemSMSTask
-	_, err := qs.OrderBy("-id").All(&rows)
-	if err != nil {
-		c.jsonErr(500, 500, "获取短信任务列表失败: "+err.Error())
-		return
-	}
-
-	list := make([]map[string]interface{}, 0, len(rows))
-	for i := range rows {
-		item := map[string]interface{}{
-			"id":          rows[i].ID,
-			"api_key":     rows[i].ApiKey,
-			"phone":       rows[i].Phone,
-			"content":     "",
-			"status":      rows[i].Status,
-			"code":        rows[i].Code,
-			"report_raw":  rows[i].ReportRaw,
-			"create_time": "",
-			"update_time": "",
-		}
-		if rows[i].Tid != nil {
-			item["tid"] = *rows[i].Tid
-		}
-		if rows[i].Content != nil {
-			item["content"] = *rows[i].Content
-		}
-		if rows[i].CreateTime != nil {
-			item["create_time"] = rows[i].CreateTime.Format("2006-01-02 15:04:05")
-		}
-		if rows[i].UpdateTime != nil {
-			item["update_time"] = rows[i].UpdateTime.Format("2006-01-02 15:04:05")
-		}
-		list = append(list, item)
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "list": list}
-	_ = c.ServeJSON()
-}
-
-// EditSmsTask POST /platform/sms/taskEdit/:id
-func (c *PlatformSMSController) EditSmsTask() {
-	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
-		return
-	}
-
-	idStr := c.Ctx.Input.Param(":id")
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil || id == 0 {
-		c.jsonErr(400, 400, "无效ID")
-		return
-	}
-	raw, err := io.ReadAll(c.Ctx.Request.Body)
-	if err != nil {
-		c.jsonErr(400, 400, "参数错误")
-		return
-	}
-	var p map[string]interface{}
-	_ = json.Unmarshal(raw, &p)
-
-	up := map[string]interface{}{}
-	if v, ok := p["status"]; ok {
-		switch x := v.(type) {
-		case float64:
-			up["status"] = int(x)
-		case string:
-			if n, e := strconv.Atoi(strings.TrimSpace(x)); e == nil {
-				up["status"] = n
-			}
-		}
-	}
-	if v, ok := p["report_raw"]; ok {
-		if s, ok := v.(string); ok {
-			up["report_raw"] = s
-		}
-	}
-	if v, ok := p["content"]; ok {
-		if s, ok := v.(string); ok {
-			up["content"] = s
-		}
-	}
-	if len(up) == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-		_ = c.ServeJSON()
-		return
-	}
-	now := time.Now()
-	up["update_time"] = now
-	n, err := models.Orm.QueryTable(new(models.SystemSMSTask)).Filter("id", id).Update(up)
-	if err != nil {
-		c.jsonErr(500, 500, "更新失败: "+err.Error())
-		return
-	}
-	if n == 0 {
-		c.jsonErr(404, 404, "记录不存在")
-		return
-	}
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-func randomDigits6() string {
-	// 生成 6 位数字字符串
-	b := make([]byte, 4)
-	if _, err := rand.Read(b); err != nil {
-		return "123456"
-	}
-	n := int(b[0])<<24 | int(b[1])<<16 | int(b[2])<<8 | int(b[3])
-	if n < 0 {
-		n = -n
-	}
-	code := n%900000 + 100000
-	return strconv.Itoa(code)
-}
-
-// mapGatewayStatus 将网关侧 status 粗略映射到前端列表：0待发送 1发送中 2失败 3成功
-func mapGatewayStatus(st int) int {
-	switch st {
-	case 0:
-		return 0
-	case 1, 4, 5:
-		return 1
-	case 2, 6:
-		return 2
-	case 3:
-		return 3
-	default:
-		// 网关枚举未约定时：HTTP 已 2xx，按「已成功提交」显示为发送成功
-		return 3
-	}
-}
+package controllers
+
+import (
+	"bytes"
+	"crypto/rand"
+	"encoding/json"
+	"io"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/identity"
+	"server/pkg/jwtutil"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// PlatformSMSController 短信配置（yz_system_sms），兼容旧前端 /platform/sms/* 接口
+type PlatformSMSController struct {
+	beego.Controller
+}
+
+func (c *PlatformSMSController) platformClaims() (*jwtutil.Claims, error) {
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
+}
+
+func (c *PlatformSMSController) jsonErr(httpStatus, bizCode int, msg string) {
+	c.Ctx.Output.SetStatus(httpStatus)
+	c.Data["json"] = map[string]interface{}{"code": bizCode, "msg": msg}
+	_ = c.ServeJSON()
+}
+
+// GetSmsInfo GET /platform/sms/info
+// 返回 data[0]，字段兼容 backend_url/api_key 与 backendUrl/apiKey（沿用旧前端）
+func (c *PlatformSMSController) GetSmsInfo() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	backendURL := models.GetPlatformSettingValue("sms_custom_url", "")
+	apiKey := models.GetPlatformSettingValue("sms_custom_key", "")
+
+	data := []map[string]interface{}{{
+		"backend_url": backendURL,
+		"api_key":     apiKey,
+		"backendUrl":  backendURL,
+		"apiKey":      apiKey,
+	}}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "获取成功", "data": data}
+	_ = c.ServeJSON()
+}
+
+type smsEditPayload struct {
+	BackendUrl string `json:"backendUrl"`
+	BackendURL string `json:"backend_url"`
+	ApiKey     string `json:"apiKey"`
+	APIKey     string `json:"api_key"`
+}
+
+// EditSmsInfo POST /platform/sms/editinfo
+// 将旧前端的 backendUrl/apiKey 落到 yz_platform_normal_setting 表中
+func (c *PlatformSMSController) EditSmsInfo() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p smsEditPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	backendURL := strings.TrimSpace(p.BackendUrl)
+	if backendURL == "" {
+		backendURL = strings.TrimSpace(p.BackendURL)
+	}
+	apiKey := strings.TrimSpace(p.ApiKey)
+	if apiKey == "" {
+		apiKey = strings.TrimSpace(p.APIKey)
+	}
+	if backendURL == "" {
+		c.jsonErr(400, 400, "请输入短信网关地址")
+		return
+	}
+	if apiKey == "" {
+		c.jsonErr(400, 400, "请输入API KEY")
+		return
+	}
+
+	settings := []struct {
+		code   string
+		name   string
+		value  string
+		remark string
+	}{
+		{"sms_custom_url", "自定义短信网关地址", backendURL, ""},
+		{"sms_custom_key", "自定义短信API KEY", apiKey, ""},
+	}
+
+	for _, item := range settings {
+		var setting models.PlatformNormalSetting
+		err := models.Orm.QueryTable(new(models.PlatformNormalSetting)).
+			Filter("code", item.code).
+			Filter("delete_time__isnull", true).
+			One(&setting)
+		if err == nil {
+			setting.Value = item.value
+			setting.Name = item.name
+			setting.Remark = item.remark
+			now := time.Now()
+			setting.UpdateTime = &now
+			_, err = models.Orm.Update(&setting, "Value", "Name", "Remark", "UpdateTime")
+			if err != nil {
+				c.jsonErr(500, 500, "保存失败: "+err.Error())
+				return
+			}
+		} else {
+			newSetting := models.PlatformNormalSetting{
+				Name:       item.name,
+				Code:       item.code,
+				Value:      item.value,
+				Remark:     item.remark,
+				CreateTime: time.Now(),
+			}
+			_, err = models.Orm.Insert(&newSetting)
+			if err != nil {
+				c.jsonErr(500, 500, "保存失败: "+err.Error())
+				return
+			}
+		}
+	}
+
+	updated := []map[string]interface{}{{
+		"backend_url": backendURL,
+		"api_key":     apiKey,
+	}}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "更新成功", "data": updated}
+	_ = c.ServeJSON()
+}
+
+type smsTestPayload struct {
+	BackendUrl string  `json:"backendUrl"`
+	BackendURL string  `json:"backend_url"`
+	ApiKey     string  `json:"apiKey"`
+	APIKey     string  `json:"api_key"`
+	Tid        *uint64 `json:"tid"`
+	Phone      string  `json:"phone"`
+	Content    string  `json:"content"`
+}
+
+// SendTestSms POST /platform/sms/sendtest
+// 调用短信网关入队接口：{backendUrl}/api/v1/business/outbound-tasks，header: X-Api-Key
+func (c *PlatformSMSController) SendTestSms() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p smsTestPayload
+	if err := json.Unmarshal(raw, &p); err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+
+	phone := strings.TrimSpace(p.Phone)
+	if phone == "" {
+		c.jsonErr(400, 400, "缺少测试手机号")
+		return
+	}
+	if !strings.HasPrefix(phone, "+") {
+		c.jsonErr(400, 400, "请使用国际格式手机号（以 + 开头，后为数字）")
+		return
+	}
+	for _, ch := range phone[1:] {
+		if ch < '0' || ch > '9' {
+			c.jsonErr(400, 400, "请使用国际格式手机号（以 + 开头，后为数字）")
+			return
+		}
+	}
+
+	backendURL := strings.TrimSpace(p.BackendUrl)
+	if backendURL == "" {
+		backendURL = strings.TrimSpace(p.BackendURL)
+	}
+	apiKey := strings.TrimSpace(p.ApiKey)
+	if apiKey == "" {
+		apiKey = strings.TrimSpace(p.APIKey)
+	}
+
+	// 兜底：body 未带时从默认配置取
+	if backendURL == "" || apiKey == "" {
+		if backendURL == "" {
+			backendURL = models.GetPlatformSettingValue("sms_custom_url", "")
+		}
+		if apiKey == "" {
+			apiKey = models.GetPlatformSettingValue("sms_custom_key", "")
+		}
+	}
+	if backendURL == "" {
+		c.jsonErr(400, 400, "请先配置短信网关地址 backendUrl")
+		return
+	}
+	if apiKey == "" {
+		c.jsonErr(400, 400, "请先配置短信网关 API KEY")
+		return
+	}
+
+	content := strings.TrimSpace(p.Content)
+	code := randomDigits6()
+	if content == "" {
+		content = "短信测试验证码：" + code
+	}
+
+	enqueueURL := strings.TrimRight(backendURL, "/") + "/api/v1/business/outbound-tasks"
+	payload := map[string]interface{}{
+		"phone":   phone,
+		"content": content,
+	}
+	bs, _ := json.Marshal(payload)
+
+	client := &http.Client{Timeout: 10 * time.Second}
+	req, err := http.NewRequest("POST", enqueueURL, bytes.NewReader(bs))
+	if err != nil {
+		c.jsonErr(500, 500, "创建请求失败: "+err.Error())
+		return
+	}
+	req.Header.Set("X-Api-Key", apiKey)
+	req.Header.Set("Content-Type", "application/json; charset=utf-8")
+	req.Header.Set("Accept", "application/json")
+
+	resp, err := client.Do(req)
+	if err != nil {
+		c.jsonErr(500, 500, "短信网关入队失败: "+err.Error())
+		return
+	}
+	defer resp.Body.Close()
+	body, _ := io.ReadAll(resp.Body)
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		msg := strings.TrimSpace(string(body))
+		if msg == "" {
+			msg = resp.Status
+		}
+		c.jsonErr(500, 500, "短信网关入队失败: "+msg)
+		return
+	}
+
+	bodyStr := string(body)
+	report := strings.TrimSpace(bodyStr)
+	var reportPtr *string
+	if report != "" {
+		reportPtr = &bodyStr
+	}
+
+	// 网关 HTTP 2xx：平台侧视为「已受理并成功提交」；与前端 tasklist 中 status=3「发送成功」对齐
+	taskStatus := 3
+
+	// 若网关返回 JSON 且含通用状态字段，则优先映射（便于以后网关回传异步状态）
+	var gw map[string]interface{}
+	if json.Unmarshal(body, &gw) == nil {
+		if v, ok := gw["status"]; ok {
+			switch x := v.(type) {
+			case float64:
+				taskStatus = mapGatewayStatus(int(x))
+			case string:
+				if n, e := strconv.Atoi(strings.TrimSpace(x)); e == nil {
+					taskStatus = mapGatewayStatus(n)
+				}
+			}
+		}
+	}
+
+	// 写入本地任务表（用于前端列表/对账）
+	now := time.Now()
+	task := &models.SystemSMSTask{
+		Tid:        p.Tid, // 测试可为空
+		ApiKey:     apiKey,
+		Phone:      phone,
+		Content:    &content,
+		Status:     taskStatus,
+		Code:       code,
+		ReportRaw:  reportPtr,
+		CreateTime: &now,
+		UpdateTime: &now,
+	}
+	taskID, terr := models.Orm.Insert(task)
+	if terr != nil {
+		// 入队已成功，任务写库失败也不影响短信发送，只返回提示
+		c.Data["json"] = map[string]interface{}{
+			"code": 200,
+			"msg":  "短信测试任务入队成功（任务写库失败）",
+			"data": map[string]interface{}{
+				"taskId":      nil,
+				"code":        code,
+				"gatewayResp": json.RawMessage(body),
+			},
+		}
+		_ = c.ServeJSON()
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "短信测试任务入队成功",
+		"data": map[string]interface{}{
+			"taskId":      uint64(taskID),
+			"code":        code,
+			"gatewayResp": json.RawMessage(body),
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetSmsTaskList GET /platform/sms/taskList
+func (c *PlatformSMSController) GetSmsTaskList() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	statusStr := strings.TrimSpace(c.GetString("status"))
+	phoneKw := strings.TrimSpace(c.GetString("phone"))
+	tidStr := strings.TrimSpace(c.GetString("tid"))
+
+	qs := models.Orm.QueryTable(new(models.SystemSMSTask)).Filter("delete_time__isnull", true)
+	if statusStr != "" {
+		if st, err := strconv.Atoi(statusStr); err == nil {
+			qs = qs.Filter("status", st)
+		}
+	}
+	if phoneKw != "" {
+		qs = qs.Filter("phone__icontains", phoneKw)
+	}
+	if tidStr != "" {
+		if tid, err := strconv.ParseUint(tidStr, 10, 64); err == nil && tid > 0 {
+			qs = qs.Filter("tid", tid)
+		}
+	}
+
+	var rows []models.SystemSMSTask
+	_, err := qs.OrderBy("-id").All(&rows)
+	if err != nil {
+		c.jsonErr(500, 500, "获取短信任务列表失败: "+err.Error())
+		return
+	}
+
+	list := make([]map[string]interface{}, 0, len(rows))
+	for i := range rows {
+		item := map[string]interface{}{
+			"id":          rows[i].ID,
+			"api_key":     rows[i].ApiKey,
+			"phone":       rows[i].Phone,
+			"content":     "",
+			"status":      rows[i].Status,
+			"code":        rows[i].Code,
+			"report_raw":  rows[i].ReportRaw,
+			"create_time": "",
+			"update_time": "",
+		}
+		if rows[i].Tid != nil {
+			item["tid"] = *rows[i].Tid
+		}
+		if rows[i].Content != nil {
+			item["content"] = *rows[i].Content
+		}
+		if rows[i].CreateTime != nil {
+			item["create_time"] = rows[i].CreateTime.Format("2006-01-02 15:04:05")
+		}
+		if rows[i].UpdateTime != nil {
+			item["update_time"] = rows[i].UpdateTime.Format("2006-01-02 15:04:05")
+		}
+		list = append(list, item)
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success", "list": list}
+	_ = c.ServeJSON()
+}
+
+// EditSmsTask POST /platform/sms/taskEdit/:id
+func (c *PlatformSMSController) EditSmsTask() {
+	if _, err := c.platformClaims(); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return
+	}
+
+	idStr := c.Ctx.Input.Param(":id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil || id == 0 {
+		c.jsonErr(400, 400, "无效ID")
+		return
+	}
+	raw, err := io.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.jsonErr(400, 400, "参数错误")
+		return
+	}
+	var p map[string]interface{}
+	_ = json.Unmarshal(raw, &p)
+
+	up := map[string]interface{}{}
+	if v, ok := p["status"]; ok {
+		switch x := v.(type) {
+		case float64:
+			up["status"] = int(x)
+		case string:
+			if n, e := strconv.Atoi(strings.TrimSpace(x)); e == nil {
+				up["status"] = n
+			}
+		}
+	}
+	if v, ok := p["report_raw"]; ok {
+		if s, ok := v.(string); ok {
+			up["report_raw"] = s
+		}
+	}
+	if v, ok := p["content"]; ok {
+		if s, ok := v.(string); ok {
+			up["content"] = s
+		}
+	}
+	if len(up) == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+		_ = c.ServeJSON()
+		return
+	}
+	now := time.Now()
+	up["update_time"] = now
+	n, err := models.Orm.QueryTable(new(models.SystemSMSTask)).Filter("id", id).Update(up)
+	if err != nil {
+		c.jsonErr(500, 500, "更新失败: "+err.Error())
+		return
+	}
+	if n == 0 {
+		c.jsonErr(404, 404, "记录不存在")
+		return
+	}
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+func randomDigits6() string {
+	// 生成 6 位数字字符串
+	b := make([]byte, 4)
+	if _, err := rand.Read(b); err != nil {
+		return "123456"
+	}
+	n := int(b[0])<<24 | int(b[1])<<16 | int(b[2])<<8 | int(b[3])
+	if n < 0 {
+		n = -n
+	}
+	code := n%900000 + 100000
+	return strconv.Itoa(code)
+}
+
+// mapGatewayStatus 将网关侧 status 粗略映射到前端列表：0待发送 1发送中 2失败 3成功
+func mapGatewayStatus(st int) int {
+	switch st {
+	case 0:
+		return 0
+	case 1, 4, 5:
+		return 1
+	case 2, 6:
+		return 2
+	case 3:
+		return 3
+	default:
+		// 网关枚举未约定时：HTTP 已 2xx，按「已成功提交」显示为发送成功
+		return 3
+	}
+}
diff --git a/go/controllers/platform_software_upgrade.go b/go/controllers/platform_software_upgrade.go
index e2dc9ec..c3d0977 100644
--- a/go/controllers/platform_software_upgrade.go
+++ b/go/controllers/platform_software_upgrade.go
@@ -2,13 +2,13 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -21,22 +21,7 @@ type PlatformSoftwareUpgradeController struct {
 }
 
 func (c *PlatformSoftwareUpgradeController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformSoftwareUpgradeController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -101,7 +86,8 @@ func (c *PlatformSoftwareUpgradeController) rowToMap(row *models.SystemSoftwareU
 // List GET /platform/softwareupgrade/list
 func (c *PlatformSoftwareUpgradeController) List() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -140,7 +126,8 @@ func (c *PlatformSoftwareUpgradeController) List() {
 // Detail GET /platform/softwareupgrade/:id
 func (c *PlatformSoftwareUpgradeController) Detail() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -176,7 +163,8 @@ type softwareUpgradePayload struct {
 // Create POST /platform/softwareupgrade
 func (c *PlatformSoftwareUpgradeController) Create() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	body, _ := io.ReadAll(c.Ctx.Request.Body)
@@ -239,7 +227,8 @@ func (c *PlatformSoftwareUpgradeController) Create() {
 // Update POST /platform/softwareupgrade/:id
 func (c *PlatformSoftwareUpgradeController) Update() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -324,7 +313,8 @@ func (c *PlatformSoftwareUpgradeController) Update() {
 // Delete DELETE /platform/softwareupgrade/:id
 func (c *PlatformSoftwareUpgradeController) Delete() {
 	if _, err := c.platformClaims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/platform_template.go b/go/controllers/platform_template.go
index 49319b8..fc0736f 100644
--- a/go/controllers/platform_template.go
+++ b/go/controllers/platform_template.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/tagengine"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -90,7 +91,8 @@ func cmsTemplateToMap(row models.CmsFrontendTemplate) map[string]interface{} {
 // Index GET /platform/template/index 模板列表（DB 登记）
 func (c *PlatformTemplateController) Index() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -136,7 +138,8 @@ func cmsScanThemeDirs() []string {
 // Scan POST /platform/template/scan 扫描 themes/ 目录，新目录自动登记入库
 func (c *PlatformTemplateController) Scan() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -180,7 +183,8 @@ func (c *PlatformTemplateController) Scan() {
 // Upload POST /platform/template/upload 上传模板 zip（解压到 themes/{code}/）
 func (c *PlatformTemplateController) Upload() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -348,7 +352,8 @@ func cmsUnzipTemplate(zipPath, destDir string) error {
 // Files GET /platform/template/files/:code 列出模板目录下可编辑文件
 func (c *PlatformTemplateController) Files() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	code := c.GetString(":code")
@@ -389,7 +394,8 @@ func (c *PlatformTemplateController) Files() {
 // ReadFile GET /platform/template/file?code=&path= 读取模板文件内容
 func (c *PlatformTemplateController) ReadFile() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	code := strings.TrimSpace(c.GetString("code"))
@@ -421,7 +427,8 @@ func (c *PlatformTemplateController) ReadFile() {
 // SaveFile POST /platform/template/file/save 保存模板文件（路径校验防穿越）
 func (c *PlatformTemplateController) SaveFile() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -470,7 +477,8 @@ func (c *PlatformTemplateController) SaveFile() {
 // Status POST /platform/template/status 启用/停用模板
 func (c *PlatformTemplateController) Status() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -513,7 +521,8 @@ func (c *PlatformTemplateController) Status() {
 // Delete POST /platform/template/delete/:id 删除登记（可选同时删除磁盘目录）
 func (c *PlatformTemplateController) Delete() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, _ := c.GetUint64(":id")
@@ -563,7 +572,8 @@ func (c *PlatformTemplateController) Delete() {
 // Tags GET /platform/template/tags 标签调用说明数据（由引擎注册表元信息生成）
 func (c *PlatformTemplateController) Tags() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/platform_tenant.go b/go/controllers/platform_tenant.go
index d6c6432..876b632 100644
--- a/go/controllers/platform_tenant.go
+++ b/go/controllers/platform_tenant.go
@@ -1,597 +1,597 @@
-package controllers
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-	"strconv"
-	"strings"
-	"time"
-
-	"server/models"
-	"server/services"
-	authsvc "server/services/auth"
-
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// PlatformTenantController 平台端租户管ç?
-type PlatformTenantController struct {
-	beego.Controller
-}
-
-type tenantDTO struct {
-	ID            uint64 `json:"id"`
-	TenantCode    string `json:"tenant_code"`
-	TenantName    string `json:"tenant_name"`
-	ContactPerson string `json:"contact_person"`
-	ContactPhone  string `json:"contact_phone"`
-	ContactEmail  string `json:"contact_email"`
-	Address       string `json:"address"`
-	Worktime      string `json:"worktime"`
-	Status        int8   `json:"status"`
-	// 套餐与用户数配额
-	PackageID   uint64 `json:"package_id"`
-	PackageName string `json:"package_name"`
-	// PackageExpireTime 套餐计费到期时间（NULL-永久有效）；DaysRemaining 剩余天数
-	PackageExpireTime *time.Time `json:"package_expire_time"`
-	DaysRemaining     int        `json:"days_remaining"`
-	UserQuota         int        `json:"user_quota"`
-	UserUsed          int        `json:"user_used"`
-	Remark            string     `json:"remark"`
-	CreateTime        *time.Time `json:"create_time,omitempty"`
-	UpdateTime        *time.Time `json:"update_time,omitempty"`
-	DeleteTime        *time.Time `json:"delete_time,omitempty"`
-}
-
-// tenantPackageNameMap 套餐ID -> 套餐名称
-func tenantPackageNameMap() map[uint64]string {
-	result := map[uint64]string{}
-	var rows []models.SystemTenantPackage
-	if _, err := models.Orm.QueryTable(new(models.SystemTenantPackage)).
-		Filter("delete_time__isnull", true).
-		All(&rows, "ID", "Name"); err == nil {
-		for _, r := range rows {
-			result[r.ID] = r.Name
-		}
-	}
-	return result
-}
-
-// tenantUserCountMap 租户ID -> 有效用户数
-func tenantUserCountMap() map[uint64]int {
-	result := map[uint64]int{}
-	var rows []models.SystemTenantUser
-	if _, err := models.Orm.QueryTable(new(models.SystemTenantUser)).
-		Filter("delete_time__isnull", true).
-		All(&rows, "ID", "Tid"); err == nil {
-		for _, r := range rows {
-			result[r.Tid]++
-		}
-	}
-	return result
-}
-
-func stringValue(s *string) string {
-	if s == nil {
-		return ""
-	}
-	return *s
-}
-
-func stringPtr(s string) *string {
-	return &s
-}
-
-func toTenantDTO(t models.SystemTenant) tenantDTO {
-	ct := t.CreateTime
-	ut := t.UpdateTime
-	daysRemaining := 0
-	if t.PackageExpireTime != nil {
-		daysRemaining = int(math.Ceil(time.Until(*t.PackageExpireTime).Hours() / 24))
-		if daysRemaining < 0 {
-			daysRemaining = 0
-		}
-	}
-	return tenantDTO{
-		ID:                t.ID,
-		TenantCode:        t.TenantCode,
-		TenantName:        t.TenantName,
-		ContactPerson:     stringValue(t.ContactPerson),
-		ContactPhone:      stringValue(t.ContactPhone),
-		ContactEmail:      stringValue(t.ContactEmail),
-		Address:           stringValue(t.Address),
-		Worktime:          stringValue(t.Worktime),
-		Status:            t.Status,
-		PackageID:         t.PackageID,
-		PackageExpireTime: t.PackageExpireTime,
-		DaysRemaining:     daysRemaining,
-		UserQuota:         t.UserQuota,
-		Remark:            stringValue(t.Remark),
-		CreateTime:        &ct,
-		UpdateTime:        &ut,
-		DeleteTime:        t.DeleteTime,
-	}
-}
-
-// GetTenant 获取租户列表
-// GET /platform/tenant/getTenant?page=1&pageSize=10&tenant_name=...&tenant_code=...&contact_person=...&contact_phone=...
-func (c *PlatformTenantController) GetTenant() {
-	page, _ := c.GetInt("page", 1)
-	pageSize, _ := c.GetInt("pageSize", 10)
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 {
-		pageSize = 10
-	}
-
-	tenantName := strings.TrimSpace(c.GetString("tenant_name"))
-	tenantCode := strings.TrimSpace(c.GetString("tenant_code"))
-	contactPerson := strings.TrimSpace(c.GetString("contact_person"))
-	contactPhone := strings.TrimSpace(c.GetString("contact_phone"))
-
-	qs := models.Orm.QueryTable(new(models.SystemTenant))
-	if tenantName != "" {
-		qs = qs.Filter("tenant_name__icontains", tenantName)
-	}
-	if tenantCode != "" {
-		qs = qs.Filter("tenant_code__icontains", tenantCode)
-	}
-	if contactPerson != "" {
-		qs = qs.Filter("contact_person__icontains", contactPerson)
-	}
-	if contactPhone != "" {
-		qs = qs.Filter("contact_phone__icontains", contactPhone)
-	}
-
-	total, err := qs.Count()
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取租户失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-
-	var rows []models.SystemTenant
-	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取租户失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-
-	packageNames := tenantPackageNameMap()
-	userCounts := tenantUserCountMap()
-	list := make([]tenantDTO, 0, len(rows))
-	for _, t := range rows {
-		dto := toTenantDTO(t)
-		dto.PackageName = packageNames[t.PackageID]
-		dto.UserUsed = userCounts[t.ID]
-		list = append(list, dto)
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": map[string]interface{}{
-			"list":  list,
-			"total": total,
-		},
-	}
-	_ = c.ServeJSON()
-}
-
-// GetTenantDetail 获取租户详ćƒ
-// GET /platform/tenant/getTenantDetail/:id
-func (c *PlatformTenantController) GetTenantDetail() {
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效ID"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	var t models.SystemTenant
-	err = models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", id).One(&t)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "租户不存在"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	dto := toTenantDTO(t)
-	if pkg, err := services.GetTenantPackage(t.ID); err == nil && pkg != nil {
-		if pkg.ID != t.PackageID {
-			// 套餐已因到期自动降级，原到期时间不再有效
-			dto.PackageExpireTime = nil
-			dto.DaysRemaining = 0
-		}
-		dto.PackageID = pkg.ID
-		dto.PackageName = pkg.Name
-	}
-	if used, err := services.CountTenantUsers(t.ID); err == nil {
-		dto.UserUsed = used
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  "success",
-		"data": dto,
-	}
-	_ = c.ServeJSON()
-}
-
-type tenantPayload struct {
-	TenantCode    string `json:"tenant_code"`
-	TenantName    string `json:"tenant_name"`
-	ContactPerson string `json:"contact_person"`
-	ContactPhone  string `json:"contact_phone"`
-	ContactEmail  string `json:"contact_email"`
-	Address       string `json:"address"`
-	Worktime      string `json:"worktime"`
-	Status        *int8  `json:"status"`
-	// 套餐与用户数上限（可选）
-	PackageID *uint64 `json:"package_id"`
-	UserQuota *int    `json:"user_quota"`
-	Remark    string  `json:"remark"`
-
-	// 指定租户管理员（可选）：把已有认证身份绑定为该租户管理员。
-	// AdminIdentityID 直接指定身份；也可只传 AdminAccount/AdminPhone/AdminEmail 按归并键定位。
-	// 统一认证原则：不新建账号、不覆盖原密码，只建「身份-企业」绑定并授予租户管理员角色。
-	AdminIdentityID uint64 `json:"admin_identity_id"`
-	AdminAccount    string `json:"admin_account"`
-	AdminPhone      string `json:"admin_phone"`
-	AdminEmail      string `json:"admin_email"`
-}
-
-func (c *PlatformTenantController) parseTenantPayload() (tenantPayload, error) {
-	// 优先从表单读取（createTenant 使用 multipart/form-dataďź?
-	p := tenantPayload{
-		TenantCode:    strings.TrimSpace(c.GetString("tenant_code")),
-		TenantName:    strings.TrimSpace(c.GetString("tenant_name")),
-		ContactPerson: strings.TrimSpace(c.GetString("contact_person")),
-		ContactPhone:  strings.TrimSpace(c.GetString("contact_phone")),
-		ContactEmail:  strings.TrimSpace(c.GetString("contact_email")),
-		Address:       strings.TrimSpace(c.GetString("address")),
-		Worktime:      strings.TrimSpace(c.GetString("worktime")),
-		Remark:        strings.TrimSpace(c.GetString("remark")),
-	}
-	if s := strings.TrimSpace(c.GetString("status")); s != "" {
-		if v, err := strconv.ParseInt(s, 10, 8); err == nil {
-			tmp := int8(v)
-			p.Status = &tmp
-		}
-	}
-	if s := strings.TrimSpace(c.GetString("package_id")); s != "" {
-		if v, err := strconv.ParseUint(s, 10, 64); err == nil {
-			p.PackageID = &v
-		}
-	}
-	if s := strings.TrimSpace(c.GetString("user_quota")); s != "" {
-		if v, err := strconv.Atoi(s); err == nil {
-			p.UserQuota = &v
-		}
-	}
-	if s := strings.TrimSpace(c.GetString("admin_identity_id")); s != "" {
-		if v, err := strconv.ParseUint(s, 10, 64); err == nil {
-			p.AdminIdentityID = v
-		}
-	}
-	p.AdminAccount = strings.TrimSpace(c.GetString("admin_account"))
-	p.AdminPhone = strings.TrimSpace(c.GetString("admin_phone"))
-	p.AdminEmail = strings.TrimSpace(c.GetString("admin_email"))
-
-	// 如果关键字段为空，尝试从 JSON body 解析（editTenant 靘莤 JSONďź?
-	if p.TenantName == "" && p.TenantCode == "" {
-		raw, _ := io.ReadAll(c.Ctx.Request.Body)
-		if len(raw) > 0 {
-			_ = json.Unmarshal(raw, &p)
-		}
-	}
-	return p, nil
-}
-
-// bindTenantAdminFromPayload 把已有认证身份绑定为新租户的管理员（不新建账号、不覆盖密码）。
-// 优先 AdminIdentityID；否则按 AdminAccount/AdminPhone/AdminEmail 归并键（手机>邮箱>账号）定位。
-// 返回 (是否绑定, 错误)；未指定管理员时返回 (false, nil)。
-func bindTenantAdminFromPayload(tid uint64, p tenantPayload) (bool, error) {
-	identityID := p.AdminIdentityID
-	if identityID == 0 && (p.AdminAccount != "" || p.AdminPhone != "" || p.AdminEmail != "") {
-		existed, hit := authsvc.LocateIdentityByKey(p.AdminAccount, p.AdminPhone, p.AdminEmail)
-		if !hit {
-			return false, errors.New("未找到该账号对应的认证身份")
-		}
-		identityID = existed.ID
-	}
-	if identityID == 0 {
-		return false, nil // 未指定管理员，跳过
-	}
-
-	identity, err := authsvc.GetIdentityByID(identityID)
-	if err != nil || identity == nil {
-		return false, errors.New("认证身份不存在")
-	}
-
-	// 企业内账号：显式指定 > 身份手机号 > user{id}；姓名取身份昵称
-	account := p.AdminAccount
-	if account == "" && identity.Mobile != nil {
-		account = strings.TrimSpace(*identity.Mobile)
-	}
-	if account == "" {
-		account = fmt.Sprintf("user%d", identity.ID)
-	}
-	name := "租户管理员"
-	if identity.Nickname != nil && strings.TrimSpace(*identity.Nickname) != "" {
-		name = strings.TrimSpace(*identity.Nickname)
-	}
-
-	// 老表镜像身份层现有密码哈希（登录仍以认证中心为准，不在建租户时改密）
-	var pwd *string
-	if identity.PasswordHash != nil {
-		h := *identity.PasswordHash
-		pwd = &h
-	}
-
-	// isDefault=0：不改变该用户当前的默认企业
-	if _, err := services.BindTenantUser(tid, identity.ID, &account, &name, identity.Mobile, identity.Email, nil, nil, pwd, 0, 1, nil); err != nil {
-		return false, err
-	}
-
-	// 绑定全局「租户管理员」角色（拥有 backend 全权限）
-	if adminRoleID, err := models.GetTenantAdminRole(); err == nil && adminRoleID > 0 {
-		_, _ = models.Orm.QueryTable(new(models.SystemTenantUser)).
-			Filter("tid", tid).
-			Filter("uid", identity.ID).
-			Update(map[string]interface{}{"group_id": adminRoleID})
-	}
-
-	// 双写：同步到统一认证中心（建 yz_auth_tenant_user 绑定）
-	var row models.SystemTenantUser
-	if e := models.Orm.QueryTable(new(models.SystemTenantUser)).
-		Filter("tid", tid).
-		Filter("uid", identity.ID).
-		One(&row); e == nil {
-		syncTenantUserToAuth(&row, false)
-	}
-
-	return true, nil
-}
-
-// CreateTenant 创建租户
-// POST /platform/tenant/createTenant
-func (c *PlatformTenantController) CreateTenant() {
-	p, _ := c.parseTenantPayload()
-	if strings.TrimSpace(p.TenantName) == "" {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户名称不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-	if strings.TrimSpace(p.TenantCode) == "" {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户编码不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	// 校验编码唯一
-	cnt, err := models.Orm.QueryTable(new(models.SystemTenant)).Filter("tenant_code", p.TenantCode).Count()
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "创建失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-	if cnt > 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户编码已存在"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	status := int8(1)
-	if p.Status != nil {
-		status = *p.Status
-	}
-
-	// 套餐与用户数上限：未指定套餐时使用默认套餐，用户数取其包含用户数（兜底 20）
-	packageID := uint64(0)
-	userQuota := services.DefaultTenantUserQuota
-	// 显式选择的套餐按套餐有效时长计费；未指定而兜底绑定默认套餐的不设置到期时间
-	explicitPackage := p.PackageID != nil && *p.PackageID > 0
-	var packageExpire *time.Time
-	if explicitPackage {
-		packageID = *p.PackageID
-	}
-	if packageID == 0 {
-		if pkg, err := services.GetDefaultTenantPackage(); err == nil && pkg != nil {
-			packageID = pkg.ID
-			if pkg.UserQuota > 0 {
-				userQuota = pkg.UserQuota
-			}
-		}
-	}
-	if packageID > 0 {
-		var pkg models.SystemTenantPackage
-		if err := models.Orm.QueryTable(new(models.SystemTenantPackage)).
-			Filter("id", packageID).
-			Filter("delete_time__isnull", true).
-			One(&pkg); err == nil {
-			if pkg.UserQuota > 0 {
-				userQuota = pkg.UserQuota
-			}
-			if explicitPackage {
-				e := services.PackageExpireFromNow(&pkg)
-				packageExpire = &e
-			}
-		}
-	}
-	if p.UserQuota != nil && *p.UserQuota > 0 {
-		userQuota = *p.UserQuota
-	}
-	if userQuota <= 0 {
-		userQuota = services.DefaultTenantUserQuota
-	}
-
-	t := models.SystemTenant{
-		TenantCode:        p.TenantCode,
-		TenantName:        p.TenantName,
-		ContactPerson:     stringPtr(p.ContactPerson),
-		ContactPhone:      stringPtr(p.ContactPhone),
-		ContactEmail:      stringPtr(p.ContactEmail),
-		Address:           stringPtr(p.Address),
-		Worktime:          stringPtr(p.Worktime),
-		Status:            status,
-		PackageID:         packageID,
-		PackageExpireTime: packageExpire,
-		UserQuota:         userQuota,
-		Remark:            stringPtr(p.Remark),
-	}
-
-	id, err := models.Orm.Insert(&t)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "创建失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-
-	// 指定已有身份为租户管理员（可选）：只建绑定，不新建账号、不改密码。
-	// 绑定失败不影响租户创建结果，仅返回警告信息。
-	adminBound := false
-	adminWarn := ""
-	if bound, bErr := bindTenantAdminFromPayload(uint64(id), p); bErr != nil {
-		adminWarn = bErr.Error()
-	} else {
-		adminBound = bound
-	}
-
-	msg := "success"
-	if adminWarn != "" {
-		msg = "租户已创建，但指定管理员绑定失败: " + adminWarn
-	}
-
-	c.Data["json"] = map[string]interface{}{
-		"code": 200,
-		"msg":  msg,
-		"data": map[string]interface{}{"id": id, "admin_bound": adminBound},
-	}
-	_ = c.ServeJSON()
-}
-
-// EditTenant 编辑租户
-// POST /platform/tenant/editTenant/:id
-func (c *PlatformTenantController) EditTenant() {
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效ID"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	p, _ := c.parseTenantPayload()
-	if strings.TrimSpace(p.TenantName) == "" {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户名称不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	update := map[string]interface{}{
-		"tenant_name":    p.TenantName,
-		"contact_person": p.ContactPerson,
-		"contact_phone":  p.ContactPhone,
-		"contact_email":  p.ContactEmail,
-		"address":        p.Address,
-		"worktime":       p.Worktime,
-		"remark":         p.Remark,
-	}
-	if p.Status != nil {
-		update["status"] = *p.Status
-	}
-	if p.PackageID != nil {
-		pkgID := *p.PackageID
-		if pkgID > 0 {
-			// 套餐切换/续费：按套餐有效时长重新计费（同套餐未到期在原到期时间上顺延），不动用户数上限
-			if _, err := services.ApplyPackageToTenant(id, pkgID, false); err != nil {
-				c.Data["json"] = map[string]interface{}{"code": 400, "msg": err.Error()}
-				_ = c.ServeJSON()
-				return
-			}
-		} else {
-			// 解绑套餐：回退未绑定状态（视为默认套餐），清除计费到期时间
-			update["package_id"] = 0
-			update["package_expire_time"] = nil
-		}
-	}
-	if p.UserQuota != nil {
-		// 用户数上限只增不减：不允许调低到当前已开用户数以下
-		used, _ := services.CountTenantUsers(id)
-		quota := *p.UserQuota
-		if quota > 0 && quota < used {
-			c.Data["json"] = map[string]interface{}{
-				"code": 400,
-				"msg":  fmt.Sprintf("用户数上限不能小于该租户已开用户数（%d）", used),
-			}
-			_ = c.ServeJSON()
-			return
-		}
-		if quota > 0 {
-			update["user_quota"] = quota
-		}
-	}
-
-	_, err = models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", id).Update(update)
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// DeleteTenant 删除租户
-// DELETE /platform/tenant/deleteTenant/:id
-func (c *PlatformTenantController) DeleteTenant() {
-	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
-	if err != nil || id == 0 {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效ID"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	_, err = models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", id).Delete()
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "删除失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
-	_ = c.ServeJSON()
-}
-
-// FindTenantCode 校验租户编码是否重复
-// GET /platform/tenant/findTenantCode?tenant_code=xxxxxx
-// 返回 code=200 表示可用；非200表示重复/不可用（前端会自动重新生成）
-func (c *PlatformTenantController) FindTenantCode() {
-	code := strings.TrimSpace(c.GetString("tenant_code"))
-	if code == "" {
-		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "tenant_code 不能为空"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	cnt, err := models.Orm.QueryTable(new(models.SystemTenant)).Filter("tenant_code", code).Count()
-	if err != nil {
-		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "校验失败: " + err.Error()}
-		_ = c.ServeJSON()
-		return
-	}
-	if cnt > 0 {
-		c.Data["json"] = map[string]interface{}{"code": 409, "msg": "租户编码已存在"}
-		_ = c.ServeJSON()
-		return
-	}
-
-	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "ok"}
-	_ = c.ServeJSON()
-}
+package controllers
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"math"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/services"
+	authsvc "server/services/auth"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// PlatformTenantController 平台端租户管ç?
+type PlatformTenantController struct {
+	beego.Controller
+}
+
+type tenantDTO struct {
+	ID            uint64 `json:"id"`
+	TenantCode    string `json:"tenant_code"`
+	TenantName    string `json:"tenant_name"`
+	ContactPerson string `json:"contact_person"`
+	ContactPhone  string `json:"contact_phone"`
+	ContactEmail  string `json:"contact_email"`
+	Address       string `json:"address"`
+	Worktime      string `json:"worktime"`
+	Status        int8   `json:"status"`
+	// 套餐与用户数配额
+	PackageID   uint64 `json:"package_id"`
+	PackageName string `json:"package_name"`
+	// PackageExpireTime 套餐计费到期时间（NULL-永久有效）；DaysRemaining 剩余天数
+	PackageExpireTime *time.Time `json:"package_expire_time"`
+	DaysRemaining     int        `json:"days_remaining"`
+	UserQuota         int        `json:"user_quota"`
+	UserUsed          int        `json:"user_used"`
+	Remark            string     `json:"remark"`
+	CreateTime        *time.Time `json:"create_time,omitempty"`
+	UpdateTime        *time.Time `json:"update_time,omitempty"`
+	DeleteTime        *time.Time `json:"delete_time,omitempty"`
+}
+
+// tenantPackageNameMap 套餐ID -> 套餐名称
+func tenantPackageNameMap() map[uint64]string {
+	result := map[uint64]string{}
+	var rows []models.SystemTenantPackage
+	if _, err := models.Orm.QueryTable(new(models.SystemTenantPackage)).
+		Filter("delete_time__isnull", true).
+		All(&rows, "ID", "Name"); err == nil {
+		for _, r := range rows {
+			result[r.ID] = r.Name
+		}
+	}
+	return result
+}
+
+// tenantUserCountMap 租户ID -> 有效用户数
+func tenantUserCountMap() map[uint64]int {
+	result := map[uint64]int{}
+	var rows []models.SystemTenantUser
+	if _, err := models.Orm.QueryTable(new(models.SystemTenantUser)).
+		Filter("delete_time__isnull", true).
+		All(&rows, "ID", "Tid"); err == nil {
+		for _, r := range rows {
+			result[r.Tid]++
+		}
+	}
+	return result
+}
+
+func stringValue(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
+
+func stringPtr(s string) *string {
+	return &s
+}
+
+func toTenantDTO(t models.SystemTenant) tenantDTO {
+	ct := t.CreateTime
+	ut := t.UpdateTime
+	daysRemaining := 0
+	if t.PackageExpireTime != nil {
+		daysRemaining = int(math.Ceil(time.Until(*t.PackageExpireTime).Hours() / 24))
+		if daysRemaining < 0 {
+			daysRemaining = 0
+		}
+	}
+	return tenantDTO{
+		ID:                t.ID,
+		TenantCode:        t.TenantCode,
+		TenantName:        t.TenantName,
+		ContactPerson:     stringValue(t.ContactPerson),
+		ContactPhone:      stringValue(t.ContactPhone),
+		ContactEmail:      stringValue(t.ContactEmail),
+		Address:           stringValue(t.Address),
+		Worktime:          stringValue(t.Worktime),
+		Status:            t.Status,
+		PackageID:         t.PackageID,
+		PackageExpireTime: t.PackageExpireTime,
+		DaysRemaining:     daysRemaining,
+		UserQuota:         t.UserQuota,
+		Remark:            stringValue(t.Remark),
+		CreateTime:        &ct,
+		UpdateTime:        &ut,
+		DeleteTime:        t.DeleteTime,
+	}
+}
+
+// GetTenant 获取租户列表
+// GET /platform/tenant/getTenant?page=1&pageSize=10&tenant_name=...&tenant_code=...&contact_person=...&contact_phone=...
+func (c *PlatformTenantController) GetTenant() {
+	page, _ := c.GetInt("page", 1)
+	pageSize, _ := c.GetInt("pageSize", 10)
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 {
+		pageSize = 10
+	}
+
+	tenantName := strings.TrimSpace(c.GetString("tenant_name"))
+	tenantCode := strings.TrimSpace(c.GetString("tenant_code"))
+	contactPerson := strings.TrimSpace(c.GetString("contact_person"))
+	contactPhone := strings.TrimSpace(c.GetString("contact_phone"))
+
+	qs := models.Orm.QueryTable(new(models.SystemTenant))
+	if tenantName != "" {
+		qs = qs.Filter("tenant_name__icontains", tenantName)
+	}
+	if tenantCode != "" {
+		qs = qs.Filter("tenant_code__icontains", tenantCode)
+	}
+	if contactPerson != "" {
+		qs = qs.Filter("contact_person__icontains", contactPerson)
+	}
+	if contactPhone != "" {
+		qs = qs.Filter("contact_phone__icontains", contactPhone)
+	}
+
+	total, err := qs.Count()
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取租户失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+
+	var rows []models.SystemTenant
+	_, err = qs.OrderBy("-id").Limit(pageSize, (page-1)*pageSize).All(&rows)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "获取租户失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+
+	packageNames := tenantPackageNameMap()
+	userCounts := tenantUserCountMap()
+	list := make([]tenantDTO, 0, len(rows))
+	for _, t := range rows {
+		dto := toTenantDTO(t)
+		dto.PackageName = packageNames[t.PackageID]
+		dto.UserUsed = userCounts[t.ID]
+		list = append(list, dto)
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": map[string]interface{}{
+			"list":  list,
+			"total": total,
+		},
+	}
+	_ = c.ServeJSON()
+}
+
+// GetTenantDetail 获取租户详ćƒ
+// GET /platform/tenant/getTenantDetail/:id
+func (c *PlatformTenantController) GetTenantDetail() {
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效ID"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	var t models.SystemTenant
+	err = models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", id).One(&t)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 404, "msg": "租户不存在"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	dto := toTenantDTO(t)
+	if pkg, err := services.GetTenantPackage(t.ID); err == nil && pkg != nil {
+		if pkg.ID != t.PackageID {
+			// 套餐已因到期自动降级，原到期时间不再有效
+			dto.PackageExpireTime = nil
+			dto.DaysRemaining = 0
+		}
+		dto.PackageID = pkg.ID
+		dto.PackageName = pkg.Name
+	}
+	if used, err := services.CountTenantUsers(t.ID); err == nil {
+		dto.UserUsed = used
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  "success",
+		"data": dto,
+	}
+	_ = c.ServeJSON()
+}
+
+type tenantPayload struct {
+	TenantCode    string `json:"tenant_code"`
+	TenantName    string `json:"tenant_name"`
+	ContactPerson string `json:"contact_person"`
+	ContactPhone  string `json:"contact_phone"`
+	ContactEmail  string `json:"contact_email"`
+	Address       string `json:"address"`
+	Worktime      string `json:"worktime"`
+	Status        *int8  `json:"status"`
+	// 套餐与用户数上限（可选）
+	PackageID *uint64 `json:"package_id"`
+	UserQuota *int    `json:"user_quota"`
+	Remark    string  `json:"remark"`
+
+	// 指定租户管理员（可选）：把已有认证身份绑定为该租户管理员。
+	// AdminIdentityID 直接指定身份；也可只传 AdminAccount/AdminPhone/AdminEmail 按归并键定位。
+	// 统一认证原则：不新建账号、不覆盖原密码，只建「身份-企业」绑定并授予租户管理员角色。
+	AdminIdentityID uint64 `json:"admin_identity_id"`
+	AdminAccount    string `json:"admin_account"`
+	AdminPhone      string `json:"admin_phone"`
+	AdminEmail      string `json:"admin_email"`
+}
+
+func (c *PlatformTenantController) parseTenantPayload() (tenantPayload, error) {
+	// 优先从表单读取（createTenant 使用 multipart/form-dataďź?
+	p := tenantPayload{
+		TenantCode:    strings.TrimSpace(c.GetString("tenant_code")),
+		TenantName:    strings.TrimSpace(c.GetString("tenant_name")),
+		ContactPerson: strings.TrimSpace(c.GetString("contact_person")),
+		ContactPhone:  strings.TrimSpace(c.GetString("contact_phone")),
+		ContactEmail:  strings.TrimSpace(c.GetString("contact_email")),
+		Address:       strings.TrimSpace(c.GetString("address")),
+		Worktime:      strings.TrimSpace(c.GetString("worktime")),
+		Remark:        strings.TrimSpace(c.GetString("remark")),
+	}
+	if s := strings.TrimSpace(c.GetString("status")); s != "" {
+		if v, err := strconv.ParseInt(s, 10, 8); err == nil {
+			tmp := int8(v)
+			p.Status = &tmp
+		}
+	}
+	if s := strings.TrimSpace(c.GetString("package_id")); s != "" {
+		if v, err := strconv.ParseUint(s, 10, 64); err == nil {
+			p.PackageID = &v
+		}
+	}
+	if s := strings.TrimSpace(c.GetString("user_quota")); s != "" {
+		if v, err := strconv.Atoi(s); err == nil {
+			p.UserQuota = &v
+		}
+	}
+	if s := strings.TrimSpace(c.GetString("admin_identity_id")); s != "" {
+		if v, err := strconv.ParseUint(s, 10, 64); err == nil {
+			p.AdminIdentityID = v
+		}
+	}
+	p.AdminAccount = strings.TrimSpace(c.GetString("admin_account"))
+	p.AdminPhone = strings.TrimSpace(c.GetString("admin_phone"))
+	p.AdminEmail = strings.TrimSpace(c.GetString("admin_email"))
+
+	// 如果关键字段为空，尝试从 JSON body 解析（editTenant 靘莤 JSONďź?
+	if p.TenantName == "" && p.TenantCode == "" {
+		raw, _ := io.ReadAll(c.Ctx.Request.Body)
+		if len(raw) > 0 {
+			_ = json.Unmarshal(raw, &p)
+		}
+	}
+	return p, nil
+}
+
+// bindTenantAdminFromPayload 把已有认证身份绑定为新租户的管理员（不新建账号、不覆盖密码）。
+// 优先 AdminIdentityID；否则按 AdminAccount/AdminPhone/AdminEmail 归并键（手机>邮箱>账号）定位。
+// 返回 (是否绑定, 错误)；未指定管理员时返回 (false, nil)。
+func bindTenantAdminFromPayload(tid uint64, p tenantPayload) (bool, error) {
+	identityID := p.AdminIdentityID
+	if identityID == 0 && (p.AdminAccount != "" || p.AdminPhone != "" || p.AdminEmail != "") {
+		existed, hit := authsvc.LocateIdentityByKey(p.AdminAccount, p.AdminPhone, p.AdminEmail)
+		if !hit {
+			return false, errors.New("未找到该账号对应的认证身份")
+		}
+		identityID = existed.ID
+	}
+	if identityID == 0 {
+		return false, nil // 未指定管理员，跳过
+	}
+
+	identity, err := authsvc.GetIdentityByID(identityID)
+	if err != nil || identity == nil {
+		return false, errors.New("认证身份不存在")
+	}
+
+	// 企业内账号：显式指定 > 身份手机号 > user{id}；姓名取身份昵称
+	account := p.AdminAccount
+	if account == "" && identity.Mobile != nil {
+		account = strings.TrimSpace(*identity.Mobile)
+	}
+	if account == "" {
+		account = fmt.Sprintf("user%d", identity.ID)
+	}
+	name := "租户管理员"
+	if identity.Nickname != nil && strings.TrimSpace(*identity.Nickname) != "" {
+		name = strings.TrimSpace(*identity.Nickname)
+	}
+
+	// 老表镜像身份层现有密码哈希（登录仍以认证中心为准，不在建租户时改密）
+	var pwd *string
+	if identity.PasswordHash != nil {
+		h := *identity.PasswordHash
+		pwd = &h
+	}
+
+	// isDefault=0：不改变该用户当前的默认企业
+	if _, err := services.BindTenantUser(tid, identity.ID, &account, &name, identity.Mobile, identity.Email, nil, nil, pwd, 0, 1, nil); err != nil {
+		return false, err
+	}
+
+	// 绑定全局「租户管理员」角色（拥有 backend 全权限）
+	if adminRoleID, err := models.GetTenantAdminRole(); err == nil && adminRoleID > 0 {
+		_, _ = models.Orm.QueryTable(new(models.SystemTenantUser)).
+			Filter("tid", tid).
+			Filter("uid", identity.ID).
+			Update(map[string]interface{}{"group_id": adminRoleID})
+	}
+
+	// 双写：同步到统一认证中心（建 yz_auth_tenant_user 绑定）
+	var row models.SystemTenantUser
+	if e := models.Orm.QueryTable(new(models.SystemTenantUser)).
+		Filter("tid", tid).
+		Filter("uid", identity.ID).
+		One(&row); e == nil {
+		syncTenantUserToAuth(&row, false)
+	}
+
+	return true, nil
+}
+
+// CreateTenant 创建租户
+// POST /platform/tenant/createTenant
+func (c *PlatformTenantController) CreateTenant() {
+	p, _ := c.parseTenantPayload()
+	if strings.TrimSpace(p.TenantName) == "" {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户名称不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+	if strings.TrimSpace(p.TenantCode) == "" {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户编码不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	// 校验编码唯一
+	cnt, err := models.Orm.QueryTable(new(models.SystemTenant)).Filter("tenant_code", p.TenantCode).Count()
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "创建失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	if cnt > 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户编码已存在"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	status := int8(1)
+	if p.Status != nil {
+		status = *p.Status
+	}
+
+	// 套餐与用户数上限：未指定套餐时使用默认套餐，用户数取其包含用户数（兜底 20）
+	packageID := uint64(0)
+	userQuota := services.DefaultTenantUserQuota
+	// 显式选择的套餐按套餐有效时长计费；未指定而兜底绑定默认套餐的不设置到期时间
+	explicitPackage := p.PackageID != nil && *p.PackageID > 0
+	var packageExpire *time.Time
+	if explicitPackage {
+		packageID = *p.PackageID
+	}
+	if packageID == 0 {
+		if pkg, err := services.GetDefaultTenantPackage(); err == nil && pkg != nil {
+			packageID = pkg.ID
+			if pkg.UserQuota > 0 {
+				userQuota = pkg.UserQuota
+			}
+		}
+	}
+	if packageID > 0 {
+		var pkg models.SystemTenantPackage
+		if err := models.Orm.QueryTable(new(models.SystemTenantPackage)).
+			Filter("id", packageID).
+			Filter("delete_time__isnull", true).
+			One(&pkg); err == nil {
+			if pkg.UserQuota > 0 {
+				userQuota = pkg.UserQuota
+			}
+			if explicitPackage {
+				e := services.PackageExpireFromNow(&pkg)
+				packageExpire = &e
+			}
+		}
+	}
+	if p.UserQuota != nil && *p.UserQuota > 0 {
+		userQuota = *p.UserQuota
+	}
+	if userQuota <= 0 {
+		userQuota = services.DefaultTenantUserQuota
+	}
+
+	t := models.SystemTenant{
+		TenantCode:        p.TenantCode,
+		TenantName:        p.TenantName,
+		ContactPerson:     stringPtr(p.ContactPerson),
+		ContactPhone:      stringPtr(p.ContactPhone),
+		ContactEmail:      stringPtr(p.ContactEmail),
+		Address:           stringPtr(p.Address),
+		Worktime:          stringPtr(p.Worktime),
+		Status:            status,
+		PackageID:         packageID,
+		PackageExpireTime: packageExpire,
+		UserQuota:         userQuota,
+		Remark:            stringPtr(p.Remark),
+	}
+
+	id, err := models.Orm.Insert(&t)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "创建失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+
+	// 指定已有身份为租户管理员（可选）：只建绑定，不新建账号、不改密码。
+	// 绑定失败不影响租户创建结果，仅返回警告信息。
+	adminBound := false
+	adminWarn := ""
+	if bound, bErr := bindTenantAdminFromPayload(uint64(id), p); bErr != nil {
+		adminWarn = bErr.Error()
+	} else {
+		adminBound = bound
+	}
+
+	msg := "success"
+	if adminWarn != "" {
+		msg = "租户已创建，但指定管理员绑定失败: " + adminWarn
+	}
+
+	c.Data["json"] = map[string]interface{}{
+		"code": 200,
+		"msg":  msg,
+		"data": map[string]interface{}{"id": id, "admin_bound": adminBound},
+	}
+	_ = c.ServeJSON()
+}
+
+// EditTenant 编辑租户
+// POST /platform/tenant/editTenant/:id
+func (c *PlatformTenantController) EditTenant() {
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效ID"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	p, _ := c.parseTenantPayload()
+	if strings.TrimSpace(p.TenantName) == "" {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "租户名称不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	update := map[string]interface{}{
+		"tenant_name":    p.TenantName,
+		"contact_person": p.ContactPerson,
+		"contact_phone":  p.ContactPhone,
+		"contact_email":  p.ContactEmail,
+		"address":        p.Address,
+		"worktime":       p.Worktime,
+		"remark":         p.Remark,
+	}
+	if p.Status != nil {
+		update["status"] = *p.Status
+	}
+	if p.PackageID != nil {
+		pkgID := *p.PackageID
+		if pkgID > 0 {
+			// 套餐切换/续费：按套餐有效时长重新计费（同套餐未到期在原到期时间上顺延），不动用户数上限
+			if _, err := services.ApplyPackageToTenant(id, pkgID, false); err != nil {
+				c.Data["json"] = map[string]interface{}{"code": 400, "msg": err.Error()}
+				_ = c.ServeJSON()
+				return
+			}
+		} else {
+			// 解绑套餐：回退未绑定状态（视为默认套餐），清除计费到期时间
+			update["package_id"] = 0
+			update["package_expire_time"] = nil
+		}
+	}
+	if p.UserQuota != nil {
+		// 用户数上限只增不减：不允许调低到当前已开用户数以下
+		used, _ := services.CountTenantUsers(id)
+		quota := *p.UserQuota
+		if quota > 0 && quota < used {
+			c.Data["json"] = map[string]interface{}{
+				"code": 400,
+				"msg":  fmt.Sprintf("用户数上限不能小于该租户已开用户数（%d）", used),
+			}
+			_ = c.ServeJSON()
+			return
+		}
+		if quota > 0 {
+			update["user_quota"] = quota
+		}
+	}
+
+	_, err = models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", id).Update(update)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "更新失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// DeleteTenant 删除租户
+// DELETE /platform/tenant/deleteTenant/:id
+func (c *PlatformTenantController) DeleteTenant() {
+	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if err != nil || id == 0 {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "无效ID"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	_, err = models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", id).Delete()
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "删除失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "success"}
+	_ = c.ServeJSON()
+}
+
+// FindTenantCode 校验租户编码是否重复
+// GET /platform/tenant/findTenantCode?tenant_code=xxxxxx
+// 返回 code=200 表示可用；非200表示重复/不可用（前端会自动重新生成）
+func (c *PlatformTenantController) FindTenantCode() {
+	code := strings.TrimSpace(c.GetString("tenant_code"))
+	if code == "" {
+		c.Data["json"] = map[string]interface{}{"code": 400, "msg": "tenant_code 不能为空"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	cnt, err := models.Orm.QueryTable(new(models.SystemTenant)).Filter("tenant_code", code).Count()
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{"code": 500, "msg": "校验失败: " + err.Error()}
+		_ = c.ServeJSON()
+		return
+	}
+	if cnt > 0 {
+		c.Data["json"] = map[string]interface{}{"code": 409, "msg": "租户编码已存在"}
+		_ = c.ServeJSON()
+		return
+	}
+
+	c.Data["json"] = map[string]interface{}{"code": 200, "msg": "ok"}
+	_ = c.ServeJSON()
+}
diff --git a/go/controllers/platform_tenant_apply.go b/go/controllers/platform_tenant_apply.go
index 864c3f2..e33ee27 100644
--- a/go/controllers/platform_tenant_apply.go
+++ b/go/controllers/platform_tenant_apply.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 	authsvc "server/services/auth"
@@ -21,20 +22,10 @@ type PlatformTenantApplyController struct {
 	beego.Controller
 }
 
+// platformClaims 入驻申请的审核接口只在平台端使用：必须是 platform 端令牌。
+// 此前不判端，租户自己的令牌就能批准自己入驻，等于把审核权下发到了被审核方。
 func (c *PlatformTenantApplyController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("token 格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("token 无效")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformTenantApplyController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -75,7 +66,8 @@ func (c *PlatformTenantApplyController) reviewerName(claims *jwtutil.Claims) str
 func (c *PlatformTenantApplyController) List() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	_ = claims
@@ -117,12 +109,12 @@ func (c *PlatformTenantApplyController) List() {
 	list := make([]applyDTO, 0, len(rows))
 	for _, r := range rows {
 		dto := applyDTO{AuthTenantApply: r}
-		if identity, ierr := authsvc.GetIdentityByID(r.IdentityID); ierr == nil && identity != nil {
-			if identity.Nickname != nil {
-				dto.IdentityNickname = *identity.Nickname
+		if ident, ierr := authsvc.GetIdentityByID(r.IdentityID); ierr == nil && ident != nil {
+			if ident.Nickname != nil {
+				dto.IdentityNickname = *ident.Nickname
 			}
-			if identity.Mobile != nil {
-				dto.IdentityMobile = *identity.Mobile
+			if ident.Mobile != nil {
+				dto.IdentityMobile = *ident.Mobile
 			}
 		}
 		list = append(list, dto)
@@ -140,7 +132,8 @@ func (c *PlatformTenantApplyController) List() {
 func (c *PlatformTenantApplyController) Detail() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	_ = claims
@@ -166,7 +159,8 @@ func (c *PlatformTenantApplyController) Detail() {
 func (c *PlatformTenantApplyController) Approve() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
@@ -191,7 +185,8 @@ func (c *PlatformTenantApplyController) Approve() {
 func (c *PlatformTenantApplyController) Reject() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	_ = claims
diff --git a/go/controllers/platform_tenant_package.go b/go/controllers/platform_tenant_package.go
index 64fcbb8..ae20115 100644
--- a/go/controllers/platform_tenant_package.go
+++ b/go/controllers/platform_tenant_package.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"server/models"
-	"server/pkg/jwtutil"
+	"server/pkg/identity"
 	"server/services"
 
 	beego "github.com/beego/beego/v2/server/web"
@@ -32,6 +32,18 @@ func (c *PlatformTenantPackageController) jsonErr(httpStatus, bizCode int, msg s
 	_ = c.ServeJSON()
 }
 
+// requirePlatform 套餐与配额是平台侧经营数据，全部路由都挂在 /platform 下。
+// 此前每个方法各自解析令牌、且没有一个判端——租户令牌即可改自己的套餐上限和
+// 用户数配额，等于把计费开关交给了付费方。失败时已写好响应，调用方必须立即 return。
+func (c *PlatformTenantPackageController) requirePlatform() bool {
+	if _, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform); err != nil {
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
+		return false
+	}
+	return true
+}
+
 func (c *PlatformTenantPackageController) jsonOK(data interface{}, msg string) {
 	if msg == "" {
 		msg = "success"
@@ -46,22 +58,11 @@ func (c *PlatformTenantPackageController) jsonOK(data interface{}, msg string) {
 
 // currentOperator 解析当前平台账号名（用于增购记录留痕；取不到时返回空串，不阻断请求）
 func (c *PlatformTenantPackageController) currentOperator() string {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return ""
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return ""
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
+	claims, err := identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 	if err != nil || claims == nil {
 		return ""
 	}
-	if strings.TrimSpace(claims.Username) != "" {
-		return claims.Username
-	}
-	return ""
+	return strings.TrimSpace(claims.Username)
 }
 
 func (c *PlatformTenantPackageController) readBody(target interface{}) bool {
@@ -144,6 +145,9 @@ func loadPackageModules(packageIDs []uint64) map[uint64][]tenantPackageModuleIte
 
 // GetPackageList GET /platform/tenantPackage/list
 func (c *PlatformTenantPackageController) GetPackageList() {
+	if !c.requirePlatform() {
+		return
+	}
 	keyword := strings.TrimSpace(c.GetString("keyword"))
 	status := strings.TrimSpace(c.GetString("status"))
 
@@ -220,6 +224,9 @@ func moduleCodes(items []tenantPackageModuleItem) []string {
 
 // GetPackageSelectList GET /platform/tenantPackage/select/list
 func (c *PlatformTenantPackageController) GetPackageSelectList() {
+	if !c.requirePlatform() {
+		return
+	}
 	var rows []models.SystemTenantPackage
 	_, err := models.Orm.QueryTable(new(models.SystemTenantPackage)).
 		Filter("delete_time__isnull", true).
@@ -262,6 +269,9 @@ func (c *PlatformTenantPackageController) GetPackageSelectList() {
 
 // GetPackageDetail GET /platform/tenantPackage/detail/:id
 func (c *PlatformTenantPackageController) GetPackageDetail() {
+	if !c.requirePlatform() {
+		return
+	}
 	id := parseUint64Param(c.Ctx.Input.Param(":id"))
 	if id == 0 {
 		c.jsonErr(400, 400, "参数错误")
@@ -285,11 +295,17 @@ func (c *PlatformTenantPackageController) GetPackageDetail() {
 // GetPurchaseURL GET /platform/tenantPackage/purchaseUrl
 // 套餐购买链接：租户端未开通功能卡片「购买」按钮的跳转地址
 func (c *PlatformTenantPackageController) GetPurchaseURL() {
+	if !c.requirePlatform() {
+		return
+	}
 	c.jsonOK(map[string]interface{}{"purchase_url": services.GetPackagePurchaseURL()}, "获取成功")
 }
 
 // SavePurchaseURL POST /platform/tenantPackage/purchaseUrl
 func (c *PlatformTenantPackageController) SavePurchaseURL() {
+	if !c.requirePlatform() {
+		return
+	}
 	var p struct {
 		PurchaseURL string `json:"purchase_url"`
 	}
@@ -306,6 +322,9 @@ func (c *PlatformTenantPackageController) SavePurchaseURL() {
 // GetModuleOptions GET /platform/tenantPackage/moduleOptions
 // 可加入套餐的功能模块清单（取 yz_system_modules 中启用且未删除的模块）
 func (c *PlatformTenantPackageController) GetModuleOptions() {
+	if !c.requirePlatform() {
+		return
+	}
 	var rows []models.SystemModules
 	_, err := models.Orm.QueryTable(new(models.SystemModules)).
 		Filter("delete_time__isnull", true).
@@ -372,6 +391,9 @@ func savePackageModules(packageID uint64, modules []string) error {
 
 // CreatePackage POST /platform/tenantPackage/create
 func (c *PlatformTenantPackageController) CreatePackage() {
+	if !c.requirePlatform() {
+		return
+	}
 	var p tenantPackagePayload
 	if !c.readBody(&p) {
 		return
@@ -435,6 +457,9 @@ func (c *PlatformTenantPackageController) CreatePackage() {
 
 // EditPackage POST /platform/tenantPackage/edit/:id
 func (c *PlatformTenantPackageController) EditPackage() {
+	if !c.requirePlatform() {
+		return
+	}
 	id := parseUint64Param(c.Ctx.Input.Param(":id"))
 	if id == 0 {
 		c.jsonErr(400, 400, "参数错误")
@@ -543,6 +568,9 @@ func clearOtherDefaultPackages(keepID uint64) {
 // DeletePackage DELETE /platform/tenantPackage/delete/:id（软删）
 // 注意：基础套餐（code=basic）为系统内置兜底套餐（套餐到期自动降级目标），任何情况下不允许删除。
 func (c *PlatformTenantPackageController) DeletePackage() {
+	if !c.requirePlatform() {
+		return
+	}
 	id := parseUint64Param(c.Ctx.Input.Param(":id"))
 	if id == 0 {
 		c.jsonErr(400, 400, "参数错误")
@@ -606,6 +634,9 @@ type quotaPackagePayload struct {
 
 // GetQuotaPackageList GET /platform/tenantQuotaPackage/list
 func (c *PlatformTenantPackageController) GetQuotaPackageList() {
+	if !c.requirePlatform() {
+		return
+	}
 	onlyEnabled := c.GetString("enabled") == "1"
 	qs := models.Orm.QueryTable(new(models.SystemTenantUserQuotaPackage)).Filter("delete_time__isnull", true)
 	if onlyEnabled {
@@ -621,6 +652,9 @@ func (c *PlatformTenantPackageController) GetQuotaPackageList() {
 
 // CreateQuotaPackage POST /platform/tenantQuotaPackage/create
 func (c *PlatformTenantPackageController) CreateQuotaPackage() {
+	if !c.requirePlatform() {
+		return
+	}
 	var p quotaPackagePayload
 	if !c.readBody(&p) {
 		return
@@ -654,6 +688,9 @@ func (c *PlatformTenantPackageController) CreateQuotaPackage() {
 
 // EditQuotaPackage POST /platform/tenantQuotaPackage/edit/:id
 func (c *PlatformTenantPackageController) EditQuotaPackage() {
+	if !c.requirePlatform() {
+		return
+	}
 	id := parseUint64Param(c.Ctx.Input.Param(":id"))
 	if id == 0 {
 		c.jsonErr(400, 400, "参数错误")
@@ -703,6 +740,9 @@ func (c *PlatformTenantPackageController) EditQuotaPackage() {
 
 // DeleteQuotaPackage DELETE /platform/tenantQuotaPackage/delete/:id（软删）
 func (c *PlatformTenantPackageController) DeleteQuotaPackage() {
+	if !c.requirePlatform() {
+		return
+	}
 	id := parseUint64Param(c.Ctx.Input.Param(":id"))
 	if id == 0 {
 		c.jsonErr(400, 400, "参数错误")
@@ -735,6 +775,9 @@ type setTenantPackagePayload struct {
 // SetTenantPackage POST /platform/tenant/setPackage
 // 为租户绑定套餐；sync_quota 为 true（默认）时按套餐包含用户数与现有上限取较大值同步。
 func (c *PlatformTenantPackageController) SetTenantPackage() {
+	if !c.requirePlatform() {
+		return
+	}
 	var p setTenantPackagePayload
 	if !c.readBody(&p) {
 		return
@@ -758,6 +801,9 @@ func (c *PlatformTenantPackageController) SetTenantPackage() {
 // GetTenantQuotaInfo GET /platform/tenant/quotaInfo?tid=1
 // 返回租户套餐、用户数使用情况、可增购规格与单价
 func (c *PlatformTenantPackageController) GetTenantQuotaInfo() {
+	if !c.requirePlatform() {
+		return
+	}
 	tid, _ := c.GetUint64("tid")
 	if tid == 0 {
 		c.jsonErr(400, 400, "tid 不能为空")
@@ -916,6 +962,9 @@ type rechargeQuotaPayload struct {
 // RechargeTenantQuota POST /platform/tenant/rechargeQuota
 // 用户数增购：单个增购（单价 x 人数）或 按加购套餐（如 5人/500元）
 func (c *PlatformTenantPackageController) RechargeTenantQuota() {
+	if !c.requirePlatform() {
+		return
+	}
 	var p rechargeQuotaPayload
 	if !c.readBody(&p) {
 		return
@@ -1001,6 +1050,9 @@ func (c *PlatformTenantPackageController) RechargeTenantQuota() {
 
 // GetQuotaOrders GET /platform/tenant/quotaOrders?tid=1
 func (c *PlatformTenantPackageController) GetQuotaOrders() {
+	if !c.requirePlatform() {
+		return
+	}
 	tid, _ := c.GetUint64("tid")
 	if tid == 0 {
 		c.jsonErr(400, 400, "tid 不能为空")
diff --git a/go/controllers/platform_website_common.go b/go/controllers/platform_website_common.go
index c6931a1..3fb8b0c 100644
--- a/go/controllers/platform_website_common.go
+++ b/go/controllers/platform_website_common.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"server/pkg/jwtutil"
+	"server/pkg/identity"
 
 	beego "github.com/beego/beego/v2/server/web"
 )
@@ -21,7 +22,8 @@ import (
 func websiteAuth(c *beego.Controller) (*jwtutil.Claims, bool) {
 	claims, err := requirePlatform(c)
 	if err != nil {
-		jsonErr(c, 401, 401, err.Error())
+		code := identity.Status(err)
+		jsonErr(c, code, code, err.Error())
 		return nil, false
 	}
 	return claims, true
diff --git a/go/controllers/platform_website_setting.go b/go/controllers/platform_website_setting.go
index e3ef7dd..13f55fe 100644
--- a/go/controllers/platform_website_setting.go
+++ b/go/controllers/platform_website_setting.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 
 	beego "github.com/beego/beego/v2/server/web"
 )
@@ -34,7 +35,8 @@ func (c *PlatformWebsiteSettingController) jsonErr(httpStatus, bizCode int, msg
 // data.values = { "sitename": "云泽科技", ... }（key 即标签名，方便直接使用）
 func (c *PlatformWebsiteSettingController) Info() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -66,7 +68,8 @@ func (c *PlatformWebsiteSettingController) Info() {
 // 通用：表里已存在或新增的任意合法标签都可写入，不需要登记。
 func (c *PlatformWebsiteSettingController) Save() {
 	if _, err := requirePlatform(&c.Controller); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/platform_wechat_mini.go b/go/controllers/platform_wechat_mini.go
index 8230b21..e8227ae 100644
--- a/go/controllers/platform_wechat_mini.go
+++ b/go/controllers/platform_wechat_mini.go
@@ -2,12 +2,12 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 	"strings"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services/wechatmini"
 	"server/services/wechatmp"
@@ -29,22 +29,7 @@ type PlatformWechatMiniController struct {
 }
 
 func (c *PlatformWechatMiniController) claims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformWechatMiniController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -68,7 +53,8 @@ func (c *PlatformWechatMiniController) ok(data interface{}, msg string) {
 // GetConfig GET /platform/wechatMini/config
 func (c *PlatformWechatMiniController) GetConfig() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	data := map[string]interface{}{
@@ -99,7 +85,8 @@ func (c *PlatformWechatMiniController) GetConfig() {
 // SaveConfig POST /platform/wechatMini/config
 func (c *PlatformWechatMiniController) SaveConfig() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -135,7 +122,8 @@ func (c *PlatformWechatMiniController) SaveConfig() {
 // ListApps GET /platform/wechatMini/apps 多小程序应用列表（AppSecret 不回显）
 func (c *PlatformWechatMiniController) ListApps() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	rows, err := wechatmini.ListApps()
@@ -158,7 +146,8 @@ func (c *PlatformWechatMiniController) ListApps() {
 // SaveApp POST /platform/wechatMini/app/save 新增/更新应用
 func (c *PlatformWechatMiniController) SaveApp() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -202,7 +191,8 @@ func (c *PlatformWechatMiniController) SaveApp() {
 // DeleteApp POST /platform/wechatMini/app/delete/:id 软删应用并停用
 func (c *PlatformWechatMiniController) DeleteApp() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
diff --git a/go/controllers/platform_wechat_mp.go b/go/controllers/platform_wechat_mp.go
index 3e0ba1a..b2e94a7 100644
--- a/go/controllers/platform_wechat_mp.go
+++ b/go/controllers/platform_wechat_mp.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services/wechatmp"
 
@@ -30,22 +31,7 @@ type PlatformWechatMpController struct {
 }
 
 func (c *PlatformWechatMpController) claims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.SplitN(auth, " ", 2)
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("认证信息格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("无效的token")
-	}
-	if claims.UserType != "platform" {
-		return nil, fmt.Errorf("无权访问")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 func (c *PlatformWechatMpController) jsonErr(httpStatus, bizCode int, msg string) {
@@ -84,7 +70,8 @@ func (c *PlatformWechatMpController) readBody(out interface{}) bool {
 // GetConfig GET /platform/wechatMp/config
 func (c *PlatformWechatMpController) GetConfig() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	data := map[string]interface{}{
@@ -123,7 +110,8 @@ func (c *PlatformWechatMpController) GetConfig() {
 // SaveConfig POST /platform/wechatMp/config
 func (c *PlatformWechatMpController) SaveConfig() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -166,7 +154,8 @@ func (c *PlatformWechatMpController) SaveConfig() {
 // 使用当前配置获取 access_token，验证 AppID/AppSecret 是否正确
 func (c *PlatformWechatMpController) TestConnection() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	cfg, err := wechatmp.LoadConfig()
@@ -198,7 +187,8 @@ func (c *PlatformWechatMpController) TestConnection() {
 func (c *PlatformWechatMpController) BindStart() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	uid := uint64(claims.UserID)
@@ -226,7 +216,8 @@ func (c *PlatformWechatMpController) BindStart() {
 // 需认证公众号；未认证（48001）时提示改用「公众号内发送登录」路径。
 func (c *PlatformWechatMpController) PublishMenu() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	cfg, err := wechatmp.LoadEnabledConfig()
@@ -311,7 +302,8 @@ func (c *PlatformWechatMpController) saveFollowQrcode() (string, error) {
 // 上传公众号「关注二维码」图片（普通二维码，用户扫码进入公众号会话）
 func (c *PlatformWechatMpController) UploadFollowQrcode() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	dataURL, err := c.saveFollowQrcode()
@@ -329,7 +321,8 @@ func (c *PlatformWechatMpController) UploadFollowQrcode() {
 // DeleteFollowQrcode POST /platform/wechatMp/followQrcode/delete
 func (c *PlatformWechatMpController) DeleteFollowQrcode() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	if err := wechatmp.SaveFollowQrcode(""); err != nil {
@@ -343,7 +336,8 @@ func (c *PlatformWechatMpController) DeleteFollowQrcode() {
 func (c *PlatformWechatMpController) BindStatus() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	scene := strings.TrimSpace(c.GetString("scene"))
@@ -366,7 +360,8 @@ func (c *PlatformWechatMpController) BindStatus() {
 func (c *PlatformWechatMpController) BindConfirm() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -402,7 +397,8 @@ func (c *PlatformWechatMpController) BindConfirm() {
 func (c *PlatformWechatMpController) MyBinding() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	follower, err := wechatmp.GetFollowerByUser(models.WechatBindTypePlatformUser, uint64(claims.UserID))
@@ -429,7 +425,8 @@ func (c *PlatformWechatMpController) MyBinding() {
 func (c *PlatformWechatMpController) Unbind() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	if err := wechatmp.UnbindByUser(models.WechatBindTypePlatformUser, uint64(claims.UserID)); err != nil {
@@ -444,7 +441,8 @@ func (c *PlatformWechatMpController) Unbind() {
 // ListFollowers GET /platform/wechatMp/followers?page=&pageSize=&keyword=&bind_type=&subscribe=
 func (c *PlatformWechatMpController) ListFollowers() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	page, _ := c.GetInt("page", 1)
@@ -517,7 +515,8 @@ func (c *PlatformWechatMpController) ListFollowers() {
 // SetFollowerRemark POST /platform/wechatMp/follower/remark {id, remark}
 func (c *PlatformWechatMpController) SetFollowerRemark() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -545,7 +544,8 @@ func (c *PlatformWechatMpController) SetFollowerRemark() {
 // 仅清除绑定关系（保留粉丝记录）
 func (c *PlatformWechatMpController) UnbindFollower() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -576,7 +576,8 @@ func (c *PlatformWechatMpController) UnbindFollower() {
 // {title, content, remark, url, bind_type, bind_id, tid}
 func (c *PlatformWechatMpController) Push() {
 	if _, err := c.claims(); err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
@@ -623,7 +624,8 @@ func (c *PlatformWechatMpController) Push() {
 func (c *PlatformWechatMpController) PushTest() {
 	claims, err := c.claims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	var p struct {
diff --git a/go/controllers/qiniu_upload.go b/go/controllers/qiniu_upload.go
index e643a7b..5a674b5 100644
--- a/go/controllers/qiniu_upload.go
+++ b/go/controllers/qiniu_upload.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/pkg/identity"
 	"server/pkg/jwtutil"
 	"server/services"
 
@@ -22,21 +23,10 @@ type QiniuUploadController struct {
 	beego.Controller
 }
 
-// platformClaims 获取平台端 JWT claims
+// platformClaims 存储配置与七牛凭证只挂在 /platform 下，必须是平台端令牌。
+// 此前只解令牌不判端，任意端的合法令牌都能换出上传凭证并写入文件记录。
 func (c *QiniuUploadController) platformClaims() (*jwtutil.Claims, error) {
-	auth := c.Ctx.Request.Header.Get("Authorization")
-	if auth == "" {
-		return nil, fmt.Errorf("未登录")
-	}
-	parts := strings.Split(auth, " ")
-	if len(parts) != 2 || parts[0] != "Bearer" {
-		return nil, fmt.Errorf("token 格式错误")
-	}
-	claims, err := jwtutil.ParseToken(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("token 无效")
-	}
-	return claims, nil
+	return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndPlatform)
 }
 
 // effectiveTid 获取有效的租户 ID
@@ -74,7 +64,8 @@ func (c *QiniuUploadController) ParseJSON(v interface{}) error {
 func (c *QiniuUploadController) GetUploadToken() {
 	_, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
@@ -123,7 +114,8 @@ func (c *QiniuUploadController) GetUploadToken() {
 func (c *QiniuUploadController) SaveFileRecord() {
 	claims, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 	tid := c.effectiveTid(claims)
@@ -231,7 +223,8 @@ func (c *QiniuUploadController) SaveFileRecord() {
 func (c *QiniuUploadController) GetStorageConfig() {
 	_, err := c.platformClaims()
 	if err != nil {
-		c.jsonErr(401, 401, err.Error())
+		code := identity.Status(err)
+		c.jsonErr(code, code, err.Error())
 		return
 	}
 
diff --git a/go/controllers/reimburse_approval_core.go b/go/controllers/reimburse_approval_core.go
new file mode 100644
index 0000000..bbaca3d
--- /dev/null
+++ b/go/controllers/reimburse_approval_core.go
@@ -0,0 +1,151 @@
+package controllers
+
+import (
+	"fmt"
+	"time"
+
+	"server/models"
+	"server/pkg/jwtutil"
+	"server/services"
+	approvalEngine "server/services/approval"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// reimburse_approval_core.go 报销单「审批人视角」操作共享逻辑。
+//
+// Web 端（/backend/reimbursements/approve|reject|my-approve-task）与
+// 小程序端（/api/oa/expense/approve|reject|my-approve-task）共用本文件；
+// 审批中心 TaskAct 也复用其中的 biz_type 判定与时间线回写。
+
+// isReimburseBizType 判断审批任务/实例是否属于报销类单据。
+func isReimburseBizType(bizType string) bool {
+	return approvalEngine.IsReimburseBizType(bizType)
+}
+
+// claimsReimburseUIDs 当前登录用户可能出现在 approver_id 上的两种口径：
+// 认证中心 identity_id 与本租户 uid（历史上两种写法并存，这里都兼容）。
+func claimsReimburseUIDs(claims *jwtutil.Claims) []interface{} {
+	raw := uint64(claims.UserID)
+	out := []interface{}{raw}
+	if uid := services.ResolveTenantUID(uint64(claims.TenantId), raw); uid != raw {
+		out = append(out, uid)
+	}
+	return out
+}
+
+// reimburseMyTaskCore 查当前用户在报销单 id 上的待办审批任务；无待办返回 (nil, nil)。
+func reimburseMyTaskCore(claims *jwtutil.Claims, id uint64) (*models.ApprovalTask, error) {
+	tid := uint64(claims.TenantId)
+	var task models.ApprovalTask
+	err := models.Orm.QueryTable(new(models.ApprovalTask)).
+		Filter("scope", models.ApprovalScopeTenant).
+		Filter("tid", tid).
+		Filter("biz_type", models.ApprovalBizReimburse).
+		Filter("biz_id", id).
+		Filter("status", models.ApprovalTaskPending).
+		Filter("is_deleted", 0).
+		Filter("approver_id__in", claimsReimburseUIDs(claims)...).
+		OrderBy("-id").One(&task)
+	if err == orm.ErrNoRows {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &task, nil
+}
+
+// reimburseActCore 报销单审批操作共享逻辑（pass=true 通过 / false 驳回）。
+//
+// 返回 (httpCode, errMsg, hint)：errMsg 非空表示失败；成功时 hint 为提示文案。
+// 节点流转交由统一审批引擎，本函数负责定位当前用户的待办任务并补记业务时间线。
+func reimburseActCore(claims *jwtutil.Claims, id uint64, pass bool, comment string) (int, string, string) {
+	if _, err := findOwnedReimbursement(claims, id); err != nil {
+		return 404, "报销单不存在", ""
+	}
+	task, err := reimburseMyTaskCore(claims, id)
+	if err != nil {
+		return 500, "查询审批任务失败", ""
+	}
+	if task == nil {
+		return 400, "当前没有待您审批的节点", ""
+	}
+
+	result, err := approvalEngine.Approve(task.ID, approvalEngine.ApproveInput{
+		ApproverID: task.ApproverID,
+		Pass:       pass,
+		Comment:    comment,
+	})
+	if err != nil {
+		return 400, err.Error(), ""
+	}
+
+	applyReimburseApprovalResult(uint64(claims.TenantId), id,
+		uint64(claims.UserID), claims.Username, task.Sort,
+		pass, comment, result.Finished, result.InstanceStat)
+
+	hint := result.Message
+	if hint == "" {
+		if pass {
+			hint = "审批通过"
+		} else {
+			hint = "已驳回"
+		}
+	}
+	return 200, "", hint
+}
+
+// applyReimburseApprovalResult 把一次审批动作回写到报销业务侧：
+// 补记 yz_backend_approval_records 时间线；流程结束时同步单据终态（引擎的
+// SyncBizResult 也会做同样的事，这里按终态幂等，避免重复插记录）。
+func applyReimburseApprovalResult(tid, bizID, actorID uint64, actorName string, step int,
+	pass bool, comment string, finished bool, instStatus int8) {
+	if tid == 0 || bizID == 0 {
+		return
+	}
+	action := int8(models.ApprovalActionApprove)
+	if !pass {
+		action = models.ApprovalActionReject
+	}
+
+	var row models.BackendReimbursement
+	if err := models.Orm.QueryTable(new(models.BackendReimbursement)).
+		Filter("id", bizID).Filter("tid", tid).Filter("is_deleted", 0).One(&row); err != nil {
+		return
+	}
+
+	// 终态同步（审批中→通过/驳回），引擎已同步过则跳过
+	var bizStatus int8
+	if finished {
+		switch instStatus {
+		case models.ApprovalInstanceApproved:
+			bizStatus = 2
+		case models.ApprovalInstanceRejected:
+			bizStatus = 3
+		}
+		if bizStatus != 0 && row.Status != bizStatus {
+			_, _ = models.Orm.QueryTable(new(models.BackendReimbursement)).
+				Filter("id", bizID).Filter("tid", tid).
+				Update(orm.Params{"status": bizStatus, "current_approver_id": 0, "update_time": time.Now()})
+		}
+	}
+
+	// 时间线去重：同一步骤同一动作只记一次
+	dup := models.Orm.QueryTable(new(models.BackendApprovalRecord)).
+		Filter("tid", tid).Filter("reimbursement_id", bizID).
+		Filter("approver_id", actorID).Filter("action", action).
+		Filter("step", int8(step)).Filter("is_deleted", 0).Exist()
+	if dup {
+		return
+	}
+	var commentPtr *string
+	if comment != "" {
+		commentPtr = &comment
+	}
+	_, _ = models.Orm.Insert(&models.BackendApprovalRecord{
+		Tid: tid, UID: uint64Ptr(actorID), ReimbursementID: bizID,
+		ApproverID: actorID, ApproverName: fmt.Sprintf("%s", actorName), Action: action,
+		Comment: commentPtr, Step: int8(step), PrevStep: int8(step),
+	})
+}
diff --git a/go/controllers/tenant_site.go b/go/controllers/tenant_site.go
index 904cd06..95b300a 100644
--- a/go/controllers/tenant_site.go
+++ b/go/controllers/tenant_site.go
@@ -116,11 +116,15 @@ func (c *TenantSiteController) resolveTemplateCode(tid uint64) string {
 	return code
 }
 
-// writeHTML 直出 HTML
+// writeHTML 直出 HTML。
+// 必须走 Output.Body：它会把 status 真正写进响应头并把 Output.Status 归零。
+// 用 Ctx.WriteString 直写 body 时状态码会滞留在 Output.Status 被丢弃（404/500 实返 200），
+// 且 beego 收尾还会用它再调一次 WriteHeader，触发 net/http 的 superfluous 告警。
 func (c *TenantSiteController) writeHTML(status int, html string) {
+	body := []byte(c.rewriteStorageURLs(html))
 	c.Ctx.Output.SetStatus(status)
 	c.Ctx.Output.Header("Content-Type", "text/html; charset=utf-8")
-	c.Ctx.WriteString(c.rewriteStorageURLs(html))
+	_ = c.Ctx.Output.Body(body)
 }
 
 var legacyQiniuDomains = []string{
diff --git a/go/docs/sql/alter_admin_role_lock.sql b/go/docs/sql/alter_admin_role_lock.sql
new file mode 100644
index 0000000..2898710
--- /dev/null
+++ b/go/docs/sql/alter_admin_role_lock.sql
@@ -0,0 +1,32 @@
+-- =============================================================
+-- 角色「平台下发 + 租户只读」显式锁定 - 增量迁移
+--
+-- 场景：平台端可建 cid=2 且 tenant_id=0 的全局角色下发到租户后台。
+--       此前"租户不可改/不可删"的判定绑死在 tenant_id==0 上，
+--       一是无法表达"落到具体租户头上但仍只读"，
+--       二是后端看 tenant_id、前端看 is_custom，两处口径不一致会漂移。
+--       本迁移把锁定语义收敛为独立列 is_locked。
+--
+-- 执行顺序：
+--   1) 加 is_locked / source_role_id 两列
+--   2) 回填：现存全局租户角色（cid=2 且 tenant_id=0）标记为锁定，
+--      保证代码改用 is_locked 判定后，这两个角色不会突然变得可被租户改写。
+--
+-- 注意：MySQL 不支持 ADD COLUMN IF NOT EXISTS，本脚本重复执行会在第 1 步
+--       报 Duplicate column name 并停止，属预期，不会破坏已回填的数据。
+-- =============================================================
+
+-- 1. 角色表补锁定列
+ALTER TABLE `yz_system_admin_role`
+  ADD COLUMN `is_locked` TINYINT UNSIGNED NOT NULL DEFAULT 0
+    COMMENT '1=平台下发，租户端只读（不可改名/改权限/删除）' AFTER `is_custom`,
+  ADD COLUMN `source_role_id` BIGINT UNSIGNED NOT NULL DEFAULT 0
+    COMMENT '来源角色ID（平台下发时记录，0=非下发）' AFTER `is_locked`;
+
+-- 2. 回填存量全局租户角色
+UPDATE `yz_system_admin_role`
+SET `is_locked` = 1
+WHERE `cid` = 2
+  AND `tenant_id` = 0
+  AND `delete_time` IS NULL
+  AND `is_locked` = 0;
diff --git a/go/docs/sql/erp_inventory_schema.sql b/go/docs/sql/erp_inventory_schema.sql
new file mode 100644
index 0000000..fcfe9c5
--- /dev/null
+++ b/go/docs/sql/erp_inventory_schema.sql
@@ -0,0 +1,289 @@
+-- =============================================================
+-- 进销存（ERP）—— 交易层数据表
+--
+-- 对应模型：go/models/erp_inventory.go
+--
+-- 设计要点：
+--   1. 库存流水表 yz_backend_erp_stock_ledger 是核心：所有出入库动作
+--      审核生效时写入一条不可篡改的流水，由流水驱动库存结存
+--      yz_backend_erp_stock（qty + 移动加权成本），不直接改库存数字。
+--   2. 单据统一建模：yz_backend_erp_document（主表）+ _item（明细），
+--      doc_type 覆盖 采购订单/入库/退货、销售订单/出库/退货、
+--      其他出入库、调拨、盘点 十类单据，一套单据引擎驱动全部流转。
+--      单据特有字段：book_qty（盘点账面）、to_warehouse_id（调拨）、
+--      ref_doc_id/ref_item_id（退货溯源、入库关联订单）。
+--   3. 业财一体：出库/入库单生效时生成往来账 yz_backend_erp_partner_bill
+--      （应收/应付），收付款单 yz_backend_erp_fund_bill 通过
+--      yz_backend_erp_fund_settle 按单核销。
+--   4. 状态机：0草稿 1审批中 2已生效 3已驳回 4已作废；
+--      仅「已生效」产生库存流水与往来账；草稿/驳回/审批中可作废。
+--
+-- 注意：不显式指定 COLLATE，沿用数据库默认排序规则，避免与既有表
+-- （utf8mb4_0900_ai_ci）在 JOIN 比较字符串时报 Illegal mix of collations。
+-- =============================================================
+
+SET NAMES utf8mb4;
+
+-- ---------------- 1. 商品分类（树形） ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_product_category` (
+  `id`            BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`     VARCHAR(64)  NOT NULL DEFAULT '' COMMENT '租户ID',
+  `category_name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '分类名称',
+  `parent_id`     BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '父分类ID，0=根',
+  `sort_order`    INT          NOT NULL DEFAULT 0 COMMENT '排序',
+  `status`        TINYINT      NOT NULL DEFAULT 1 COMMENT '1启用 0停用',
+  `remark`        VARCHAR(500) NOT NULL DEFAULT '',
+  `create_time`   DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`   DATETIME     DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `delete_time`   DATETIME     DEFAULT NULL COMMENT '软删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_tenant` (`tenant_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-商品分类';
+
+-- ---------------- 2. 商品档案 ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_product` (
+  `id`             BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`      VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '租户ID',
+  `product_code`   VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '商品编号（租户内唯一）',
+  `product_name`   VARCHAR(200)  NOT NULL DEFAULT '' COMMENT '商品名称',
+  `category_id`    BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '分类ID',
+  `brand`          VARCHAR(100)  NOT NULL DEFAULT '' COMMENT '品牌',
+  `spec`           VARCHAR(200)  NOT NULL DEFAULT '' COMMENT '规格',
+  `model`          VARCHAR(100)  NOT NULL DEFAULT '' COMMENT '型号',
+  `base_unit`      VARCHAR(32)   NOT NULL DEFAULT '' COMMENT '基本单位（库存计量单位）',
+  `aux_unit`       VARCHAR(32)   NOT NULL DEFAULT '' COMMENT '辅助单位（如箱）',
+  `aux_ratio`      DECIMAL(18,4) NOT NULL DEFAULT 1 COMMENT '换算系数：1辅助单位=aux_ratio基本单位',
+  `barcode`        VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '主条码',
+  `extra_barcodes` VARCHAR(500)  NOT NULL DEFAULT '' COMMENT '多条码 CSV',
+  `purchase_price` DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '参考采购价',
+  `sale_price`     DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '零售价',
+  `wholesale_price` DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '批发价',
+  `member_price`   DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '会员价',
+  `min_price`      DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '最低售价（开单低于此价拦截）',
+  `tax_rate`       DECIMAL(9,4)  NOT NULL DEFAULT 0 COMMENT '税率(%)',
+  `safety_qty`     DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '安全库存下限（低于预警）',
+  `max_qty`        DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '库存上限（高于积压预警，0=不限）',
+  `shelf_life_days` INT          NOT NULL DEFAULT 0 COMMENT '保质期天数（0=不管效期）',
+  `enable_batch`   TINYINT       NOT NULL DEFAULT 0 COMMENT '是否批次管理：1是 0否',
+  `image_url`      VARCHAR(500)  NOT NULL DEFAULT '' COMMENT '商品图片',
+  `status`         TINYINT       NOT NULL DEFAULT 1 COMMENT '1启用 0停用',
+  `is_draft`       TINYINT       NOT NULL DEFAULT 0 COMMENT '1草稿 0正式',
+  `remark`         VARCHAR(1000) NOT NULL DEFAULT '',
+  `create_user_id` VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '创建人',
+  `create_time`    DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`    DATETIME      DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `delete_time`    DATETIME      DEFAULT NULL COMMENT '软删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_tenant_code` (`tenant_id`,`product_code`),
+  KEY `idx_tenant_name` (`tenant_id`,`product_name`),
+  KEY `idx_barcode` (`barcode`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-商品档案';
+
+-- ---------------- 3. 仓库 ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_warehouse` (
+  `id`             BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`      VARCHAR(64)  NOT NULL DEFAULT '' COMMENT '租户ID',
+  `warehouse_code` VARCHAR(64)  NOT NULL DEFAULT '' COMMENT '仓库编号',
+  `warehouse_name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '仓库名称',
+  `address`        VARCHAR(255) NOT NULL DEFAULT '' COMMENT '地址',
+  `manager`        VARCHAR(50)  NOT NULL DEFAULT '' COMMENT '负责人',
+  `phone`          VARCHAR(20)  NOT NULL DEFAULT '' COMMENT '联系电话',
+  `is_default`     TINYINT      NOT NULL DEFAULT 0 COMMENT '是否默认仓库：1是 0否',
+  `status`         TINYINT      NOT NULL DEFAULT 1 COMMENT '1启用 0停用',
+  `remark`         VARCHAR(500) NOT NULL DEFAULT '',
+  `create_time`    DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`    DATETIME     DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `delete_time`    DATETIME     DEFAULT NULL COMMENT '软删除',
+  PRIMARY KEY (`id`),
+  KEY `idx_tenant` (`tenant_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-仓库档案';
+
+-- ---------------- 4. 库存结存（由流水驱动） ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_stock` (
+  `id`          BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`   VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '租户ID',
+  `product_id`  BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品ID',
+  `warehouse_id` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '仓库ID',
+  `batch_no`    VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '批次号，空=非批次库存',
+  `quantity`    DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '当前库存数量（基本单位）',
+  `cost_price`  DECIMAL(18,6) NOT NULL DEFAULT 0 COMMENT '移动加权平均成本',
+  `update_time` DATETIME      DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_stock` (`tenant_id`,`product_id`,`warehouse_id`,`batch_no`),
+  KEY `idx_tenant_product` (`tenant_id`,`product_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-库存结存';
+
+-- ---------------- 5. 库存流水（核心·只增不改不删） ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_stock_ledger` (
+  `id`            BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`     VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '租户ID',
+  `product_id`    BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品ID',
+  `warehouse_id`  BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '仓库ID',
+  `batch_no`      VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '批次号',
+  `direction`     TINYINT       NOT NULL DEFAULT 1 COMMENT '方向：1入 -1出',
+  `quantity`      DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '变动数量（正数）',
+  `before_qty`    DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '变动前结存',
+  `after_qty`     DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '变动后结存',
+  `unit_cost`     DECIMAL(18,6) NOT NULL DEFAULT 0 COMMENT '本次变动单位成本（入库=进价，出库=出库时加权成本）',
+  `total_cost`    DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '本次变动成本金额',
+  `doc_type`      VARCHAR(30)   NOT NULL DEFAULT '' COMMENT '来源单据类型',
+  `doc_id`        BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '来源单据ID',
+  `doc_no`        VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '来源单据号',
+  `doc_item_id`   BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '来源单据明细ID',
+  `production_date` DATE        DEFAULT NULL COMMENT '生产日期',
+  `expire_date`   DATE          DEFAULT NULL COMMENT '到期日期',
+  `operator_id`   VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '操作人ID',
+  `operator_name` VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '操作人姓名',
+  `remark`        VARCHAR(500)  NOT NULL DEFAULT '',
+  `create_time`   DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_stock` (`tenant_id`,`product_id`,`warehouse_id`),
+  KEY `idx_doc` (`tenant_id`,`doc_type`,`doc_id`),
+  KEY `idx_create_time` (`tenant_id`,`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-库存流水（不可篡改）';
+
+-- ---------------- 6. 单据主表（十类单据统一建模） ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_document` (
+  `id`             BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`      VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '租户ID',
+  `doc_no`         VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '单据号（前缀取基础设置）',
+  `doc_type`       VARCHAR(30)   NOT NULL DEFAULT '' COMMENT '单据类型：purchase_order/purchase_in/purchase_return/sales_order/sales_out/sales_return/other_in/other_out/transfer/stock_take',
+  `biz_date`       DATE          NOT NULL COMMENT '业务日期',
+  `warehouse_id`   BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '主仓库（入库仓/出库仓/调出仓）',
+  `to_warehouse_id` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '调入仓库（仅调拨）',
+  `partner_type`   VARCHAR(20)   NOT NULL DEFAULT '' COMMENT '往来单位类型：customer/supplier',
+  `partner_id`     BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '往来单位ID（客户表/供应商表）',
+  `partner_name`   VARCHAR(200)  NOT NULL DEFAULT '' COMMENT '往来单位名称快照',
+  `source_doc_id`  BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '来源单据ID（入库单←采购订单，退货单←入库/出库单）',
+  `total_qty`      DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '合计数量（基本单位）',
+  `total_amount`   DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '合计金额（折前）',
+  `discount_amount` DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '整单优惠金额',
+  `actual_amount`  DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '合计金额（折后，往来账按此计）',
+  `status`         TINYINT       NOT NULL DEFAULT 0 COMMENT '0草稿 1审批中 2已生效 3已驳回 4已作废',
+  `instance_id`    BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '审批实例ID',
+  `auditor_id`     VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '审核人ID',
+  `auditor_name`   VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '审核人姓名',
+  `audit_time`     DATETIME      DEFAULT NULL COMMENT '审核生效时间',
+  `remark`         VARCHAR(1000) NOT NULL DEFAULT '',
+  `create_user_id`   VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人ID',
+  `create_user_name` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人姓名',
+  `create_time`    DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`    DATETIME      DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `delete_time`    DATETIME      DEFAULT NULL COMMENT '软删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_tenant_docno` (`tenant_id`,`doc_no`),
+  KEY `idx_tenant_type_status` (`tenant_id`,`doc_type`,`status`),
+  KEY `idx_partner` (`tenant_id`,`partner_type`,`partner_id`),
+  KEY `idx_biz_date` (`tenant_id`,`biz_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-业务单据主表';
+
+-- ---------------- 7. 单据明细 ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_document_item` (
+  `id`            BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `doc_id`        BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '主表ID',
+  `tenant_id`     VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '租户ID',
+  `product_id`    BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '商品ID',
+  `product_name`  VARCHAR(200)  NOT NULL DEFAULT '' COMMENT '商品名称快照',
+  `spec`          VARCHAR(200)  NOT NULL DEFAULT '' COMMENT '规格快照',
+  `unit`          VARCHAR(32)   NOT NULL DEFAULT '' COMMENT '计量单位（基本单位）',
+  `warehouse_id`  BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '明细行仓库（盘点用；单据级默认可0）',
+  `batch_no`      VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '批次号',
+  `quantity`      DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '数量（基本单位）',
+  `book_qty`      DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '账面数量（仅盘点）',
+  `executed_qty`  DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '已执行数量（订单被入库/出库累计）',
+  `ref_item_id`   BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '来源明细行ID（入库行←订单行/退货行←原单行）',
+  `unit_price`    DECIMAL(18,6) NOT NULL DEFAULT 0 COMMENT '单价（成本/进价/售价）',
+  `amount`        DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '行金额',
+  `production_date` DATE        DEFAULT NULL COMMENT '生产日期',
+  `expire_date`   DATE          DEFAULT NULL COMMENT '到期日期',
+  `remark`        VARCHAR(500)  NOT NULL DEFAULT '',
+  `sort_order`    INT           NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_doc` (`doc_id`),
+  KEY `idx_tenant_product` (`tenant_id`,`product_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-业务单据明细';
+
+-- ---------------- 8. 往来账（应收/应付） ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_partner_bill` (
+  `id`             BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`      VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '租户ID',
+  `bill_type`      TINYINT       NOT NULL DEFAULT 1 COMMENT '1应收 2应付',
+  `partner_type`   VARCHAR(20)   NOT NULL DEFAULT '' COMMENT 'customer/supplier',
+  `partner_id`     BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '往来单位ID',
+  `partner_name`   VARCHAR(200)  NOT NULL DEFAULT '' COMMENT '往来单位名称快照',
+  `source_doc_id`  BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '来源单据ID',
+  `source_doc_no`  VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '来源单据号',
+  `bill_date`      DATE          NOT NULL COMMENT '账期开始日',
+  `due_date`       DATE          DEFAULT NULL COMMENT '到期日（账期）',
+  `amount`         DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '发生额（红字为负）',
+  `settled_amount` DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '已核销额',
+  `status`         TINYINT       NOT NULL DEFAULT 0 COMMENT '0未核销 1部分核销 2已核销',
+  `remark`         VARCHAR(500)  NOT NULL DEFAULT '',
+  `create_time`    DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`    DATETIME      DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_tenant_type` (`tenant_id`,`bill_type`,`status`),
+  KEY `idx_partner` (`tenant_id`,`partner_type`,`partner_id`),
+  KEY `idx_doc` (`tenant_id`,`source_doc_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-往来账（应收/应付）';
+
+-- ---------------- 9. 收付款单 ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_fund_bill` (
+  `id`             BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`      VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '租户ID',
+  `fund_no`        VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '收付款单号',
+  `fund_type`      TINYINT       NOT NULL DEFAULT 1 COMMENT '1收款（冲应收） 2付款（冲应付） 3其他收入 4费用支出',
+  `partner_type`   VARCHAR(20)   NOT NULL DEFAULT '' COMMENT 'customer/supplier/空（其他收支）',
+  `partner_id`     BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '往来单位ID',
+  `partner_name`   VARCHAR(200)  NOT NULL DEFAULT '' COMMENT '往来单位名称快照',
+  `amount`         DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '收付金额（正数）',
+  `settled_amount` DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '已核销往来账金额（按单核销累计）',
+  `pay_method`     VARCHAR(30)   NOT NULL DEFAULT 'cash' COMMENT 'cash现金/bank银行/wechat微信/alipay支付宝/check支票/online在线',
+  `pay_account`    VARCHAR(100)  NOT NULL DEFAULT '' COMMENT '收款账户备注',
+  `biz_date`       DATE          NOT NULL COMMENT '收付日期',
+  `status`         TINYINT       NOT NULL DEFAULT 0 COMMENT '0草稿 1已确认 4已作废',
+  `remark`         VARCHAR(500)  NOT NULL DEFAULT '',
+  `create_user_id`   VARCHAR(64) NOT NULL DEFAULT '',
+  `create_user_name` VARCHAR(64) NOT NULL DEFAULT '',
+  `create_time`    DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time`    DATETIME      DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `delete_time`    DATETIME      DEFAULT NULL COMMENT '软删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_tenant_fundno` (`tenant_id`,`fund_no`),
+  KEY `idx_tenant_type` (`tenant_id`,`fund_type`,`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-收付款单';
+
+-- ---------------- 10. 收付款核销明细 ----------------
+CREATE TABLE IF NOT EXISTS `yz_backend_erp_fund_settle` (
+  `id`              BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `tenant_id`       VARCHAR(64)   NOT NULL DEFAULT '',
+  `fund_bill_id`    BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '收付款单ID',
+  `partner_bill_id` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '往来账ID',
+  `partner_bill_no` VARCHAR(64)   NOT NULL DEFAULT '' COMMENT '往来单据号快照',
+  `amount`          DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '本次核销额',
+  `create_time`     DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_fund` (`fund_bill_id`),
+  KEY `idx_bill` (`partner_bill_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ERP-收付款核销明细';
+
+-- ---------------- 11. 客户/供应商信用字段（幂等增列） ----------------
+-- MySQL 不支持 ADD COLUMN IF NOT EXISTS，用 INFORMATION_SCHEMA 判重 + PREPARE 动态执行。
+
+SET @has_credit := (SELECT COUNT(*) FROM information_schema.columns
+  WHERE table_schema=DATABASE() AND table_name='yz_backend_erp_customer' AND column_name='credit_limit');
+SET @sql := IF(@has_credit=0,
+  'ALTER TABLE `yz_backend_erp_customer` ADD COLUMN `credit_limit` DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT ''信用额度，0=不限'', ADD COLUMN `payment_days` INT NOT NULL DEFAULT 0 COMMENT ''账期天数''',
+  'SELECT ''yz_backend_erp_customer.credit_limit already exists''');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @has_spay := (SELECT COUNT(*) FROM information_schema.columns
+  WHERE table_schema=DATABASE() AND table_name='yz_backend_erp_supplier' AND column_name='payment_days');
+SET @sql := IF(@has_spay=0,
+  'ALTER TABLE `yz_backend_erp_supplier` ADD COLUMN `payment_days` INT NOT NULL DEFAULT 0 COMMENT ''账期天数''',
+  'SELECT ''yz_backend_erp_supplier.payment_days already exists''');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------- 结果校验 ----------------
+SELECT TABLE_NAME, TABLE_COMMENT FROM information_schema.tables
+WHERE table_schema=DATABASE() AND TABLE_NAME LIKE 'yz_backend_erp_%' ORDER BY TABLE_NAME;
diff --git a/go/docs/sql/erp_menus.sql b/go/docs/sql/erp_menus.sql
index a3e4390..0797758 100644
--- a/go/docs/sql/erp_menus.sql
+++ b/go/docs/sql/erp_menus.sql
@@ -9,7 +9,7 @@
 --   基础资料  -> 商品 / 供应商 / 客户 / 仓库
 --   采购管理  -> 采购订单 / 采购入库 / 采购退货
 --   销售管理  -> 销售订单 / 销售出库 / 销售退货
---   库存管理  -> 入库 / 出库 / 调拨 / 盘点 / 库存查询
+--   库存管理  -> 入库 / 出库 / 调拨 / 盘点 / 库存查询 / 库存预警
 --   财务管理  -> 应收 / 应付 / 收付款
 --   报表中心  -> 报表中心
 --   系统管理  -> 系统管理 / 账套管理（账套列表）/ 基础设置
@@ -18,7 +18,8 @@
 --   type       1=目录（大类），2=页面（小类）
 --   views      '[2]' 租户端：Web 租户后台与移动端共用同一份菜单
 --   platforms  留 NULL：展示端继承 erp 模块配置
---   未实现的页面 component_path 留空：Web 端为空白页，移动端落到「功能开发中」占位页
+--   component_path 由「3.1 页面文件登记」统一写入；未登记的菜单 Web 端为空白页，
+--                  移动端落到「功能开发中」占位页
 --   icon       完整 Font Awesome 类名；移动端必须落在 uniapp/utils/fa-icons.js 白名单内才显示
 
 SET @erp_id := (
@@ -139,6 +140,7 @@ INSERT INTO tmp_erp_leaf (parent_path, title, path, icon, sort, remark) VALUES
   ('/apps/erp/stock',    '调拨',     '/apps/erp/stock/transfer',      'fa-solid fa-right-left',            3, '仓库调拨'),
   ('/apps/erp/stock',    '盘点',     '/apps/erp/stock/taking',        'fa-solid fa-clipboard-check',       4, '库存盘点'),
   ('/apps/erp/stock',    '库存查询', '/apps/erp/stock/query',         'fa-solid fa-magnifying-glass',      5, '库存查询'),
+  ('/apps/erp/stock',    '库存预警', '/apps/erp/stock/warning',       'fa-solid fa-triangle-exclamation',   6, '缺货预警与智能补货'),
   ('/apps/erp/finance',  '应收',     '/apps/erp/finance/receivable',  'fa-solid fa-file-invoice-dollar',   1, '应收账款'),
   ('/apps/erp/finance',  '应付',     '/apps/erp/finance/payable',     'fa-solid fa-money-check-dollar',    2, '应付账款'),
   ('/apps/erp/finance',  '收付款',   '/apps/erp/finance/payment',     'fa-solid fa-cash-register',         3, '收付款单'),
@@ -155,6 +157,54 @@ WHERE e.id IS NULL;
 
 DROP TEMPORARY TABLE IF EXISTS tmp_erp_leaf;
 
+-- ---------- 3.1 页面文件登记 ----------
+-- 前端 pathResolver 先按 component_path 精确匹配，命中不到才按文件名模糊兜底，
+-- 模糊兜底会把菜单渲染成另一个同名 index.vue，所以这里一律写从 src/views 起的完整路径。
+DROP TEMPORARY TABLE IF EXISTS tmp_erp_page;
+CREATE TEMPORARY TABLE tmp_erp_page (
+  path           VARCHAR(200) NOT NULL,
+  component_path VARCHAR(255) NOT NULL,
+  PRIMARY KEY (path)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+INSERT INTO tmp_erp_page (path, component_path) VALUES
+  ('/apps/erp/basic/product',      '/apps/erp/basic/product.vue'),
+  ('/apps/erp/basic/warehouse',    '/apps/erp/basic/warehouse.vue'),
+  ('/apps/erp/purchase/order',     '/apps/erp/purchase/order.vue'),
+  ('/apps/erp/purchase/inbound',   '/apps/erp/purchase/inbound.vue'),
+  ('/apps/erp/purchase/return',    '/apps/erp/purchase/return.vue'),
+  ('/apps/erp/sales/order',        '/apps/erp/sales/order.vue'),
+  ('/apps/erp/sales/outbound',     '/apps/erp/sales/outbound.vue'),
+  ('/apps/erp/sales/return',       '/apps/erp/sales/return.vue'),
+  ('/apps/erp/stock/inbound',      '/apps/erp/stock/inbound.vue'),
+  ('/apps/erp/stock/outbound',     '/apps/erp/stock/outbound.vue'),
+  ('/apps/erp/stock/transfer',     '/apps/erp/stock/transfer.vue'),
+  ('/apps/erp/stock/taking',       '/apps/erp/stock/taking.vue'),
+  ('/apps/erp/stock/query',        '/apps/erp/stock/query.vue'),
+  ('/apps/erp/stock/warning',      '/apps/erp/stock/warning.vue'),
+  ('/apps/erp/finance/receivable', '/apps/erp/finance/receivable.vue'),
+  ('/apps/erp/finance/payable',    '/apps/erp/finance/payable.vue'),
+  ('/apps/erp/finance/payment',    '/apps/erp/finance/payment.vue'),
+  ('/apps/erp/report/index',       '/apps/erp/report/index.vue'),
+  ('/apps/erp/system/index',       '/apps/erp/system/index.vue'),
+  ('/apps/erp/ProgramManagement',  '/apps/erp/ProgramManagement/index.vue');
+
+UPDATE yz_system_menu m
+JOIN tmp_erp_page t ON t.path = m.path
+SET m.component_path = t.component_path, m.update_time = NOW()
+WHERE m.delete_time IS NULL AND (m.component_path IS NULL OR m.component_path <> t.component_path);
+
+-- 基础设置 历史上挂成目录(type=1)又没有子菜单，登记页面后按叶子菜单处理
+UPDATE yz_system_menu SET type = 2, update_time = NOW()
+WHERE delete_time IS NULL AND path = '/apps/erp/ProgramManagement' AND type = 1;
+
+-- 菜单行还没建（上一节未生效）时这里会列出来，执行后应重新跑一次本脚本
+SELECT t.path AS 未登记菜单 FROM tmp_erp_page t
+LEFT JOIN yz_system_menu m ON m.path = t.path AND m.delete_time IS NULL
+WHERE m.id IS NULL;
+
+DROP TEMPORARY TABLE IF EXISTS tmp_erp_page;
+
 -- 补图标：迁移过来的菜单原本没有图标，移动端会退化成兜底图标，这里只填空值、不覆盖已有配置
 UPDATE yz_system_menu SET icon = 'fa-solid fa-store', update_time = NOW()
 WHERE delete_time IS NULL AND path = '/apps/erp/suppliers' AND (icon IS NULL OR icon = '');
diff --git a/go/middleware/operationLog.go b/go/middleware/operationLog.go
index c74a165..97f720e 100644
--- a/go/middleware/operationLog.go
+++ b/go/middleware/operationLog.go
@@ -25,7 +25,6 @@ func BeginOperationLog(ctx *context.Context) {
 	if shouldSkipLogging(method, url) {
 		return
 	}
-	fmt.Printf("[oplog-begin] method=%s url=%s\n", method, url)
 
 	// 解析用户信息（直接从 header 解析，不依赖 JWT 中间件设置的 context）
 	var uid uint64
@@ -43,6 +42,12 @@ func BeginOperationLog(ctx *context.Context) {
 		}
 	}
 
+	// 匿名读请求不算操作：官网页面浏览和公开接口每次访问都落库，
+	// 审计表会被 uid=0/module=unknown/action=查询 的流水淹掉。写操作仍照常记录。
+	if method == "GET" && uid == 0 {
+		return
+	}
+
 	// 采集请求信息
 	reqBody := ""
 	if rb := ctx.Input.RequestBody; len(rb) > 0 {
@@ -72,11 +77,8 @@ func BeginOperationLog(ctx *context.Context) {
 			Status:        1,
 			ExecutionTime: 0,
 		}
-		_, err := models.Orm.Insert(logRow)
-		if err != nil {
+		if _, err := models.Orm.Insert(logRow); err != nil {
 			fmt.Printf("[oplog] INSERT ERROR: %v\n", err)
-		} else {
-			fmt.Printf("[oplog] INSERTED uid=%d module=%s action=%s\n", uid, module, action)
 		}
 	}()
 }
diff --git a/go/models/admin_role.go b/go/models/admin_role.go
index f9f5bf4..e421b5f 100644
--- a/go/models/admin_role.go
+++ b/go/models/admin_role.go
@@ -1,21 +1,23 @@
-package models
-
-import "time"
-
-// AdminRole 平台角色表 yz_system_admin_role
-type AdminRole struct {
-	ID         uint64     `orm:"column(id);pk;auto" json:"id"`
-	TenantID   uint64     `orm:"column(tenant_id);default(0)" json:"tenant_id"` // 租户ID：0=平台/全局，>0=具体租户（仅 cid=2 租户角色使用）
-	Cid        uint8      `orm:"column(cid);default(1)" json:"cid"`            // 1平台角色 2租户角色
-	IsCustom   uint8      `orm:"column(is_custom);default(0)" json:"is_custom"` // 是否租户自定义角色：0=系统/平台预置 1=租户在租户端自建（数据按租户隔离）
-	Name       string     `orm:"column(name);size(32)" json:"name"`
-	Status     uint8      `orm:"column(status);default(1)" json:"status"`
-	Rights     *string    `orm:"column(rights);type(text);null" json:"rights"`
-	CreateTime time.Time  `orm:"column(create_time);type(datetime);auto_now_add" json:"create_time"`
-	UpdateTime *time.Time `orm:"column(update_time);type(datetime);auto_now;null" json:"update_time"`
-	DeleteTime *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
-}
-
-func (m *AdminRole) TableName() string {
-	return "yz_system_admin_role"
-}
+package models
+
+import "time"
+
+// AdminRole 平台角色表 yz_system_admin_role
+type AdminRole struct {
+	ID           uint64     `orm:"column(id);pk;auto" json:"id"`
+	TenantID     uint64     `orm:"column(tenant_id);default(0)" json:"tenant_id"`           // 租户ID：0=平台/全局，>0=具体租户（仅 cid=2 租户角色使用）
+	Cid          uint8      `orm:"column(cid);default(1)" json:"cid"`                       // 1平台角色 2租户角色
+	IsCustom     uint8      `orm:"column(is_custom);default(0)" json:"is_custom"`           // 是否租户自定义角色：0=系统/平台预置 1=租户在租户端自建（数据按租户隔离）
+	IsLocked     uint8      `orm:"column(is_locked);default(0)" json:"is_locked"`           // 1=平台下发，租户端只读（不可改名/改权限/删除）
+	SourceRoleID uint64     `orm:"column(source_role_id);default(0)" json:"source_role_id"` // 来源角色ID（平台下发时记录，0=非下发）
+	Name         string     `orm:"column(name);size(32)" json:"name"`
+	Status       uint8      `orm:"column(status);default(1)" json:"status"`
+	Rights       *string    `orm:"column(rights);type(text);null" json:"rights"`
+	CreateTime   time.Time  `orm:"column(create_time);type(datetime);auto_now_add" json:"create_time"`
+	UpdateTime   *time.Time `orm:"column(update_time);type(datetime);auto_now;null" json:"update_time"`
+	DeleteTime   *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
+}
+
+func (m *AdminRole) TableName() string {
+	return "yz_system_admin_role"
+}
diff --git a/go/models/erp_inventory.go b/go/models/erp_inventory.go
new file mode 100644
index 0000000..eace90b
--- /dev/null
+++ b/go/models/erp_inventory.go
@@ -0,0 +1,365 @@
+package models
+
+import "time"
+
+// ERP 进销存交易层模型，对应 docs/sql/erp_inventory_schema.sql。
+//
+// 核心约定：
+//   - 库存结存 yz_backend_erp_stock 只允许由库存流水（yz_backend_erp_stock_ledger）
+//     驱动变更，任何业务代码不得直接改 quantity/cost_price；
+//   - 十类业务单据统一存 yz_backend_erp_document(+_item)，用 doc_type 区分；
+//   - tenant_id 为字符串（与 ERP/CRM 家族表一致），便于与客户/供应商表 JOIN。
+
+// 单据类型
+const (
+	ErpDocPurchaseOrder   = "purchase_order"   // 采购订单
+	ErpDocPurchaseIn      = "purchase_in"      // 采购入库
+	ErpDocPurchaseReturn  = "purchase_return"  // 采购退货
+	ErpDocSalesOrder      = "sales_order"      // 销售订单
+	ErpDocSalesOut        = "sales_out"        // 销售出库
+	ErpDocSalesReturn     = "sales_return"     // 销售退货
+	ErpDocOtherIn         = "other_in"         // 其他入库
+	ErpDocOtherOut        = "other_out"        // 其他出库
+	ErpDocTransfer        = "transfer"         // 库存调拨
+	ErpDocStockTake       = "stock_take"       // 库存盘点
+)
+
+// 单据状态
+const (
+	ErpDocStatusDraft     int8 = 0 // 草稿
+	ErpDocStatusPending   int8 = 1 // 审批中
+	ErpDocStatusApproved  int8 = 2 // 已生效
+	ErpDocStatusRejected  int8 = 3 // 已驳回
+	ErpDocStatusCancelled int8 = 4 // 已作废
+)
+
+// 往来账类型
+const (
+	ErpBillReceivable int8 = 1 // 应收
+	ErpBillPayable    int8 = 2 // 应付
+)
+
+// 收付款类型
+const (
+	ErpFundReceive int8 = 1 // 收款
+	ErpFundPay     int8 = 2 // 付款
+	ErpFundOtherIn int8 = 3 // 其他收入
+	ErpFundExpense int8 = 4 // 费用支出
+)
+
+// 流水方向
+const (
+	ErpStockIn  int8 = 1
+	ErpStockOut int8 = -1
+)
+
+// ErpProductCategory 商品分类: yz_backend_erp_product_category
+type ErpProductCategory struct {
+	ID           uint64     `orm:"column(id);pk;auto" json:"id"`
+	TenantID     string     `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	CategoryName string     `orm:"column(category_name);size(100)" json:"category_name"`
+	ParentID     uint64     `orm:"column(parent_id);default(0)" json:"parent_id"`
+	SortOrder    int        `orm:"column(sort_order);default(0)" json:"sort_order"`
+	Status       int8       `orm:"column(status);default(1)" json:"status"`
+	Remark       string     `orm:"column(remark);size(500)" json:"remark"`
+	CreateTime   time.Time  `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
+	UpdateTime   time.Time  `orm:"column(update_time);type(datetime);null;auto_now" json:"update_time"`
+	DeleteTime   *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
+}
+
+func (m *ErpProductCategory) TableName() string { return "yz_backend_erp_product_category" }
+
+// ErpProduct 商品档案: yz_backend_erp_product
+type ErpProduct struct {
+	ID             uint64  `orm:"column(id);pk;auto" json:"id"`
+	TenantID       string  `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	ProductCode    string  `orm:"column(product_code);size(64)" json:"product_code"`
+	ProductName    string  `orm:"column(product_name);size(200)" json:"product_name"`
+	CategoryID     uint64  `orm:"column(category_id);default(0)" json:"category_id"`
+	Brand          string  `orm:"column(brand);size(100)" json:"brand"`
+	Spec           string  `orm:"column(spec);size(200)" json:"spec"`
+	Model          string  `orm:"column(model);size(100)" json:"model"`
+	BaseUnit       string  `orm:"column(base_unit);size(32)" json:"base_unit"`
+	AuxUnit        string  `orm:"column(aux_unit);size(32)" json:"aux_unit"`
+	AuxRatio       float64 `orm:"column(aux_ratio);type(decimal);digits(18);decimals(4);default(1)" json:"aux_ratio"`
+	Barcode        string  `orm:"column(barcode);size(64)" json:"barcode"`
+	ExtraBarcodes  string  `orm:"column(extra_barcodes);size(500)" json:"extra_barcodes"`
+	PurchasePrice  float64 `orm:"column(purchase_price);type(decimal);digits(18);decimals(4)" json:"purchase_price"`
+	SalePrice      float64 `orm:"column(sale_price);type(decimal);digits(18);decimals(4)" json:"sale_price"`
+	WholesalePrice float64 `orm:"column(wholesale_price);type(decimal);digits(18);decimals(4)" json:"wholesale_price"`
+	MemberPrice    float64 `orm:"column(member_price);type(decimal);digits(18);decimals(4)" json:"member_price"`
+	MinPrice       float64 `orm:"column(min_price);type(decimal);digits(18);decimals(4)" json:"min_price"`
+	TaxRate        float64 `orm:"column(tax_rate);type(decimal);digits(9);decimals(4)" json:"tax_rate"`
+	SafetyQty      float64 `orm:"column(safety_qty);type(decimal);digits(18);decimals(4)" json:"safety_qty"`
+	MaxQty         float64 `orm:"column(max_qty);type(decimal);digits(18);decimals(4)" json:"max_qty"`
+	ShelfLifeDays  int     `orm:"column(shelf_life_days);default(0)" json:"shelf_life_days"`
+	EnableBatch    int8    `orm:"column(enable_batch);default(0)" json:"enable_batch"`
+	ImageURL       string  `orm:"column(image_url);size(500)" json:"image_url"`
+	Status         int8    `orm:"column(status);default(1)" json:"status"`
+	IsDraft        int8    `orm:"column(is_draft);default(0)" json:"is_draft"`
+	Remark         string  `orm:"column(remark);type(text);null" json:"remark"`
+	CreateUserID   string  `orm:"column(create_user_id);size(64)" json:"create_user_id"`
+	CreateTime     time.Time `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
+	UpdateTime     time.Time `orm:"column(update_time);type(datetime);null;auto_now" json:"update_time"`
+	DeleteTime     *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
+
+	// 联查展示字段（非表列）
+	CategoryName string                   `orm:"-" json:"category_name"`
+	TotalStock   float64                  `orm:"-" json:"total_stock"`
+	SafetyState  string                   `orm:"-" json:"safety_state"`
+	Stocks       []map[string]interface{} `orm:"-" json:"stocks"`
+}
+
+func (m *ErpProduct) TableName() string { return "yz_backend_erp_product" }
+
+// ErpWarehouse 仓库: yz_backend_erp_warehouse
+type ErpWarehouse struct {
+	ID            uint64     `orm:"column(id);pk;auto" json:"id"`
+	TenantID      string     `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	WarehouseCode string     `orm:"column(warehouse_code);size(64)" json:"warehouse_code"`
+	WarehouseName string     `orm:"column(warehouse_name);size(100)" json:"warehouse_name"`
+	Address       string     `orm:"column(address);size(255)" json:"address"`
+	Manager       string     `orm:"column(manager);size(50)" json:"manager"`
+	Phone         string     `orm:"column(phone);size(20)" json:"phone"`
+	IsDefault     int8       `orm:"column(is_default);default(0)" json:"is_default"`
+	Status        int8       `orm:"column(status);default(1)" json:"status"`
+	Remark        string     `orm:"column(remark);size(500)" json:"remark"`
+	CreateTime    time.Time  `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
+	UpdateTime    time.Time  `orm:"column(update_time);type(datetime);null;auto_now" json:"update_time"`
+	DeleteTime    *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
+}
+
+func (m *ErpWarehouse) TableName() string { return "yz_backend_erp_warehouse" }
+
+// ErpStock 库存结存: yz_backend_erp_stock。唯一键 (tenant, product, warehouse, batch)。
+type ErpStock struct {
+	ID          uint64    `orm:"column(id);pk;auto" json:"id"`
+	TenantID    string    `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	ProductID   uint64    `orm:"column(product_id)" json:"product_id"`
+	WarehouseID uint64    `orm:"column(warehouse_id)" json:"warehouse_id"`
+	BatchNo     string    `orm:"column(batch_no);size(64)" json:"batch_no"`
+	Quantity    float64   `orm:"column(quantity);type(decimal);digits(18);decimals(4)" json:"quantity"`
+	CostPrice   float64   `orm:"column(cost_price);type(decimal);digits(18);decimals(6)" json:"cost_price"`
+	UpdateTime  time.Time `orm:"column(update_time);type(datetime);null;auto_now" json:"update_time"`
+
+	// 联查展示字段（非表列）
+	ProductName  string `orm:"-" json:"product_name"`
+	ProductCode  string `orm:"-" json:"product_code"`
+	Spec         string `orm:"-" json:"spec"`
+	BaseUnit     string `orm:"-" json:"base_unit"`
+	WarehouseName string `orm:"-" json:"warehouse_name"`
+	SafetyQty    float64 `orm:"-" json:"safety_qty"`
+	MaxQty       float64 `orm:"-" json:"max_qty"`
+	PurchasePrice float64 `orm:"-" json:"purchase_price"`
+}
+
+func (m *ErpStock) TableName() string { return "yz_backend_erp_stock" }
+
+// ErpStockLedger 库存流水（只增不改不删）: yz_backend_erp_stock_ledger
+type ErpStockLedger struct {
+	ID           uint64     `orm:"column(id);pk;auto" json:"id"`
+	TenantID     string     `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	ProductID    uint64     `orm:"column(product_id)" json:"product_id"`
+	WarehouseID  uint64     `orm:"column(warehouse_id)" json:"warehouse_id"`
+	BatchNo      string     `orm:"column(batch_no);size(64)" json:"batch_no"`
+	Direction    int8       `orm:"column(direction);default(1)" json:"direction"`
+	Quantity     float64    `orm:"column(quantity);type(decimal);digits(18);decimals(4)" json:"quantity"`
+	BeforeQty    float64    `orm:"column(before_qty);type(decimal);digits(18);decimals(4)" json:"before_qty"`
+	AfterQty     float64    `orm:"column(after_qty);type(decimal);digits(18);decimals(4)" json:"after_qty"`
+	UnitCost     float64    `orm:"column(unit_cost);type(decimal);digits(18);decimals(6)" json:"unit_cost"`
+	TotalCost    float64    `orm:"column(total_cost);type(decimal);digits(18);decimals(2)" json:"total_cost"`
+	DocType      string     `orm:"column(doc_type);size(30)" json:"doc_type"`
+	DocID        uint64     `orm:"column(doc_id)" json:"doc_id"`
+	DocNo        string     `orm:"column(doc_no);size(64)" json:"doc_no"`
+	DocItemID    uint64     `orm:"column(doc_item_id)" json:"doc_item_id"`
+	ProductionDate *time.Time `orm:"column(production_date);type(date);null" json:"production_date"`
+	ExpireDate   *time.Time `orm:"column(expire_date);type(date);null" json:"expire_date"`
+	OperatorID   string     `orm:"column(operator_id);size(64)" json:"operator_id"`
+	OperatorName string     `orm:"column(operator_name);size(64)" json:"operator_name"`
+	Remark       string     `orm:"column(remark);size(500)" json:"remark"`
+	CreateTime   time.Time  `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
+
+	ProductName   string `orm:"-" json:"product_name"`
+	ProductCode   string `orm:"-" json:"product_code"`
+	Spec          string `orm:"-" json:"spec"`
+	BaseUnit      string `orm:"-" json:"base_unit"`
+	WarehouseName string `orm:"-" json:"warehouse_name"`
+}
+
+func (m *ErpStockLedger) TableName() string { return "yz_backend_erp_stock_ledger" }
+
+// ErpDocument 业务单据主表: yz_backend_erp_document
+type ErpDocument struct {
+	ID            uint64  `orm:"column(id);pk;auto" json:"id"`
+	TenantID      string  `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	DocNo         string  `orm:"column(doc_no);size(64)" json:"doc_no"`
+	DocType       string  `orm:"column(doc_type);size(30)" json:"doc_type"`
+	BizDate       time.Time `orm:"column(biz_date);type(date)" json:"biz_date"`
+	WarehouseID   uint64  `orm:"column(warehouse_id);default(0)" json:"warehouse_id"`
+	ToWarehouseID uint64  `orm:"column(to_warehouse_id);default(0)" json:"to_warehouse_id"`
+	PartnerType   string  `orm:"column(partner_type);size(20)" json:"partner_type"`
+	PartnerID     uint64  `orm:"column(partner_id);default(0)" json:"partner_id"`
+	PartnerName   string  `orm:"column(partner_name);size(200)" json:"partner_name"`
+	SourceDocID   uint64  `orm:"column(source_doc_id);default(0)" json:"source_doc_id"`
+	TotalQty      float64 `orm:"column(total_qty);type(decimal);digits(18);decimals(4)" json:"total_qty"`
+	TotalAmount   float64 `orm:"column(total_amount);type(decimal);digits(18);decimals(2)" json:"total_amount"`
+	DiscountAmount float64 `orm:"column(discount_amount);type(decimal);digits(18);decimals(2)" json:"discount_amount"`
+	ActualAmount  float64 `orm:"column(actual_amount);type(decimal);digits(18);decimals(2)" json:"actual_amount"`
+	Status        int8    `orm:"column(status);default(0)" json:"status"`
+	InstanceID    uint64  `orm:"column(instance_id);default(0)" json:"instance_id"`
+	AuditorID     string  `orm:"column(auditor_id);size(64)" json:"auditor_id"`
+	AuditorName   string  `orm:"column(auditor_name);size(64)" json:"auditor_name"`
+	AuditTime     *time.Time `orm:"column(audit_time);type(datetime);null" json:"audit_time"`
+	Remark        string  `orm:"column(remark);type(text);null" json:"remark"`
+	CreateUserID  string  `orm:"column(create_user_id);size(64)" json:"create_user_id"`
+	CreateUserName string `orm:"column(create_user_name);size(64)" json:"create_user_name"`
+	CreateTime    time.Time `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
+	UpdateTime    time.Time `orm:"column(update_time);type(datetime);null;auto_now" json:"update_time"`
+	DeleteTime    *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
+
+	Items    []ErpDocumentItem `orm:"-" json:"items,omitempty"`
+	WarehouseName   string `orm:"-" json:"warehouse_name"`
+	ToWarehouseName string `orm:"-" json:"to_warehouse_name"`
+	SourceDocNo     string `orm:"-" json:"source_doc_no"`
+	DocTypeLabel    string `orm:"-" json:"doc_type_label"`
+	StatusLabel     string `orm:"-" json:"status_label"`
+	Instance        map[string]interface{} `orm:"-" json:"instance,omitempty"`
+}
+
+func (m *ErpDocument) TableName() string { return "yz_backend_erp_document" }
+
+// ErpDocumentItem 业务单据明细: yz_backend_erp_document_item
+type ErpDocumentItem struct {
+	ID           uint64  `orm:"column(id);pk;auto" json:"id"`
+	DocID        uint64  `orm:"column(doc_id)" json:"doc_id"`
+	TenantID     string  `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	ProductID    uint64  `orm:"column(product_id)" json:"product_id"`
+	ProductName  string  `orm:"column(product_name);size(200)" json:"product_name"`
+	Spec         string  `orm:"column(spec);size(200)" json:"spec"`
+	Unit         string  `orm:"column(unit);size(32)" json:"unit"`
+	WarehouseID  uint64  `orm:"column(warehouse_id);default(0)" json:"warehouse_id"`
+	BatchNo      string  `orm:"column(batch_no);size(64)" json:"batch_no"`
+	Quantity     float64 `orm:"column(quantity);type(decimal);digits(18);decimals(4)" json:"quantity"`
+	BookQty      float64 `orm:"column(book_qty);type(decimal);digits(18);decimals(4)" json:"book_qty"`
+	ExecutedQty  float64 `orm:"column(executed_qty);type(decimal);digits(18);decimals(4)" json:"executed_qty"`
+	RefItemID    uint64  `orm:"column(ref_item_id);default(0)" json:"ref_item_id"`
+	UnitPrice    float64 `orm:"column(unit_price);type(decimal);digits(18);decimals(6)" json:"unit_price"`
+	Amount       float64 `orm:"column(amount);type(decimal);digits(18);decimals(2)" json:"amount"`
+	ProductionDate *time.Time `orm:"column(production_date);type(date);null" json:"production_date"`
+	ExpireDate   *time.Time `orm:"column(expire_date);type(date);null" json:"expire_date"`
+	Remark       string  `orm:"column(remark);size(500)" json:"remark"`
+	SortOrder    int     `orm:"column(sort_order);default(0)" json:"sort_order"`
+
+	ProductCode string  `orm:"-" json:"product_code"`
+	BaseUnit    string  `orm:"-" json:"base_unit"`
+	StockQty    float64 `orm:"-" json:"stock_qty"` // 当前可用库存（开单时展示）
+}
+
+func (m *ErpDocumentItem) TableName() string { return "yz_backend_erp_document_item" }
+
+// ErpPartnerBill 往来账（应收/应付）: yz_backend_erp_partner_bill
+type ErpPartnerBill struct {
+	ID           uint64    `orm:"column(id);pk;auto" json:"id"`
+	TenantID     string    `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	BillType     int8      `orm:"column(bill_type);default(1)" json:"bill_type"`
+	PartnerType  string    `orm:"column(partner_type);size(20)" json:"partner_type"`
+	PartnerID    uint64    `orm:"column(partner_id)" json:"partner_id"`
+	PartnerName  string    `orm:"column(partner_name);size(200)" json:"partner_name"`
+	SourceDocID  uint64    `orm:"column(source_doc_id)" json:"source_doc_id"`
+	SourceDocNo  string    `orm:"column(source_doc_no);size(64)" json:"source_doc_no"`
+	BillDate     time.Time `orm:"column(bill_date);type(date)" json:"bill_date"`
+	DueDate      *time.Time `orm:"column(due_date);type(date);null" json:"due_date"`
+	Amount       float64   `orm:"column(amount);type(decimal);digits(18);decimals(2)" json:"amount"`
+	SettledAmount float64  `orm:"column(settled_amount);type(decimal);digits(18);decimals(2)" json:"settled_amount"`
+	Status       int8      `orm:"column(status);default(0)" json:"status"`
+	Remark       string    `orm:"column(remark);size(500)" json:"remark"`
+	CreateTime   time.Time `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
+	UpdateTime   time.Time `orm:"column(update_time);type(datetime);null;auto_now" json:"update_time"`
+}
+
+func (m *ErpPartnerBill) TableName() string { return "yz_backend_erp_partner_bill" }
+
+// ErpFundBill 收付款单: yz_backend_erp_fund_bill
+type ErpFundBill struct {
+	ID            uint64  `orm:"column(id);pk;auto" json:"id"`
+	TenantID      string  `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	FundNo        string  `orm:"column(fund_no);size(64)" json:"fund_no"`
+	FundType      int8    `orm:"column(fund_type);default(1)" json:"fund_type"`
+	PartnerType   string  `orm:"column(partner_type);size(20)" json:"partner_type"`
+	PartnerID     uint64  `orm:"column(partner_id);default(0)" json:"partner_id"`
+	PartnerName   string  `orm:"column(partner_name);size(200)" json:"partner_name"`
+	Amount        float64 `orm:"column(amount);type(decimal);digits(18);decimals(2)" json:"amount"`
+	SettledAmount float64 `orm:"column(settled_amount);type(decimal);digits(18);decimals(2)" json:"settled_amount"`
+	PayMethod     string  `orm:"column(pay_method);size(30);default(cash)" json:"pay_method"`
+	PayAccount    string  `orm:"column(pay_account);size(100)" json:"pay_account"`
+	BizDate       time.Time `orm:"column(biz_date);type(date)" json:"biz_date"`
+	Status        int8    `orm:"column(status);default(0)" json:"status"`
+	Remark        string  `orm:"column(remark);size(500)" json:"remark"`
+	CreateUserID   string `orm:"column(create_user_id);size(64)" json:"create_user_id"`
+	CreateUserName string `orm:"column(create_user_name);size(64)" json:"create_user_name"`
+	CreateTime    time.Time  `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
+	UpdateTime    time.Time  `orm:"column(update_time);type(datetime);null;auto_now" json:"update_time"`
+	DeleteTime    *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
+
+	Settles []ErpFundSettle `orm:"-" json:"settles,omitempty"`
+}
+
+func (m *ErpFundBill) TableName() string { return "yz_backend_erp_fund_bill" }
+
+// ErpFundSettle 收付款核销明细: yz_backend_erp_fund_settle
+type ErpFundSettle struct {
+	ID            uint64    `orm:"column(id);pk;auto" json:"id"`
+	TenantID      string    `orm:"column(tenant_id);size(64)" json:"tenant_id"`
+	FundBillID    uint64    `orm:"column(fund_bill_id)" json:"fund_bill_id"`
+	PartnerBillID uint64    `orm:"column(partner_bill_id)" json:"partner_bill_id"`
+	PartnerBillNo string    `orm:"column(partner_bill_no);size(64)" json:"partner_bill_no"`
+	Amount        float64   `orm:"column(amount);type(decimal);digits(18);decimals(2)" json:"amount"`
+	CreateTime    time.Time `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
+}
+
+func (m *ErpFundSettle) TableName() string { return "yz_backend_erp_fund_settle" }
+
+// ErpDocTypeLabel 单据类型中文名（后端返回给两端的统一口径）
+var ErpDocTypeLabel = map[string]string{
+	ErpDocPurchaseOrder:  "采购订单",
+	ErpDocPurchaseIn:     "采购入库",
+	ErpDocPurchaseReturn: "采购退货",
+	ErpDocSalesOrder:     "销售订单",
+	ErpDocSalesOut:       "销售出库",
+	ErpDocSalesReturn:    "销售退货",
+	ErpDocOtherIn:        "其他入库",
+	ErpDocOtherOut:       "其他出库",
+	ErpDocTransfer:       "库存调拨",
+	ErpDocStockTake:      "库存盘点",
+}
+
+// ErpDocAffectsStock 单据生效是否产生库存流水
+func ErpDocAffectsStock(docType string) bool {
+	switch docType {
+	case ErpDocPurchaseOrder, ErpDocSalesOrder:
+		return false
+	default:
+		return true
+	}
+}
+
+// ErpDocStatusLabel 单据状态中文名
+func ErpDocStatusLabel(status int8) string {
+	switch status {
+	case ErpDocStatusPending:
+		return "审批中"
+	case ErpDocStatusApproved:
+		return "已生效"
+	case ErpDocStatusRejected:
+		return "已驳回"
+	case ErpDocStatusCancelled:
+		return "已作废"
+	default:
+		return "草稿"
+	}
+}
+
+// ErpDocBizTypePrefix 单据类型对应审批流 biz_type（与 approval.go 常量一致）
+func ErpDocApprovalBizType(docType string) string {
+	return "erp_" + docType
+}
diff --git a/go/models/init.go b/go/models/init.go
index 7eb1f93..e3e40f8 100644
--- a/go/models/init.go
+++ b/go/models/init.go
@@ -131,6 +131,17 @@ func Init(_ string) {
 		new(ErpAccountSet),
 		new(ErpNormalSetting),
 		new(ErpCompanyContact),
+		// 进销存交易层（docs/sql/erp_inventory_schema.sql）
+		new(ErpProductCategory),
+		new(ErpProduct),
+		new(ErpWarehouse),
+		new(ErpStock),
+		new(ErpStockLedger),
+		new(ErpDocument),
+		new(ErpDocumentItem),
+		new(ErpPartnerBill),
+		new(ErpFundBill),
+		new(ErpFundSettle),
 		new(BackendAiProvider),
 		new(BackendAiChatSession),
 		new(BackendAiChatMessage),
diff --git a/go/models/tenant_crm_customer.go b/go/models/tenant_crm_customer.go
index bd713d2..2a495b0 100644
--- a/go/models/tenant_crm_customer.go
+++ b/go/models/tenant_crm_customer.go
@@ -40,6 +40,8 @@ type TenantCrmCustomer struct {
 	PoolInTime    *time.Time `orm:"column(pool_in_time);type(datetime);null" json:"pool_in_time"`   // 进入公海时间
 	PoolReason    string     `orm:"column(pool_reason);size(200);null" json:"pool_reason"`          // 移入公海原因
 	CreateUserID    string     `orm:"column(create_user_id);size(64);null" json:"create_user_id"`  // 创建人用户ID，用于删除权限校验
+	CreditLimit     float64    `orm:"column(credit_limit);type(decimal);digits(18);decimals(2);default(0)" json:"credit_limit"` // 信用额度，0=不限
+	PaymentDays     int        `orm:"column(payment_days);default(0)" json:"payment_days"`         // 账期天数
 	CreateTime      time.Time  `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
 	UpdateTime      time.Time  `orm:"column(update_time);auto_now;type(datetime)" json:"update_time"`
 	DeleteTime      *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
diff --git a/go/models/tenant_crm_supplier.go b/go/models/tenant_crm_supplier.go
index 3d75d16..55b3e10 100644
--- a/go/models/tenant_crm_supplier.go
+++ b/go/models/tenant_crm_supplier.go
@@ -33,6 +33,7 @@ type TenantCrmSupplier struct {
 	RegisteredAddress string   `orm:"column(registered_address);size(255)" json:"registered_address"`
 	RegisteredPhone string     `orm:"column(registered_phone);size(50)" json:"registered_phone"`
 	CreateUserID    string     `orm:"column(create_user_id);size(64);null" json:"create_user_id"` // 创建人用户ID，用于删除权限校验
+	PaymentDays     int        `orm:"column(payment_days);default(0)" json:"payment_days"`         // 账期天数
 	CreateTime      time.Time  `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
 	UpdateTime      time.Time  `orm:"column(update_time);auto_now;type(datetime)" json:"update_time"`
 	DeleteTime      *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
diff --git a/go/pkg/identity/identity.go b/go/pkg/identity/identity.go
new file mode 100644
index 0000000..df07564
--- /dev/null
+++ b/go/pkg/identity/identity.go
@@ -0,0 +1,172 @@
+// Package identity 是所有接入端唯一的"当前请求是谁、能不能用这个端"入口。
+//
+// 背景：此前 88 个控制器各自从 Authorization 头解令牌、各自拼 user_type 白名单，
+// 一共 6 种写法，签发方与消费方一旦口径不一致就会出现"令牌有效却全判无权访问"
+// 这类故障（认证中心换码路径曾硬编码 user_type=tenant 即为一例）。
+// 新代码一律用 Require，存量控制器把自行解析的那段换成 Claims，
+// 全仓不再有任何一处自己拼「SplitN Authorization + ParseToken + 比 user_type」。
+package identity
+
+import (
+	"errors"
+	"net/http"
+	"strings"
+
+	"server/pkg/jwtutil"
+
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// End 接入端。令牌中的 user_type 必须属于所放行端之一，才能调用该端接口。
+type End string
+
+const (
+	EndPlatform End = "platform" // 平台端 /platform/**
+	EndBackend  End = "backend"  // 租户（用户）端 /backend/**
+	EndApp      End = "app"      // 移动端与小程序 /api/**
+)
+
+// 错误分类直接决定 HTTP 状态码，因此必须与前端拦截器行为对齐：
+// 令牌类问题返 401，request.js 会静默续期后用新令牌重放；
+// 端不匹配返 403，续期救不回来，若也返 401 只会白跑一轮刷新再失败。
+var (
+	ErrNoToken   = errors.New("未提供认证信息")
+	ErrBadFormat = errors.New("认证信息格式错误")
+	ErrExpired   = errors.New("token已过期")
+	ErrInvalid   = errors.New("无效的token")
+	ErrWrongEnd  = errors.New("无权访问")
+)
+
+// Identity 一次请求解析出的调用者身份。
+// TenantID 只来自令牌，不接受任何请求参数覆盖，这是租户间隔离的唯一依据。
+type Identity struct {
+	UserID   int // 认证中心 identity_id
+	Username string
+	TenantID uint64 // 平台端账号为 0
+	End      End
+	ClientID string
+	Sid      string
+}
+
+// normalizeEnd 把令牌里的 user_type 归一到端。
+// "tenant" 是认证中心换码路径早期硬编码签发的历史值，只可能来自 backend 登录流程，
+// 按 backend 放行；否则存量会话会在收口后集体变 403，而重新登录才能救回来。
+func normalizeEnd(userType string) End {
+	if userType == "tenant" {
+		return EndBackend
+	}
+	return End(userType)
+}
+
+// Claims 解析 Authorization 头（含 "Bearer " 前缀）并校验其所属端在 allowed 之内，
+// 返回原始 claims。
+//
+// 存量控制器普遍按 claims.TenantId / claims.UserID 取值，逐一改成 Identity 既无收益也易出错；
+// 收口的目标是「解析与判端只有这一处」，取值方式可以沿用旧的。新代码请用 Require。
+func Claims(auth string, allowed ...End) (*jwtutil.Claims, error) {
+	auth = strings.TrimSpace(auth)
+	if auth == "" {
+		return nil, ErrNoToken
+	}
+	parts := strings.SplitN(auth, " ", 2)
+	// 认证方案名按 RFC 7235 大小写不敏感，个别控制器一直用 EqualFold，这里统一放宽。
+	if len(parts) != 2 || !strings.EqualFold(parts[0], "Bearer") {
+		return nil, ErrBadFormat
+	}
+
+	claims, err := jwtutil.ParseToken(parts[1])
+	if err != nil {
+		return nil, classify(err)
+	}
+
+	end := normalizeEnd(claims.UserType)
+	granted := false
+	for _, a := range allowed {
+		if a == end {
+			granted = true
+			break
+		}
+	}
+	if !granted {
+		return nil, ErrWrongEnd
+	}
+	return claims, nil
+}
+
+// PathEnd 按路由前缀判定接口属于哪个端；前缀不属于任何端时 ok=false。
+func PathEnd(path string) (End, bool) {
+	p := strings.ToLower(path)
+	switch {
+	case strings.HasPrefix(p, "/platform/"):
+		return EndPlatform, true
+	case strings.HasPrefix(p, "/backend/"):
+		return EndBackend, true
+	case strings.HasPrefix(p, "/api/"), strings.HasPrefix(p, "/app/"):
+		return EndApp, true
+	}
+	return "", false
+}
+
+// ClaimsByPath 给「同一个控制器同时挂在平台端和租户端前缀下」的接口用
+// （站点设置、功能模块清单就是这种）。放行哪个端由请求路径决定，
+// 而不是拿任意一端的合法令牌都能读写另一端的数据。
+func ClaimsByPath(auth, path string) (*jwtutil.Claims, error) {
+	if end, ok := PathEnd(path); ok {
+		return Claims(auth, end)
+	}
+	return Claims(auth, EndPlatform, EndBackend, EndApp)
+}
+
+// Require 解析请求的 Bearer 令牌，并校验其所属端在 allowed 之内。
+// 用法：identity.Require(c.Ctx.Request, identity.EndBackend)，
+// 确实需要跨端的接口再传多个，如 (..., identity.EndBackend, identity.EndApp)。
+func Require(r *http.Request, allowed ...End) (*Identity, error) {
+	if r == nil {
+		return nil, ErrNoToken
+	}
+	claims, err := Claims(r.Header.Get("Authorization"), allowed...)
+	if err != nil {
+		return nil, err
+	}
+
+	tid := claims.TenantId
+	if tid < 0 {
+		tid = 0
+	}
+	return &Identity{
+		UserID:   claims.UserID,
+		Username: claims.Username,
+		TenantID: uint64(tid),
+		End:      normalizeEnd(claims.UserType),
+		ClientID: claims.ClientID,
+		Sid:      claims.Sid,
+	}, nil
+}
+
+// classify 把令牌解析错误归一成"过期"或"无效"两类，二者都属令牌问题、都返 401，
+// 区分开是为了让前端与日志能看出是该续期还是该重新登录。
+// golang-jwt 的过期错误可能被包装，历史代码也用过裸字符串判断，两者都保留。
+func classify(err error) error {
+	if errors.Is(err, jwt.ErrTokenExpired) || strings.Contains(err.Error(), "expired") {
+		return ErrExpired
+	}
+	return ErrInvalid
+}
+
+// Status 返回该错误应使用的 HTTP 状态码。
+func Status(err error) int {
+	if errors.Is(err, ErrWrongEnd) {
+		return http.StatusForbidden
+	}
+	return http.StatusUnauthorized
+}
+
+// IsAuth 判断错误是否出自本包的鉴权分类。
+// 供「一个 fail(err) 同时兜业务错误与鉴权错误」的控制器使用：
+// 业务错误要按自己的语义给状态码，鉴权错误则必须走 Status，
+// 否则坏令牌会被当成 400 参数错误返回，前端既不会续期也不会跳登录。
+func IsAuth(err error) bool {
+	return errors.Is(err, ErrNoToken) || errors.Is(err, ErrBadFormat) ||
+		errors.Is(err, ErrExpired) || errors.Is(err, ErrInvalid) ||
+		errors.Is(err, ErrWrongEnd)
+}
diff --git a/go/pkg/identity/identity_test.go b/go/pkg/identity/identity_test.go
new file mode 100644
index 0000000..2269ba4
--- /dev/null
+++ b/go/pkg/identity/identity_test.go
@@ -0,0 +1,114 @@
+package identity
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"server/pkg/jwtutil"
+
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// 这些用例只覆盖不依赖数据库的身份判定：端归属、令牌错误分类、状态码映射。
+
+func mint(t *testing.T, userType string) string {
+	t.Helper()
+	tok, err := jwtutil.GenerateToken(4, "hero920103", 2, userType)
+	if err != nil {
+		t.Fatalf("签发测试令牌失败: %v", err)
+	}
+	return tok
+}
+
+func requestWith(auth string) *http.Request {
+	r := httptest.NewRequest(http.MethodGet, "/backend/modules/getTenantList", nil)
+	if auth != "" {
+		r.Header.Set("Authorization", auth)
+	}
+	return r
+}
+
+func TestRequireAcceptsMatchingEnd(t *testing.T) {
+	id, err := Require(requestWith("Bearer "+mint(t, string(EndBackend))), EndBackend)
+	if err != nil {
+		t.Fatalf("backend 令牌应放行，实际报错 %v", err)
+	}
+	if id.End != EndBackend || id.UserID != 4 || id.TenantID != 2 || id.Username != "hero920103" {
+		t.Fatalf("身份解析结果不符：%+v", id)
+	}
+}
+
+func TestRequireRejectsForeignEnd(t *testing.T) {
+	// 认证中心换码路径曾签发 user_type=tenant，落到这里就是「令牌有效但端不匹配」。
+	// 这类失败续期救不回来，必须是 403，不能触发前端静默续期重放。
+	for _, userType := range []string{"tenant", "user", "employee", "platform", ""} {
+		_, err := Require(requestWith("Bearer "+mint(t, userType)), EndBackend)
+		if !errors.Is(err, ErrWrongEnd) {
+			t.Fatalf("user_type=%q 应判为端不匹配，实际 %v", userType, err)
+		}
+		if got := Status(err); got != http.StatusForbidden {
+			t.Fatalf("user_type=%q 期望 403，实际 %d", userType, got)
+		}
+	}
+}
+
+func TestRequireAllowsMultipleEnds(t *testing.T) {
+	r := requestWith("Bearer " + mint(t, string(EndApp)))
+	if _, err := Require(r, EndBackend, EndApp); err != nil {
+		t.Fatalf("跨端接口应接受 app 令牌，实际 %v", err)
+	}
+	if _, err := Require(requestWith("Bearer "+mint(t, string(EndApp))), EndBackend); !errors.Is(err, ErrWrongEnd) {
+		t.Fatalf("单端接口不应接受 app 令牌，实际 %v", err)
+	}
+}
+
+func TestRequireTokenErrorsAreUnauthorized(t *testing.T) {
+	cases := []struct {
+		name string
+		auth string
+		want error
+	}{
+		{"无令牌", "", ErrNoToken},
+		{"非 Bearer", "Token abc", ErrBadFormat},
+		{"缺载荷", "Bearer", ErrBadFormat},
+		{"乱码令牌", "Bearer aaa.bbb.ccc", ErrInvalid},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			_, err := Require(requestWith(c.auth), EndBackend)
+			if !errors.Is(err, c.want) {
+				t.Fatalf("期望 %v，实际 %v", c.want, err)
+			}
+			if got := Status(err); got != http.StatusUnauthorized {
+				t.Fatalf("令牌类错误应返 401 让前端续期，实际 %d", got)
+			}
+		})
+	}
+}
+
+func TestClassifyExpired(t *testing.T) {
+	// SignToken/GenerateToken 都把非正数 TTL 钳成默认值，造不出真实过期令牌，
+	// 因此这里直接验证错误分类：被包装的过期错误也要认出来。
+	wrapped := fmt.Errorf("parse token: %w", jwt.ErrTokenExpired)
+	if got := classify(wrapped); !errors.Is(got, ErrExpired) {
+		t.Fatalf("包装后的过期错误应归类为 ErrExpired，实际 %v", got)
+	}
+	if got := classify(errors.New("token is expired by 1h")); !errors.Is(got, ErrExpired) {
+		t.Fatalf("裸字符串过期错误应归类为 ErrExpired，实际 %v", got)
+	}
+	if got := classify(jwt.ErrTokenSignatureInvalid); !errors.Is(got, ErrInvalid) {
+		t.Fatalf("签名错误应归类为 ErrInvalid，实际 %v", got)
+	}
+	if got := Status(ErrExpired); got != http.StatusUnauthorized {
+		t.Fatalf("过期应返 401，实际 %d", got)
+	}
+}
+
+func TestRequireNilRequest(t *testing.T) {
+	if _, err := Require(nil, EndBackend); !errors.Is(err, ErrNoToken) {
+		t.Fatalf("空请求应判为未提供认证信息，实际 %v", err)
+	}
+}
diff --git a/go/routers/api/api.go b/go/routers/api/api.go
index d13d8a5..943ebe3 100644
--- a/go/routers/api/api.go
+++ b/go/routers/api/api.go
@@ -12,6 +12,8 @@ import (
 //
 // 注意：字面量路由必须注册在 :id 通配之前（beego 按注册顺序匹配）。
 func Register() {
+	RegisterErpRoutes()
+
 	// ===== 客户端登录器 / 开放接口（无需登录）=====
 	// 客户端检查更新
 	beego.Router("/api/softwareupgrade/check", &controllers.ApiSoftwareUpgradeController{}, "get:Check")
diff --git a/go/routers/api/erp.go b/go/routers/api/erp.go
new file mode 100644
index 0000000..9a660c6
--- /dev/null
+++ b/go/routers/api/erp.go
@@ -0,0 +1,69 @@
+package api
+
+import (
+	"server/controllers"
+
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// RegisterErpRoutes 注册移动端进销存（/api/erp/**）路由。
+//
+// 与 /backend/erp/** 完全独立：接口一一对应但各自成表（接口隔离规范），
+// 两端共用的是 controllers 包级 core 函数与 models/services，不复用 handler。
+//
+// 注意：字面量路由必须注册在 :id 通配之前（beego 按注册顺序匹配）。
+func RegisterErpRoutes() {
+	// 经营看板与开单字典
+	beego.Router("/api/erp/dashboard", &controllers.AppErpController{}, "get:Dashboard")
+	beego.Router("/api/erp/meta", &controllers.AppErpController{}, "get:Meta")
+
+	// 单据中心（采购/销售/库存十类单据共用）
+	beego.Router("/api/erp/document/list", &controllers.AppErpDocumentController{}, "get:List")
+	beego.Router("/api/erp/document/meta", &controllers.AppErpDocumentController{}, "get:Meta")
+	beego.Router("/api/erp/document/flows", &controllers.AppErpDocumentController{}, "get:Flows")
+	beego.Router("/api/erp/document/takeSheet", &controllers.AppErpDocumentController{}, "get:TakeSheet")
+	beego.Router("/api/erp/document/detail/:id", &controllers.AppErpDocumentController{}, "get:Detail")
+	beego.Router("/api/erp/document/executable/:id", &controllers.AppErpDocumentController{}, "get:Executable")
+	beego.Router("/api/erp/document/submit/:id", &controllers.AppErpDocumentController{}, "post:Submit")
+	beego.Router("/api/erp/document/approve/:id", &controllers.AppErpDocumentController{}, "post:Approve")
+	beego.Router("/api/erp/document/cancel/:id", &controllers.AppErpDocumentController{}, "post:Cancel")
+	beego.Router("/api/erp/document/save", &controllers.AppErpDocumentController{}, "post:Save")
+	beego.Router("/api/erp/document/delete/:id", &controllers.AppErpDocumentController{}, "delete:Delete")
+
+	// 库存（只读：结存/流水/预警/补货/批次效期）
+	beego.Router("/api/erp/stock/list", &controllers.AppErpStockController{}, "get:List")
+	beego.Router("/api/erp/stock/ledger", &controllers.AppErpStockController{}, "get:Ledger")
+	beego.Router("/api/erp/stock/warning", &controllers.AppErpStockController{}, "get:Warning")
+	beego.Router("/api/erp/stock/replenish", &controllers.AppErpStockController{}, "get:Replenish")
+	beego.Router("/api/erp/stock/batch", &controllers.AppErpStockController{}, "get:Batch")
+
+	// 档案（只读：商品/分类/仓库/客商）
+	beego.Router("/api/erp/product/list", &controllers.AppErpArchiveController{}, "get:ProductList")
+	beego.Router("/api/erp/product/category/list", &controllers.AppErpArchiveController{}, "get:CategoryList")
+	// 分类通配删除接口在移动端不开放，这里只保留 detail/:id 读接口
+	beego.Router("/api/erp/product/detail/:id", &controllers.AppErpArchiveController{}, "get:ProductDetail")
+	beego.Router("/api/erp/warehouse/list", &controllers.AppErpArchiveController{}, "get:WarehouseList")
+	beego.Router("/api/erp/partner/list", &controllers.AppErpArchiveController{}, "get:PartnerList")
+	beego.Router("/api/erp/partner/detail/:id", &controllers.AppErpArchiveController{}, "get:PartnerDetail")
+
+	// 往来账与收付款
+	beego.Router("/api/erp/finance/bill/list", &controllers.AppErpFinanceController{}, "get:BillList")
+	beego.Router("/api/erp/finance/bill/detail/:id", &controllers.AppErpFinanceController{}, "get:BillDetail")
+	beego.Router("/api/erp/finance/aging", &controllers.AppErpFinanceController{}, "get:Aging")
+	beego.Router("/api/erp/finance/cashflow", &controllers.AppErpFinanceController{}, "get:CashFlow")
+	beego.Router("/api/erp/finance/partner", &controllers.AppErpFinanceController{}, "get:PartnerSummary")
+	beego.Router("/api/erp/finance/fund/list", &controllers.AppErpFinanceController{}, "get:FundList")
+	beego.Router("/api/erp/finance/fund/openBills", &controllers.AppErpFinanceController{}, "get:FundOpenBills")
+	beego.Router("/api/erp/finance/fund/detail/:id", &controllers.AppErpFinanceController{}, "get:FundDetail")
+	beego.Router("/api/erp/finance/fund/confirm/:id", &controllers.AppErpFinanceController{}, "post:FundConfirm")
+	beego.Router("/api/erp/finance/fund/void/:id", &controllers.AppErpFinanceController{}, "post:FundVoid")
+	beego.Router("/api/erp/finance/fund/save", &controllers.AppErpFinanceController{}, "post:FundSave")
+	beego.Router("/api/erp/finance/fund/delete/:id", &controllers.AppErpFinanceController{}, "delete:FundDelete")
+
+	// 报表
+	beego.Router("/api/erp/report/purchase", &controllers.AppErpReportController{}, "get:PurchaseSummary")
+	beego.Router("/api/erp/report/sales", &controllers.AppErpReportController{}, "get:SalesSummary")
+	beego.Router("/api/erp/report/rank", &controllers.AppErpReportController{}, "get:Rank")
+	beego.Router("/api/erp/report/stockmove", &controllers.AppErpReportController{}, "get:StockMove")
+	beego.Router("/api/erp/report/profit", &controllers.AppErpReportController{}, "get:Profit")
+}
diff --git a/go/routers/backend/backend.go b/go/routers/backend/backend.go
index 5bd6b2d..20a40b6 100644
--- a/go/routers/backend/backend.go
+++ b/go/routers/backend/backend.go
@@ -657,6 +657,61 @@ func registerOrganizationRoutes(module string) {
 	beego.Router("/backend/erp/company-contact", &controllers.BackendErpCompanyContactController{}, "post:Create")
 	beego.Router("/backend/erp/company-contact/:id", &controllers.BackendErpCompanyContactController{}, "put:Update;delete:Delete")
 
+	// ERP进销存-商品档案与分类
+	beego.Router("/backend/erp/product/list", &controllers.BackendErpProductController{}, "get:List")
+	beego.Router("/backend/erp/product/category/list", &controllers.BackendErpProductController{}, "get:CategoryList")
+	beego.Router("/backend/erp/product/category", &controllers.BackendErpProductController{}, "post:CategorySave")
+	beego.Router("/backend/erp/product/category/:id", &controllers.BackendErpProductController{}, "delete:CategoryDelete")
+	beego.Router("/backend/erp/product", &controllers.BackendErpProductController{}, "post:Create")
+	beego.Router("/backend/erp/product/:id/status", &controllers.BackendErpProductController{}, "post:ToggleStatus")
+	beego.Router("/backend/erp/product/:id", &controllers.BackendErpProductController{}, "get:Detail;put:Update;delete:Delete")
+
+	// ERP进销存-仓库
+	beego.Router("/backend/erp/warehouse/list", &controllers.BackendErpWarehouseController{}, "get:List")
+	beego.Router("/backend/erp/warehouse", &controllers.BackendErpWarehouseController{}, "post:Create")
+	beego.Router("/backend/erp/warehouse/:id", &controllers.BackendErpWarehouseController{}, "get:Detail;put:Update;delete:Delete")
+
+	// ERP进销存-单据中心（采购/销售/库存十类单据统一收发）
+	beego.Router("/backend/erp/document/list", &controllers.BackendErpDocumentController{}, "get:List")
+	beego.Router("/backend/erp/document/meta", &controllers.BackendErpDocumentController{}, "get:Meta")
+	beego.Router("/backend/erp/document/flows", &controllers.BackendErpDocumentController{}, "get:Flows")
+	beego.Router("/backend/erp/document/takeSheet", &controllers.BackendErpDocumentController{}, "get:TakeSheet")
+	beego.Router("/backend/erp/document/:id/executable", &controllers.BackendErpDocumentController{}, "get:Executable")
+	beego.Router("/backend/erp/document/:id/submit", &controllers.BackendErpDocumentController{}, "post:Submit")
+	beego.Router("/backend/erp/document/:id/approve", &controllers.BackendErpDocumentController{}, "post:Approve")
+	beego.Router("/backend/erp/document/:id/cancel", &controllers.BackendErpDocumentController{}, "post:Cancel")
+	beego.Router("/backend/erp/document", &controllers.BackendErpDocumentController{}, "post:Save")
+	beego.Router("/backend/erp/document/:id", &controllers.BackendErpDocumentController{}, "get:Detail;delete:Delete")
+
+	// ERP进销存-库存
+	beego.Router("/backend/erp/stock/list", &controllers.BackendErpStockController{}, "get:List")
+	beego.Router("/backend/erp/stock/ledger", &controllers.BackendErpStockController{}, "get:Ledger")
+	beego.Router("/backend/erp/stock/warning", &controllers.BackendErpStockController{}, "get:Warning")
+	beego.Router("/backend/erp/stock/replenish", &controllers.BackendErpStockController{}, "get:Replenish")
+	beego.Router("/backend/erp/stock/batch", &controllers.BackendErpStockController{}, "get:Batch")
+
+	// ERP进销存-往来账与资金
+	beego.Router("/backend/erp/finance/bill/list", &controllers.BackendErpFinanceController{}, "get:BillList")
+	beego.Router("/backend/erp/finance/bill/:id", &controllers.BackendErpFinanceController{}, "get:BillDetail")
+	beego.Router("/backend/erp/finance/aging", &controllers.BackendErpFinanceController{}, "get:Aging")
+	beego.Router("/backend/erp/finance/cashflow", &controllers.BackendErpFinanceController{}, "get:CashFlow")
+	beego.Router("/backend/erp/finance/partner", &controllers.BackendErpFinanceController{}, "get:PartnerSummary")
+	beego.Router("/backend/erp/finance/fund/list", &controllers.BackendErpFinanceController{}, "get:FundList")
+	beego.Router("/backend/erp/finance/fund/openBills", &controllers.BackendErpFinanceController{}, "get:FundOpenBills")
+	beego.Router("/backend/erp/finance/fund/:id/confirm", &controllers.BackendErpFinanceController{}, "post:FundConfirm")
+	beego.Router("/backend/erp/finance/fund/:id/void", &controllers.BackendErpFinanceController{}, "post:FundVoid")
+	beego.Router("/backend/erp/finance/fund", &controllers.BackendErpFinanceController{}, "post:FundSave")
+	beego.Router("/backend/erp/finance/fund/:id", &controllers.BackendErpFinanceController{}, "get:FundDetail;delete:FundDelete")
+
+	// ERP进销存-报表与经营看板
+	beego.Router("/backend/erp/report/purchase", &controllers.BackendErpReportController{}, "get:PurchaseSummary")
+	beego.Router("/backend/erp/report/sales", &controllers.BackendErpReportController{}, "get:SalesSummary")
+	beego.Router("/backend/erp/report/rank", &controllers.BackendErpReportController{}, "get:Rank")
+	beego.Router("/backend/erp/report/stockmove", &controllers.BackendErpReportController{}, "get:StockMove")
+	beego.Router("/backend/erp/report/profit", &controllers.BackendErpReportController{}, "get:Profit")
+	beego.Router("/backend/erp/report/rfm", &controllers.BackendErpReportController{}, "get:RFM")
+	beego.Router("/backend/erp/report/dashboard", &controllers.BackendErpReportController{}, "get:Dashboard")
+
 	// AI接入配置
 	beego.Router("/backend/ai/provider/list", &controllers.BackendAiProviderController{}, "get:List")
 	beego.Router("/backend/ai/provider", &controllers.BackendAiProviderController{}, "post:Create")
diff --git a/go/services/approval/engine.go b/go/services/approval/engine.go
index b08f3f1..0302fe1 100644
--- a/go/services/approval/engine.go
+++ b/go/services/approval/engine.go
@@ -19,6 +19,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/services/erp"
 
 	"github.com/beego/beego/v2/client/orm"
 )
@@ -1023,7 +1024,16 @@ func SyncBizResult(instID uint64, status int8) {
 		return
 	}
 	// 无业务单据ID的实例（纯手工审批）不回写任何业务表
-	if inst.BizID == 0 || !IsReimburseBizType(inst.BizType) {
+	if inst.BizID == 0 {
+		return
+	}
+	// 进销存单据：biz_type 形如 erp_purchase_in / erp_sales_out，终态回写单据状态，
+	// 「已生效」单据的效果（库存流水/往来账）在回写时同事务执行。
+	if strings.HasPrefix(inst.BizType, "erp_") {
+		erp.SyncErpDocResult(inst.BizType, inst.BizID, bizTenantID(&inst), status)
+		return
+	}
+	if !IsReimburseBizType(inst.BizType) {
 		return
 	}
 	syncReimburseResult(&inst, status)
diff --git a/go/services/approval/instance_query.go b/go/services/approval/instance_query.go
new file mode 100644
index 0000000..be421d8
--- /dev/null
+++ b/go/services/approval/instance_query.go
@@ -0,0 +1,121 @@
+package approval
+
+import (
+	"time"
+
+	"server/models"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// InstanceStatusOf 读取实例当前状态（单据提交后用于判断流程是否已直接结束）。
+func InstanceStatusOf(instID uint64) int8 {
+	var inst models.ApprovalInstance
+	if err := models.Orm.QueryTable(new(models.ApprovalInstance)).
+		Filter("id", instID).One(&inst, "status"); err != nil {
+		return models.ApprovalInstanceRunning
+	}
+	return inst.Status
+}
+
+// InstanceBrief 单据详情页展示的审批进度摘要：当前节点、待办人、时间线。
+func InstanceBrief(instID uint64) map[string]interface{} {
+	if instID == 0 {
+		return nil
+	}
+	var inst models.ApprovalInstance
+	if err := models.Orm.QueryTable(new(models.ApprovalInstance)).
+		Filter("id", instID).One(&inst); err != nil {
+		return nil
+	}
+	tasks := make([]map[string]interface{}, 0)
+	var rows []models.ApprovalTask
+	_, _ = models.Orm.QueryTable(new(models.ApprovalTask)).
+		Filter("instance_id", instID).OrderBy("sort", "id").All(&rows)
+	for _, t := range rows {
+		tasks = append(tasks, map[string]interface{}{
+			"task_id": t.ID, "node_key": t.NodeKey, "node_name": t.NodeName,
+			"approver_id": t.ApproverID, "approver_name": t.ApproverName,
+			"status": t.Status, "status_label": approvalTaskLabel(t.Status),
+			"comment": t.Comment, "action": t.Action,
+			"create_time": t.CreateTime, "finish_time": t.FinishTime,
+		})
+	}
+	return map[string]interface{}{
+		"instance_id":  inst.ID,
+		"flow_id":      inst.FlowID,
+		"flow_name":    flowNameOf(inst.FlowID),
+		"biz_type":     inst.BizType,
+		"status":       inst.Status,
+		"status_label": approvalInstanceLabel(inst.Status),
+		"current_node": inst.CurrentNode,
+		"submit_name":  inst.SubmitUserName,
+		"submit_time":  inst.CreateTime,
+		"finish_time":  inst.FinishTime,
+		"tasks":        tasks,
+	}
+}
+
+// flowNameOf 流程名称（流程被删除时回落为占位文案，不影响单据查看）
+func flowNameOf(flowID uint64) string {
+	if flowID == 0 {
+		return ""
+	}
+	var f models.TenantApprovalFlow
+	if err := models.Orm.QueryTable(new(models.TenantApprovalFlow)).
+		Filter("id", flowID).One(&f, "flow_name"); err == nil {
+		return f.FlowName
+	}
+	return "已删除的审批流"
+}
+
+func approvalTaskLabel(status int8) string {
+	switch status {
+	case models.ApprovalTaskApproved:
+		return "已通过"
+	case models.ApprovalTaskRejected:
+		return "已驳回"
+	case models.ApprovalTaskSkipped:
+		return "已跳过"
+	case models.ApprovalTaskNotified:
+		return "已通知"
+	default:
+		return "待审批"
+	}
+}
+
+func approvalInstanceLabel(status int8) string {
+	switch status {
+	case models.ApprovalInstanceApproved:
+		return "已通过"
+	case models.ApprovalInstanceRejected:
+		return "已驳回"
+	case models.ApprovalInstanceWithdrawn:
+		return "已撤回"
+	default:
+		return "审批中"
+	}
+}
+
+// CancelInstance 业务单据作废时同步终结在途实例，避免审批中心留下无效待办。
+// 不做成「驳回」是因为驳回会让单据回到已驳回态；这里直接按撤回处理，
+// 调用方已负责把业务单据置为终态。
+func CancelInstance(instID uint64, reason string) {
+	if instID == 0 {
+		return
+	}
+	var inst models.ApprovalInstance
+	if err := models.Orm.QueryTable(new(models.ApprovalInstance)).
+		Filter("id", instID).One(&inst, "id", "status"); err != nil {
+		return
+	}
+	if inst.Status != models.ApprovalInstanceRunning {
+		return
+	}
+	now := time.Now()
+	_, _ = models.Orm.QueryTable(new(models.ApprovalInstance)).Filter("id", instID).
+		Update(orm.Params{"status": models.ApprovalInstanceWithdrawn, "finish_time": now, "update_time": now})
+	_, _ = models.Orm.QueryTable(new(models.ApprovalTask)).
+		Filter("instance_id", instID).Filter("status", models.ApprovalTaskPending).
+		Update(orm.Params{"status": models.ApprovalTaskSkipped, "comment": reason, "update_time": now})
+}
diff --git a/go/services/erp/document.go b/go/services/erp/document.go
new file mode 100644
index 0000000..b8cb74e
--- /dev/null
+++ b/go/services/erp/document.go
@@ -0,0 +1,496 @@
+package erp
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"server/models"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// ApplyDocEffect 单据「审核生效」的统一效果引擎。调用方必须传入开启的事务 Ormer，
+// 并保证单据当前状态为 草稿/驳回/审批中。生效后：
+//
+//	purchase_in  → 入库流水 + 累计采购订单执行量 + 生成应付
+//	sales_out    → 出库流水(加权成本) + 累计销售订单执行量 + 信用校验 + 生成应收
+//	*_return     → 反向流水 + 红字往来账冲减
+//	other_in/out / transfer / stock_take → 仅库存变动
+//	*_order      → 仅状态推进，不动库存
+func ApplyDocEffect(o orm.QueryExecutor, doc *models.ErpDocument, items []models.ErpDocumentItem,
+	operatorID, operatorName string) error {
+
+	if models.ErpDocAffectsStock(doc.DocType) && doc.WarehouseID == 0 && doc.DocType != models.ErpDocStockTake {
+		return fmt.Errorf("单据缺少仓库")
+	}
+
+	mv := func(it *models.ErpDocumentItem, dir int8, unitCost float64, whID uint64) error {
+		_, err := ApplyMovement(o, &Movement{
+			TenantID: doc.TenantID, ProductID: it.ProductID,
+			WarehouseID: whID, BatchNo: it.BatchNo,
+			Direction: dir, Qty: it.Quantity, UnitCost: unitCost,
+			DocType: doc.DocType, DocID: doc.ID, DocNo: doc.DocNo, DocItemID: it.ID,
+			OperatorID: operatorID, OperatorName: operatorName,
+			ProductionDate: it.ProductionDate, ExpireDate: it.ExpireDate,
+		})
+		return err
+	}
+
+	switch doc.DocType {
+	case models.ErpDocPurchaseOrder, models.ErpDocSalesOrder:
+		// 订单不动库存、不产生往来账
+
+	case models.ErpDocPurchaseIn:
+		for i := range items {
+			it := &items[i]
+			if err := checkOrderExec(o, doc.TenantID, it, models.ErpDocPurchaseOrder); err != nil {
+				return err
+			}
+			wh := pickWh(doc, it)
+			if err := mv(it, models.ErpStockIn, it.UnitPrice, wh); err != nil {
+				return err
+			}
+			if err := bumpExecutedQty(o, it); err != nil {
+				return err
+			}
+		}
+		if err := createPartnerBill(o, doc, models.ErpBillPayable); err != nil {
+			return err
+		}
+
+	case models.ErpDocSalesOut:
+		if err := checkCustomerCredit(o, doc); err != nil {
+			return err
+		}
+		for i := range items {
+			it := &items[i]
+			if err := checkOrderExec(o, doc.TenantID, it, models.ErpDocSalesOrder); err != nil {
+				return err
+			}
+			wh := pickWh(doc, it)
+			if err := mv(it, models.ErpStockOut, 0, wh); err != nil {
+				return err
+			}
+			if err := bumpExecutedQty(o, it); err != nil {
+				return err
+			}
+		}
+		if err := createPartnerBill(o, doc, models.ErpBillReceivable); err != nil {
+			return err
+		}
+
+	case models.ErpDocPurchaseReturn:
+		if err := checkReturnLimit(o, doc, items); err != nil {
+			return err
+		}
+		for i := range items {
+			it := &items[i]
+			wh := pickWh(doc, it)
+			// 退货出库成本：优先取原入库流水成本，取不到则按当前加权成本
+			cost := 0.0
+			if c, ok := refLedgerCost(o, doc.TenantID, it.RefItemID, models.ErpStockIn); ok {
+				cost = c
+			}
+			if err := mv(it, models.ErpStockOut, cost, wh); err != nil {
+				return err
+			}
+		}
+		if err := createPartnerBill(o, doc, models.ErpBillPayable); err != nil {
+			return err
+		}
+
+	case models.ErpDocSalesReturn:
+		if err := checkReturnLimit(o, doc, items); err != nil {
+			return err
+		}
+		for i := range items {
+			it := &items[i]
+			wh := pickWh(doc, it)
+			cost := 0.0
+			if c, ok := refLedgerCost(o, doc.TenantID, it.RefItemID, models.ErpStockOut); ok {
+				cost = c // 按原出库成本回冲入库
+			}
+			if err := mv(it, models.ErpStockIn, cost, wh); err != nil {
+				return err
+			}
+		}
+		if err := createPartnerBill(o, doc, models.ErpBillReceivable); err != nil {
+			return err
+		}
+
+	case models.ErpDocOtherIn:
+		for i := range items {
+			it := &items[i]
+			if err := mv(it, models.ErpStockIn, it.UnitPrice, pickWh(doc, it)); err != nil {
+				return err
+			}
+		}
+
+	case models.ErpDocOtherOut:
+		for i := range items {
+			it := &items[i]
+			if err := mv(it, models.ErpStockOut, 0, pickWh(doc, it)); err != nil {
+				return err
+			}
+		}
+
+	case models.ErpDocTransfer:
+		if doc.ToWarehouseID == 0 || doc.ToWarehouseID == doc.WarehouseID {
+			return fmt.Errorf("调拨调入仓库无效")
+		}
+		for i := range items {
+			it := &items[i]
+			cost, err := ApplyMovement(o, &Movement{
+				TenantID: doc.TenantID, ProductID: it.ProductID,
+				WarehouseID: doc.WarehouseID, BatchNo: it.BatchNo,
+				Direction: models.ErpStockOut, Qty: it.Quantity,
+				DocType: doc.DocType, DocID: doc.ID, DocNo: doc.DocNo, DocItemID: it.ID,
+				OperatorID: operatorID, OperatorName: operatorName,
+				ProductionDate: it.ProductionDate, ExpireDate: it.ExpireDate,
+			})
+			if err != nil {
+				return err
+			}
+			if _, err := ApplyMovement(o, &Movement{
+				TenantID: doc.TenantID, ProductID: it.ProductID,
+				WarehouseID: doc.ToWarehouseID, BatchNo: it.BatchNo,
+				Direction: models.ErpStockIn, Qty: it.Quantity, UnitCost: cost,
+				DocType: doc.DocType, DocID: doc.ID, DocNo: doc.DocNo, DocItemID: it.ID,
+				OperatorID: operatorID, OperatorName: operatorName,
+				ProductionDate: it.ProductionDate, ExpireDate: it.ExpireDate,
+			}); err != nil {
+				return err
+			}
+		}
+
+	case models.ErpDocStockTake:
+		for i := range items {
+			it := &items[i]
+			wh := it.WarehouseID
+			if wh == 0 {
+				wh = doc.WarehouseID
+			}
+			diff := round4(it.Quantity - it.BookQty)
+			if absf(diff) < 0.000001 {
+				continue
+			}
+			if diff > 0 {
+				if err := mv(it, models.ErpStockIn, it.UnitPrice, wh); err != nil {
+					return err
+				}
+			} else {
+				q := it.Quantity
+				it.Quantity = -diff
+				if err := mv(it, models.ErpStockOut, 0, wh); err != nil {
+					it.Quantity = q
+					return err
+				}
+				it.Quantity = q
+			}
+		}
+
+	default:
+		return fmt.Errorf("未知单据类型: %s", doc.DocType)
+	}
+	return nil
+}
+
+func pickWh(doc *models.ErpDocument, it *models.ErpDocumentItem) uint64 {
+	if it.WarehouseID > 0 {
+		return it.WarehouseID
+	}
+	return doc.WarehouseID
+}
+
+// checkOrderExec 入库/出库数量不得超过来源订单的未执行数量。
+func checkOrderExec(o orm.QueryExecutor, tenantID string, it *models.ErpDocumentItem, orderType string) error {
+	if it.RefItemID == 0 {
+		return nil
+	}
+	var ref models.ErpDocumentItem
+	if err := o.QueryTable(new(models.ErpDocumentItem)).Filter("id", it.RefItemID).One(&ref); err != nil {
+		return fmt.Errorf("关联订单明细不存在(id=%d)", it.RefItemID)
+	}
+	var refDoc models.ErpDocument
+	if err := o.QueryTable(new(models.ErpDocument)).Filter("id", ref.DocID).One(&refDoc); err != nil {
+		return fmt.Errorf("关联订单不存在")
+	}
+	if refDoc.TenantID != tenantID || refDoc.DocType != orderType || refDoc.Status != models.ErpDocStatusApproved {
+		return fmt.Errorf("关联订单「%s」状态不可执行", refDoc.DocNo)
+	}
+	remain := ref.Quantity - ref.ExecutedQty
+	if it.Quantity-remain > 0.000001 {
+		return fmt.Errorf("商品「%s」超出订单可执行数量（剩余 %.4f，本次 %.4f）", it.ProductName, remain, it.Quantity)
+	}
+	return nil
+}
+
+func bumpExecutedQty(o orm.QueryExecutor, it *models.ErpDocumentItem) error {
+	if it.RefItemID == 0 {
+		return nil
+	}
+	var ref models.ErpDocumentItem
+	if err := o.QueryTable(new(models.ErpDocumentItem)).Filter("id", it.RefItemID).ForUpdate().One(&ref); err != nil {
+		return nil
+	}
+	newQty := round4(ref.ExecutedQty + it.Quantity)
+	_, err := o.QueryTable(new(models.ErpDocumentItem)).Filter("id", ref.ID).
+		Update(orm.Params{"executed_qty": newQty})
+	return err
+}
+
+// checkReturnLimit 退货数量不得超过原单行数量 - 已退数量。
+func checkReturnLimit(o orm.QueryExecutor, doc *models.ErpDocument, items []models.ErpDocumentItem) error {
+	ids := make([]uint64, 0, len(items))
+	for _, it := range items {
+		if it.RefItemID > 0 {
+			ids = append(ids, it.RefItemID)
+		}
+	}
+	if len(ids) == 0 {
+		return nil
+	}
+	var refItems []models.ErpDocumentItem
+	_, _ = o.QueryTable(new(models.ErpDocumentItem)).Filter("id__in", ids).All(&refItems)
+	refMap := map[uint64]*models.ErpDocumentItem{}
+	for i := range refItems {
+		refMap[refItems[i].ID] = &refItems[i]
+	}
+	// 已退数量 = 其他已生效退货单中引用同一原行的数量
+	already := map[uint64]float64{}
+	var sibs []models.ErpDocumentItem
+	_, _ = o.QueryTable(new(models.ErpDocumentItem)).
+		Filter("tenant_id", doc.TenantID).
+		Filter("ref_item_id__in", ids).
+		Exclude("doc_id", doc.ID).All(&sibs)
+	if len(sibs) > 0 {
+		docIDs := make([]uint64, 0, len(sibs))
+		for _, s := range sibs {
+			docIDs = append(docIDs, s.DocID)
+		}
+		var docs []models.ErpDocument
+		_, _ = o.QueryTable(new(models.ErpDocument)).
+			Filter("id__in", docIDs).
+			Filter("status", models.ErpDocStatusApproved).
+			Filter("delete_time__isnull", true).All(&docs, "id")
+		alive := map[uint64]bool{}
+		for _, d := range docs {
+			alive[d.ID] = true
+		}
+		for _, s := range sibs {
+			if alive[s.DocID] {
+				already[s.RefItemID] += s.Quantity
+			}
+		}
+	}
+	for _, it := range items {
+		if it.RefItemID == 0 {
+			continue
+		}
+		ref, ok := refMap[it.RefItemID]
+		if !ok {
+			return fmt.Errorf("退货关联的原单明细不存在(id=%d)", it.RefItemID)
+		}
+		remain := ref.Quantity - already[it.RefItemID]
+		if it.Quantity-remain > 0.000001 {
+			return fmt.Errorf("商品「%s」退货数量超出原单可退数量（剩余 %.4f，本次 %.4f）", it.ProductName, remain, it.Quantity)
+		}
+	}
+	return nil
+}
+
+// refLedgerCost 取原单明细对应流水的单位成本（退货回冲口径）。
+func refLedgerCost(o orm.QueryExecutor, tenantID string, refItemID uint64, direction int8) (float64, bool) {
+	if refItemID == 0 {
+		return 0, false
+	}
+	var led models.ErpStockLedger
+	err := o.QueryTable(new(models.ErpStockLedger)).
+		Filter("tenant_id", tenantID).
+		Filter("doc_item_id", refItemID).
+		Filter("direction", direction).
+		OrderBy("-id").One(&led)
+	if err != nil {
+		return 0, false
+	}
+	return led.UnitCost, true
+}
+
+// checkCustomerCredit 销售出库信用额度校验：客户未收往来余额 + 本单金额 ≤ 信用额度。
+func checkCustomerCredit(o orm.QueryExecutor, doc *models.ErpDocument) error {
+	if doc.PartnerType != "customer" || doc.PartnerID == 0 {
+		return nil
+	}
+	limit := GetCustomerCreditLimit(doc.PartnerID)
+	if limit <= 0 {
+		return nil
+	}
+	var openSum float64
+	var bills []models.ErpPartnerBill
+	_, _ = o.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", doc.TenantID).
+		Filter("bill_type", models.ErpBillReceivable).
+		Filter("partner_id", doc.PartnerID).
+		Filter("status__lt", 2).All(&bills)
+	for _, b := range bills {
+		openSum += b.Amount - b.SettledAmount
+	}
+	if openSum+doc.ActualAmount-limit > 0.005 {
+		return &CreditError{
+			PartnerName: doc.PartnerName,
+			Limit:       limit,
+			Open:        round2(openSum),
+			This:        doc.ActualAmount,
+		}
+	}
+	return nil
+}
+
+type CreditError struct {
+	PartnerName string
+	Limit       float64
+	Open        float64
+	This        float64
+}
+
+func (e *CreditError) Error() string {
+	return fmt.Sprintf("客户「%s」超出信用额度：额度 %.2f，未收 %.2f，本单 %.2f",
+		e.PartnerName, e.Limit, e.Open, e.This)
+}
+
+// createPartnerBill 出库/入库/退货生效时生成往来账；退货生成红字（负数）账。
+func createPartnerBill(o orm.QueryExecutor, doc *models.ErpDocument, billType int8) error {
+	if doc.PartnerID == 0 || doc.ActualAmount == 0 {
+		return nil
+	}
+	amount := round2(doc.ActualAmount)
+	switch doc.DocType {
+	case models.ErpDocPurchaseReturn, models.ErpDocSalesReturn:
+		amount = -amount
+	}
+	var due *time.Time
+	if days := GetPartnerPaymentDays(doc.PartnerType, doc.PartnerID); days > 0 {
+		d := doc.BizDate.AddDate(0, 0, days)
+		due = &d
+	}
+	bill := models.ErpPartnerBill{
+		TenantID: doc.TenantID, BillType: billType,
+		PartnerType: doc.PartnerType, PartnerID: doc.PartnerID, PartnerName: doc.PartnerName,
+		SourceDocID: doc.ID, SourceDocNo: doc.DocNo,
+		BillDate: doc.BizDate, DueDate: due,
+		Amount: amount, SettledAmount: 0, Status: 0,
+		CreateTime: time.Now(), UpdateTime: time.Now(),
+	}
+	// 红字互抵：正数账先吸收同单位红字余额；红字账入账后抵扣未结正数账
+	if amount > 0 {
+		consumed, err := autoOffsetBill(o, &bill)
+		if err != nil {
+			return err
+		}
+		bill.SettledAmount = consumed
+		if consumed > 0.005 {
+			bill.Status = 1
+			if absf(bill.Amount-consumed) < 0.005 {
+				bill.Status = 2
+			}
+		}
+	}
+	if _, err := o.Insert(&bill); err != nil {
+		return fmt.Errorf("生成往来账失败: %v", err)
+	}
+	if amount < 0 {
+		if _, err := autoOffsetBill(o, &bill); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// SyncErpDocResult 审批引擎回调：审批终态回写业务单据。
+// bizType 形如 erp_sales_out；status 为实例终态。幂等：仅推进处于「审批中」的单据。
+func SyncErpDocResult(bizType string, bizID uint64, tid uint64, status int8) {
+	if !strings.HasPrefix(bizType, "erp_") || bizID == 0 || tid == 0 {
+		return
+	}
+	docType := strings.TrimPrefix(bizType, "erp_")
+	var doc models.ErpDocument
+	if err := models.Orm.QueryTable(new(models.ErpDocument)).
+		Filter("id", bizID).Filter("tenant_id", itoa(tid)).
+		Filter("doc_type", docType).
+		Filter("delete_time__isnull", true).One(&doc); err != nil {
+		return
+	}
+	if doc.Status != models.ErpDocStatusPending {
+		return // 已被处理，幂等跳过
+	}
+
+	switch status {
+	case models.ApprovalInstanceApproved:
+		_ = approveWithTx(bizID, itoa(tid), "approval-engine", "审批引擎")
+	case models.ApprovalInstanceRejected:
+		models.Orm.QueryTable(new(models.ErpDocument)).Filter("id", bizID).
+			Update(orm.Params{"status": models.ErpDocStatusRejected})
+	case models.ApprovalInstanceWithdrawn:
+		models.Orm.QueryTable(new(models.ErpDocument)).Filter("id", bizID).
+			Update(orm.Params{"status": models.ErpDocStatusDraft, "instance_id": 0})
+	}
+}
+
+// approveWithTx 独立开启事务并生效单据（审批回调 / 直接审核共用）。
+func approveWithTx(docID uint64, tenantID, auditorID, auditorName string) error {
+	o := models.Orm
+	tx, err := o.Begin()
+	if err != nil {
+		return err
+	}
+	defer func() { _ = tx.Rollback() }()
+	if err := ApproveDocumentTx(tx, docID, tenantID, auditorID, auditorName); err != nil {
+		return err
+	}
+	return tx.Commit()
+}
+
+// ApproveDocumentTx 事务内：状态锁 + 效果执行 + 状态推进，供控制器与审批回调复用。
+func ApproveDocumentTx(tx orm.QueryExecutor, docID uint64, tenantID, auditorID, auditorName string) error {
+	var doc models.ErpDocument
+	if err := tx.QueryTable(new(models.ErpDocument)).
+		Filter("id", docID).Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).ForUpdate().One(&doc); err != nil {
+		return fmt.Errorf("单据不存在")
+	}
+	if doc.Status == models.ErpDocStatusApproved {
+		return nil // 幂等
+	}
+	if doc.Status != models.ErpDocStatusDraft &&
+		doc.Status != models.ErpDocStatusRejected &&
+		doc.Status != models.ErpDocStatusPending {
+		return fmt.Errorf("当前状态不可审核")
+	}
+	var items []models.ErpDocumentItem
+	if _, err := tx.QueryTable(new(models.ErpDocumentItem)).
+		Filter("doc_id", docID).OrderBy("sort_order", "id").All(&items); err != nil {
+		return err
+	}
+	if len(items) == 0 {
+		return fmt.Errorf("单据没有明细行")
+	}
+	if err := ApplyDocEffect(tx, &doc, items, auditorID, auditorName); err != nil {
+		return err
+	}
+	now := time.Now()
+	_, err := tx.QueryTable(new(models.ErpDocument)).Filter("id", docID).
+		Update(orm.Params{
+			"status":       models.ErpDocStatusApproved,
+			"auditor_id":   auditorID,
+			"auditor_name": auditorName,
+			"audit_time":   now,
+			"update_time":  now,
+		})
+	return err
+}
+
+// ApproveDocument 非审批流路径的直接审核入口。
+func ApproveDocument(docID uint64, tenantID, auditorID, auditorName string) error {
+	return approveWithTx(docID, tenantID, auditorID, auditorName)
+}
diff --git a/go/services/erp/finance.go b/go/services/erp/finance.go
new file mode 100644
index 0000000..aa6fb52
--- /dev/null
+++ b/go/services/erp/finance.go
@@ -0,0 +1,300 @@
+package erp
+
+import (
+	"fmt"
+	"time"
+
+	"server/models"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// applyToBill 向一张往来账核销 take 金额（正数）。
+// 正数账（应收/应付）核销使 settled 增加；红字账（负额）反向移动，
+// 统一口径：余额 = amount - settled，核销使 |余额| 趋近 0。
+func applyToBill(o orm.QueryExecutor, bill *models.ErpPartnerBill, take float64) (float64, error) {
+	if take <= 0 {
+		return 0, nil
+	}
+	delta := take
+	if bill.Amount < 0 {
+		delta = -take
+	}
+	newSettled := round2(bill.SettledAmount + delta)
+	newBalance := absf(round2(bill.Amount - newSettled))
+	status := int8(1)
+	if newBalance < 0.005 {
+		status = 2
+	}
+	_, err := o.QueryTable(new(models.ErpPartnerBill)).Filter("id", bill.ID).
+		Update(orm.Params{"settled_amount": newSettled, "status": status, "update_time": time.Now()})
+	if err != nil {
+		return 0, err
+	}
+	used := take
+	if absf(delta) > absf(take) { // 不超过剩余余额
+		used = absf(bill.Amount - bill.SettledAmount)
+	}
+	return used, nil
+}
+
+// autoOffsetBill 新账入账时与反向挂账互抵：
+// 红字退货账优先抵扣同单位未结的正数往来账；正数账优先吸收红字余额（预收预付）。
+// 返回该账本行插入时应携带的已核销额（正数账吸收红字的场景）。
+func autoOffsetBill(o orm.QueryExecutor, bill *models.ErpPartnerBill) (float64, error) {
+	if absf(bill.Amount) < 0.005 {
+		return 0, nil
+	}
+	// 查找同单位、同向相反、未结清的账
+	var opps []models.ErpPartnerBill
+	qs := o.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", bill.TenantID).
+		Filter("bill_type", bill.BillType).
+		Filter("partner_id", bill.PartnerID).
+		Filter("partner_type", bill.PartnerType).
+		Filter("status__lt", 2)
+	_, _ = qs.OrderBy("bill_date", "id").All(&opps)
+
+	if bill.Amount > 0 {
+		// 正数账：先吸收红字（负额未结账）
+		consumed := 0.0
+		for i := range opps {
+			b := &opps[i]
+			if b.ID == 0 || b.Amount >= 0 {
+				continue
+			}
+			credit := absf(b.Amount - b.SettledAmount)
+			if credit < 0.005 {
+				continue
+			}
+			take := credit
+			if bill.Amount-consumed < take {
+				take = round2(bill.Amount - consumed)
+			}
+			if _, err := applyToBill(o, b, take); err != nil {
+				return 0, err
+			}
+			consumed += take
+			if bill.Amount-consumed < 0.005 {
+				break
+			}
+		}
+		return round2(consumed), nil
+	}
+
+	// 红字账（amount<0）：插入后抵扣正数账
+	var pos []models.ErpPartnerBill
+	_, _ = o.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", bill.TenantID).
+		Filter("bill_type", bill.BillType).
+		Filter("partner_id", bill.PartnerID).
+		Filter("partner_type", bill.PartnerType).
+		Filter("status__lt", 2).
+		Filter("amount__gt", 0).
+		OrderBy("bill_date", "id").All(&pos)
+	need := absf(bill.Amount)
+	consumed := 0.0
+	for i := range pos {
+		if need < 0.005 {
+			break
+		}
+		b := &pos[i]
+		balance := b.Amount - b.SettledAmount
+		if balance < 0.005 {
+			continue
+		}
+		take := balance
+		if take > need {
+			take = need
+		}
+		used, err := applyToBill(o, b, take)
+		if err != nil {
+			return 0, err
+		}
+		consumed += used
+		need -= used
+	}
+	if consumed > 0 {
+		// 红字自身推进 settled（负向）
+		newSettled := round2(-consumed)
+		status := int8(1)
+		if absf(bill.Amount-newSettled) < 0.005 {
+			status = 2
+		}
+		if _, err := o.QueryTable(new(models.ErpPartnerBill)).Filter("id", bill.ID).
+			Update(orm.Params{"settled_amount": newSettled, "status": status}); err != nil {
+			return 0, err
+		}
+	}
+	return 0, nil
+}
+
+// OffsetAfterBillInsert 往来账插入后的互抵处理（正数账已在插入时携带 settled 的不再调用）。
+func OffsetAfterBillInsert(o orm.QueryExecutor, billID uint64) {
+	var bill models.ErpPartnerBill
+	if err := o.QueryTable(new(models.ErpPartnerBill)).Filter("id", billID).One(&bill); err != nil {
+		return
+	}
+	if bill.Amount < 0 {
+		_, _ = autoOffsetBill(o, &bill)
+	}
+}
+
+// SettleItem 核销明细入参
+type SettleItem struct {
+	PartnerBillID uint64  `json:"partner_bill_id"`
+	Amount        float64 `json:"amount"`
+}
+
+// ConfirmFundBill 收付款单确认生效：
+//   - fund_type=1/2（收款/付款）：按 settles 逐笔核销，未指定则自动 FIFO
+//     （到期日→账期日升序，仅正数余额账）；核销余量作为预收/预付留在单上。
+//   - fund_type=3/4（其他收入/费用）：仅登记资金流水。
+//   - 同时校验：草稿态、金额>0、核销对象为同租户同往来单位且类型匹配。
+func ConfirmFundBill(fundID uint64, tenantID string, settles []SettleItem, operatorName string) error {
+	o := models.Orm
+	tx, err := o.Begin()
+	if err != nil {
+		return err
+	}
+	rollback := true
+	defer func() {
+		if rollback {
+			_ = tx.Rollback()
+		}
+	}()
+
+	var fund models.ErpFundBill
+	if err := tx.QueryTable(new(models.ErpFundBill)).
+		Filter("id", fundID).Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).ForUpdate().One(&fund); err != nil {
+		return fmt.Errorf("收付款单不存在")
+	}
+	if fund.Status != 0 {
+		return fmt.Errorf("当前状态不可确认")
+	}
+	if fund.Amount <= 0 {
+		return fmt.Errorf("金额必须大于0")
+	}
+
+	remaining := round2(fund.Amount)
+	if fund.FundType == models.ErpFundReceive || fund.FundType == models.ErpFundPay {
+		billType := int8(models.ErpBillReceivable)
+		if fund.FundType == models.ErpFundPay {
+			billType = models.ErpBillPayable
+		}
+		if len(settles) == 0 {
+			settles, err = autoFifoSettle(tx, &fund, billType, remaining)
+			if err != nil {
+				return err
+			}
+		}
+		for _, s := range settles {
+			if s.Amount <= 0.004 {
+				continue
+			}
+			if s.Amount-remaining > 0.005 {
+				return fmt.Errorf("核销总额超出收付款金额")
+			}
+			var bill models.ErpPartnerBill
+			if err := tx.QueryTable(new(models.ErpPartnerBill)).
+				Filter("id", s.PartnerBillID).Filter("tenant_id", tenantID).ForUpdate().One(&bill); err != nil {
+				return fmt.Errorf("往来账不存在(id=%d)", s.PartnerBillID)
+			}
+			if bill.BillType != billType {
+				return fmt.Errorf("往来账「%s」类型与收付款方式不符", bill.SourceDocNo)
+			}
+			if fund.PartnerID != 0 && bill.PartnerID != fund.PartnerID {
+				return fmt.Errorf("往来账「%s」不属于 %s", bill.SourceDocNo, fund.PartnerName)
+			}
+			balance := bill.Amount - bill.SettledAmount
+			if balance < 0.005 {
+				return fmt.Errorf("往来账「%s」已结清", bill.SourceDocNo)
+			}
+			take := round2(s.Amount)
+			if take > balance {
+				take = round2(balance)
+			}
+			if _, err := applyToBill(tx, &bill, take); err != nil {
+				return err
+			}
+			if _, err := tx.Insert(&models.ErpFundSettle{
+				TenantID: tenantID, FundBillID: fund.ID, PartnerBillID: bill.ID,
+				PartnerBillNo: bill.SourceDocNo, Amount: take, CreateTime: time.Now(),
+			}); err != nil {
+				return fmt.Errorf("写入核销明细失败: %v", err)
+			}
+			remaining = round2(remaining - take)
+		}
+	}
+
+	now := time.Now()
+	_, err = tx.QueryTable(new(models.ErpFundBill)).Filter("id", fund.ID).
+		Update(orm.Params{
+			"status":         1,
+			"settled_amount": round2(fund.Amount - remaining),
+			"update_time":    now,
+		})
+	if err != nil {
+		return fmt.Errorf("确认失败: %v", err)
+	}
+	if err := tx.Commit(); err != nil {
+		return err
+	}
+	rollback = false
+	return nil
+}
+
+// autoFifoSettle 未指定核销明细时，按到期日/账期日升序自动分摊。
+func autoFifoSettle(tx orm.QueryExecutor, fund *models.ErpFundBill, billType int8, amount float64) ([]SettleItem, error) {
+	var bills []models.ErpPartnerBill
+	qs := tx.QueryTable(new(models.ErpPartnerBill)).
+		Filter("tenant_id", fund.TenantID).
+		Filter("bill_type", billType).
+		Filter("status__lt", 2).
+		Filter("amount__gt", 0)
+	if fund.PartnerID > 0 {
+		qs = qs.Filter("partner_id", fund.PartnerID)
+	}
+	_, err := qs.OrderBy("due_date", "bill_date", "id").Limit(200).All(&bills)
+	if err != nil && err != orm.ErrNoRows {
+		return nil, err
+	}
+	items := make([]SettleItem, 0, len(bills))
+	remaining := amount
+	for _, b := range bills {
+		if remaining < 0.005 {
+			break
+		}
+		balance := round2(b.Amount - b.SettledAmount)
+		if balance < 0.005 {
+			continue
+		}
+		take := balance
+		if take > remaining {
+			take = round2(remaining)
+		}
+		items = append(items, SettleItem{PartnerBillID: b.ID, Amount: take})
+		remaining = round2(remaining - take)
+	}
+	return items, nil
+}
+
+// VoidFundBill 作废收付款单：仅草稿或确认但未核销任何往来账的单据。
+func VoidFundBill(fundID uint64, tenantID string) error {
+	var fund models.ErpFundBill
+	if err := models.Orm.QueryTable(new(models.ErpFundBill)).
+		Filter("id", fundID).Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).One(&fund); err != nil {
+		return fmt.Errorf("收付款单不存在")
+	}
+	if fund.Status == 4 {
+		return nil
+	}
+	if fund.Status == 1 && fund.SettledAmount > 0.005 {
+		return fmt.Errorf("已发生核销的收付款不可作废，请做反向收付款冲销")
+	}
+	_, err := models.Orm.QueryTable(new(models.ErpFundBill)).Filter("id", fundID).
+		Update(orm.Params{"status": 4, "update_time": time.Now()})
+	return err
+}
diff --git a/go/services/erp/settings.go b/go/services/erp/settings.go
new file mode 100644
index 0000000..a65cfda
--- /dev/null
+++ b/go/services/erp/settings.go
@@ -0,0 +1,225 @@
+package erp
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"server/models"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// Settings 从租户「ERP基础设置」读取的运行时参数。
+type Settings struct {
+	NegativeAllowed    bool   // negative_stock_allowed
+	AutoDocNo          bool   // auto_generate_doc_no
+	DefaultWarehouseID uint64 // default_warehouse（存的是名称，按名称匹配）
+	SalesPriceType     string // sales_price_type：sale/wholesale/member
+}
+
+func GetSettings(tenantID string) *Settings {
+	s := &Settings{AutoDocNo: true, SalesPriceType: "sale"}
+	if v := models.GetErpNormalSettingByKey(tenantID, "negative_stock_allowed"); v != nil {
+		s.NegativeAllowed = strings.TrimSpace(v.ConfigValue) == "1"
+	}
+	if v := models.GetErpNormalSettingByKey(tenantID, "auto_generate_doc_no"); v != nil {
+		s.AutoDocNo = strings.TrimSpace(v.ConfigValue) != "0"
+	}
+	if v := models.GetErpNormalSettingByKey(tenantID, "sales_price_type"); v != nil {
+		if t := strings.TrimSpace(v.ConfigValue); t != "" {
+			s.SalesPriceType = t
+		}
+	}
+	if v := models.GetErpNormalSettingByKey(tenantID, "default_warehouse"); v != nil {
+		name := strings.TrimSpace(v.ConfigValue)
+		if name != "" {
+			var wh models.ErpWarehouse
+			if err := models.Orm.QueryTable(new(models.ErpWarehouse)).
+				Filter("tenant_id", tenantID).
+				Filter("warehouse_name", name).
+				Filter("delete_time__isnull", true).One(&wh); err == nil {
+				s.DefaultWarehouseID = wh.ID
+			}
+		}
+	}
+	if s.DefaultWarehouseID == 0 {
+		var wh models.ErpWarehouse
+		if err := models.Orm.QueryTable(new(models.ErpWarehouse)).
+			Filter("tenant_id", tenantID).
+			Filter("is_default", 1).
+			Filter("status", 1).
+			Filter("delete_time__isnull", true).One(&wh); err == nil {
+			s.DefaultWarehouseID = wh.ID
+		}
+	}
+	return s
+}
+
+// erpDocPrefixDefaults 各单据类型的取号前缀默认值（也是基础设置里可改的初值）。
+// 必须一型一前缀：共用前缀会让采购入库/其他入库、采购退货/销售退货同号段，
+// 单据号无法反推类型，日次序号也会互相穿插。
+var erpDocPrefixDefaults = map[string]string{
+	models.ErpDocPurchaseOrder:  "CGDD",
+	models.ErpDocPurchaseIn:     "CGRK",
+	models.ErpDocPurchaseReturn: "CGTH",
+	models.ErpDocSalesOrder:     "XSDD",
+	models.ErpDocSalesOut:       "XSCK",
+	models.ErpDocSalesReturn:    "XSTH",
+	models.ErpDocOtherIn:        "QTRK",
+	models.ErpDocOtherOut:       "QTCK",
+	models.ErpDocTransfer:       "DB",
+	models.ErpDocStockTake:      "PD",
+}
+
+// ErpDocPrefixKey 单据类型 → 基础设置键（document 分组，每型独立）
+func ErpDocPrefixKey(docType string) string {
+	if _, ok := erpDocPrefixDefaults[docType]; !ok {
+		return ""
+	}
+	return "doc_prefix_" + docType
+}
+
+// ErpDocPrefixDefaults 供基础设置接口登记默认前缀
+func ErpDocPrefixDefaults() map[string]string {
+	return erpDocPrefixDefaults
+}
+
+// ErpDocPrefixField 基础设置「单据设置」里一条可编辑的单据前缀
+type ErpDocPrefixField struct {
+	Key     string
+	Name    string
+	Default string
+}
+
+// 表单展示顺序：按采购→销售→其他→调拨/盘点
+var erpDocPrefixLabels = []struct {
+	docType string
+	name    string
+}{
+	{models.ErpDocPurchaseOrder, "采购订单前缀"},
+	{models.ErpDocPurchaseIn, "采购入库前缀"},
+	{models.ErpDocPurchaseReturn, "采购退货前缀"},
+	{models.ErpDocSalesOrder, "销售订单前缀"},
+	{models.ErpDocSalesOut, "销售出库前缀"},
+	{models.ErpDocSalesReturn, "销售退货前缀"},
+	{models.ErpDocOtherIn, "其他入库前缀"},
+	{models.ErpDocOtherOut, "其他出库前缀"},
+	{models.ErpDocTransfer, "调拨单前缀"},
+	{models.ErpDocStockTake, "盘点单前缀"},
+}
+
+// ErpDocPrefixFields 返回全部单据前缀配置项，供基础设置接口注册默认值
+func ErpDocPrefixFields() []ErpDocPrefixField {
+	out := make([]ErpDocPrefixField, 0, len(erpDocPrefixLabels))
+	for _, l := range erpDocPrefixLabels {
+		out = append(out, ErpDocPrefixField{
+			Key:     ErpDocPrefixKey(l.docType),
+			Name:    l.name,
+			Default: erpDocPrefixDefaults[l.docType],
+		})
+	}
+	return out
+}
+
+// docNoPrefix 按单据类型取号前缀（基础设置 document 分组），缺省用类型缩写。
+func docNoPrefix(tenantID, docType string) string {
+	if key := ErpDocPrefixKey(docType); key != "" {
+		if v := models.GetErpNormalSettingByKey(tenantID, key); v != nil {
+			if p := strings.ToUpper(strings.TrimSpace(v.ConfigValue)); p != "" {
+				return p
+			}
+		}
+	}
+	if p, ok := erpDocPrefixDefaults[docType]; ok {
+		return p
+	}
+	return "ERP"
+}
+
+// GenerateDocNo 生成单据号：前缀+YYYYMMDD+当日3位序号（按租户+类型+日期计数）。
+// 依赖 yz_backend_erp_document 的 uk_tenant_docno 唯一索引兜底，调用方需处理重号重试。
+func GenerateDocNo(o orm.QueryExecutor, tenantID, docType string) (string, error) {
+	prefix := docNoPrefix(tenantID, docType)
+	day := time.Now().Format("20060102")
+	var count int64
+	var err error
+	if o != nil {
+		count, err = o.QueryTable(new(models.ErpDocument)).
+			Filter("tenant_id", tenantID).Filter("doc_no__startswith", prefix+day).Count()
+	} else {
+		count, err = models.Orm.QueryTable(new(models.ErpDocument)).
+			Filter("tenant_id", tenantID).Filter("doc_no__startswith", prefix+day).Count()
+	}
+	if err != nil && err != orm.ErrNoRows {
+		return "", err
+	}
+	seq := count + 1
+	if seq > 999 {
+		return "", fmt.Errorf("当日单据编号已超过999，请先归档")
+	}
+	return fmt.Sprintf("%s%s%03d", prefix, day, seq), nil
+}
+
+// GenerateFundNo 收付款单号：前缀(SK/FK/QR/ZC)+日期+序号。
+func GenerateFundNo(tenantID string, fundType int8) (string, error) {
+	prefixMap := map[int8]string{
+		models.ErpFundReceive: "SK", models.ErpFundPay: "FK",
+		models.ErpFundOtherIn: "QR", models.ErpFundExpense: "FY",
+	}
+	p, ok := prefixMap[fundType]
+	if !ok {
+		p = "ZJ"
+	}
+	day := time.Now().Format("20060102")
+	count, err := models.Orm.QueryTable(new(models.ErpFundBill)).
+		Filter("tenant_id", tenantID).Filter("fund_no__startswith", p+day).Count()
+	if err != nil && err != orm.ErrNoRows {
+		return "", err
+	}
+	return fmt.Sprintf("%s%s%03d", p, day, count+1), nil
+}
+
+// GenerateProductCode 商品编号：SP+日期+当日序号（租户内唯一由 uk_tenant_code 兜底）。
+func GenerateProductCode(tenantID string) string {
+	day := time.Now().Format("20060102")
+	count, _ := models.Orm.QueryTable(new(models.ErpProduct)).
+		Filter("tenant_id", tenantID).Filter("product_code__startswith", "SP"+day).Count()
+	return fmt.Sprintf("SP%s%03d", day, count+1)
+}
+
+// GetPartnerPaymentDays 取往来单位账期天数（应收到期日计算）。
+func GetPartnerPaymentDays(partnerType string, partnerID uint64) int {
+	if partnerID == 0 {
+		return 0
+	}
+	switch partnerType {
+	case "customer":
+		var row models.TenantCrmCustomer
+		if err := models.Orm.QueryTable(new(models.TenantCrmCustomer)).
+			Filter("id", partnerID).One(&row); err == nil {
+			return row.PaymentDays
+		}
+	case "supplier":
+		var row models.TenantCrmSupplier
+		if err := models.Orm.QueryTable(new(models.TenantCrmSupplier)).
+			Filter("id", partnerID).One(&row); err == nil {
+			return row.PaymentDays
+		}
+	}
+	return 0
+}
+
+// GetCustomerCreditLimit 客户信用额度，0=不限。
+func GetCustomerCreditLimit(customerID uint64) float64 {
+	var row models.TenantCrmCustomer
+	if err := models.Orm.QueryTable(new(models.TenantCrmCustomer)).
+		Filter("id", customerID).One(&row); err != nil {
+		return 0
+	}
+	return row.CreditLimit
+}
+
+// 内部工具
+func itoa(v uint64) string { return strconv.FormatUint(v, 10) }
diff --git a/go/services/erp/stock.go b/go/services/erp/stock.go
new file mode 100644
index 0000000..f0e4726
--- /dev/null
+++ b/go/services/erp/stock.go
@@ -0,0 +1,189 @@
+package erp
+
+import (
+	"fmt"
+	"math"
+	"time"
+
+	"server/models"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// Movement 一次库存变动的入参。库存结存只能由本引擎经流水驱动。
+type Movement struct {
+	TenantID     string
+	ProductID    uint64
+	WarehouseID  uint64
+	BatchNo      string
+	Direction    int8 // models.ErpStockIn / ErpStockOut
+	Qty          float64
+	UnitCost     float64 // 入库=进价/成本；出库传 0 表示按当前加权成本
+	DocType      string
+	DocID        uint64
+	DocNo        string
+	DocItemID    uint64
+	OperatorID   string
+	OperatorName string
+	Remark       string
+	// 批次效期随入库流水落地，出库/调拨沿用同批次快照
+	ProductionDate *time.Time
+	ExpireDate     *time.Time
+}
+
+// StockError 库存不足等业务错误（调用方可据 ErrInsufficientStock 区分文案）。
+type StockError struct {
+	ProductName  string
+	Requested    float64
+	Available    float64
+	Insufficient bool
+}
+
+func (e *StockError) Error() string {
+	if e.Insufficient {
+		return fmt.Sprintf("商品「%s」库存不足：可用 %.4f，本次需要 %.4f", e.ProductName, e.Available, e.Requested)
+	}
+	return fmt.Sprintf("商品「%s」库存异常", e.ProductName)
+}
+
+// ApplyMovement 在事务内执行一条库存变动：
+//  1. 定位/创建结存行（tenant+product+warehouse+batch 唯一）；
+//  2. 出库时校验可用量（负库存开关取自基础设置）；
+//  3. 入库按移动加权平均重算单位成本；出库成本=出库时加权成本（记入流水，毛利口径）；
+//  4. 写库存流水 + 更新结存。
+//
+// 返回出库时点的单位成本（销售成本/退货回冲依据）。
+func ApplyMovement(o orm.QueryExecutor, mv *Movement) (float64, error) {
+	if mv.Qty <= 0 {
+		return 0, fmt.Errorf("库存变动数量必须大于0")
+	}
+	if mv.WarehouseID == 0 || mv.ProductID == 0 {
+		return 0, fmt.Errorf("库存变动缺少商品或仓库")
+	}
+
+	settings := GetSettings(mv.TenantID)
+
+	var product models.ErpProduct
+	if err := o.QueryTable(new(models.ErpProduct)).
+		Filter("id", mv.ProductID).Filter("tenant_id", mv.TenantID).One(&product); err != nil {
+		return 0, fmt.Errorf("商品不存在(id=%d)", mv.ProductID)
+	}
+
+	var stock models.ErpStock
+	err := o.QueryTable(new(models.ErpStock)).
+		Filter("tenant_id", mv.TenantID).
+		Filter("product_id", mv.ProductID).
+		Filter("warehouse_id", mv.WarehouseID).
+		Filter("batch_no", mv.BatchNo).
+		ForUpdate().One(&stock)
+	if err == orm.ErrNoRows {
+		stock = models.ErpStock{
+			TenantID: mv.TenantID, ProductID: mv.ProductID,
+			WarehouseID: mv.WarehouseID, BatchNo: mv.BatchNo,
+			Quantity: 0, CostPrice: product.PurchasePrice,
+			UpdateTime: time.Now(),
+		}
+		id, ierr := o.Insert(&stock)
+		if ierr != nil {
+			return 0, fmt.Errorf("初始化库存结存失败: %v", ierr)
+		}
+		stock.ID = uint64(id)
+	} else if err != nil {
+		return 0, fmt.Errorf("查询库存失败: %v", err)
+	}
+
+	before := stock.Quantity
+	dir := mv.Direction
+	unitCost := mv.UnitCost
+	outCost := stock.CostPrice // 出库成本口径：当前加权成本
+
+	if dir == models.ErpStockOut {
+		if !settings.NegativeAllowed && before-mv.Qty < -0.000001 {
+			return 0, &StockError{
+				ProductName:  product.ProductName,
+				Requested:    mv.Qty,
+				Available:    before,
+				Insufficient: true,
+			}
+		}
+		after := before - mv.Qty
+		if unitCost <= 0 {
+			unitCost = outCost
+		}
+		if err := writeLedger(o, mv, dir, before, after, unitCost); err != nil {
+			return 0, err
+		}
+		if _, err := o.QueryTable(new(models.ErpStock)).Filter("id", stock.ID).
+			Update(orm.Params{"quantity": after, "update_time": time.Now()}); err != nil {
+			return 0, fmt.Errorf("更新库存结存失败: %v", err)
+		}
+		return unitCost, nil
+	}
+
+	// 入库：移动加权平均
+	if unitCost <= 0 {
+		unitCost = product.PurchasePrice
+	}
+	after := before + mv.Qty
+	newCost := unitCost
+	if after > 0.000001 {
+		newCost = (before*stock.CostPrice + mv.Qty*unitCost) / after
+	}
+	if err := writeLedger(o, mv, dir, before, after, unitCost); err != nil {
+		return 0, err
+	}
+	if _, err := o.QueryTable(new(models.ErpStock)).Filter("id", stock.ID).
+		Update(orm.Params{"quantity": after, "cost_price": newCost, "update_time": time.Now()}); err != nil {
+		return 0, fmt.Errorf("更新库存结存失败: %v", err)
+	}
+	return unitCost, nil
+}
+
+func writeLedger(o orm.QueryExecutor, mv *Movement, dir int8, before, after, unitCost float64) error {
+	now := time.Now()
+	ledger := models.ErpStockLedger{
+		TenantID: mv.TenantID, ProductID: mv.ProductID, WarehouseID: mv.WarehouseID,
+		BatchNo: mv.BatchNo, Direction: dir, Quantity: mv.Qty,
+		BeforeQty: before, AfterQty: after,
+		UnitCost: unitCost, TotalCost: round2(unitCost * mv.Qty),
+		DocType: mv.DocType, DocID: mv.DocID, DocNo: mv.DocNo, DocItemID: mv.DocItemID,
+		ProductionDate: mv.ProductionDate, ExpireDate: mv.ExpireDate,
+		OperatorID: mv.OperatorID, OperatorName: mv.OperatorName,
+		Remark: mv.Remark, CreateTime: now,
+	}
+	if _, err := o.Insert(&ledger); err != nil {
+		return fmt.Errorf("写入库存流水失败: %v", err)
+	}
+	return nil
+}
+
+// RefOutboundCost 取某条出库流水记录的出库成本（销售退货回冲入库成本用）。
+func RefOutboundCost(o orm.QueryExecutor, tenantID string, docItemID uint64) float64 {
+	if docItemID == 0 {
+		return 0
+	}
+	var led models.ErpStockLedger
+	if err := o.QueryTable(new(models.ErpStockLedger)).
+		Filter("tenant_id", tenantID).
+		Filter("doc_item_id", docItemID).
+		Filter("direction", models.ErpStockOut).
+		OrderBy("-id").One(&led); err != nil {
+		return 0
+	}
+	return led.UnitCost
+}
+
+func round2(v float64) float64 {
+	return math.Round(v*100) / 100
+}
+
+func round4(v float64) float64 {
+	return math.Round(v*10000) / 10000
+}
+
+func absf(v float64) float64 {
+	if v < 0 {
+		return -v
+	}
+	return v
+}
diff --git a/go/services/permission.go b/go/services/permission.go
index e660c5f..e26da4b 100644
--- a/go/services/permission.go
+++ b/go/services/permission.go
@@ -2,13 +2,55 @@ package services
 
 import (
 	"encoding/json"
+	"strconv"
 	"strings"
 
 	"server/models"
 )
 
+// ParseMenuRights 将角色 rights 解析为菜单 ID 集合（兼容 JSON 数组 / 逗号分隔）。
+// 数字数组是角色保存接口 json.Marshal([]uint64) 写回的规范格式，必须支持；
+// 若只按 []string 反序列化会整体失败并退化成逗号切分，
+// 首尾元素会带上 [ / ] 而解析不出数字，导致第一个和最后一个菜单被静默丢弃。
+func ParseMenuRights(raw string) map[uint64]bool {
+	set := map[uint64]bool{}
+	var arr []interface{}
+	if err := json.Unmarshal([]byte(raw), &arr); err == nil {
+		for _, v := range arr {
+			if n := menuIDOf(v); n > 0 {
+				set[n] = true
+			}
+		}
+		return set
+	}
+	for _, s := range strings.Split(raw, ",") {
+		if n, e := strconv.ParseUint(strings.TrimSpace(s), 10, 64); e == nil {
+			set[n] = true
+		}
+	}
+	return set
+}
+
+// menuIDOf 把 JSON 元素（数字或字符串）转成菜单 ID，无效时返回 0
+func menuIDOf(v interface{}) uint64 {
+	switch t := v.(type) {
+	case float64:
+		if t > 0 {
+			return uint64(t)
+		}
+	case string:
+		if n, e := strconv.ParseUint(strings.TrimSpace(t), 10, 64); e == nil {
+			return n
+		}
+	}
+	return 0
+}
+
 // CheckUserPermission 校验用户是否拥有指定权限标识。
-// 兼容 rights 为 JSON 数组 / 逗号分隔字符串；解析失败时默认放行，避免历史数据阻断请求。
+// rights 里存的是菜单 ID 而不是权限串，必须经 yz_system_menu.permission 换算后再比对；
+// 直接拿 rights 元素和权限串比永远不相等，会把本来有权限的角色全部判成无权访问。
+// rights 为空（nil / 空串）视为全权限，与菜单过滤 filterMenusByRights 口径一致；
+// rights 有内容却解析不出任何菜单 ID（历史脏数据）按无权限处理，不放行。
 func CheckUserPermission(userID int, permission string) (bool, error) {
 	if permission == "" || userID <= 0 {
 		return true, nil
@@ -26,25 +68,25 @@ func CheckUserPermission(userID int, permission string) (bool, error) {
 	if role.Rights == nil || strings.TrimSpace(*role.Rights) == "" {
 		return true, nil
 	}
-	rightsRaw := strings.TrimSpace(*role.Rights)
 
-	// 1) JSON 数组格式
-	var arr []string
-	if err := json.Unmarshal([]byte(rightsRaw), &arr); err == nil {
-		for _, p := range arr {
-			if strings.TrimSpace(p) == permission {
-				return true, nil
-			}
-		}
+	menuIDs := ParseMenuRights(*role.Rights)
+	if len(menuIDs) == 0 {
 		return false, nil
 	}
-
-	// 2) 逗号分隔字符串
-	for _, p := range strings.Split(rightsRaw, ",") {
-		if strings.TrimSpace(p) == permission {
-			return true, nil
-		}
+	idList := make([]uint64, 0, len(menuIDs))
+	for id := range menuIDs {
+		idList = append(idList, id)
 	}
 
-	return false, nil
+	// 只有启用且未删除的菜单才能授予权限，禁用的菜单不应继续放行其权限标识
+	count, err := models.Orm.QueryTable(new(models.SystemMenu)).
+		Filter("id__in", idList).
+		Filter("permission", permission).
+		Filter("status", 1).
+		Filter("delete_time__isnull", true).
+		Count()
+	if err != nil {
+		return false, err
+	}
+	return count > 0, nil
 }
diff --git a/go/services/permission_test.go b/go/services/permission_test.go
new file mode 100644
index 0000000..7e724e3
--- /dev/null
+++ b/go/services/permission_test.go
@@ -0,0 +1,49 @@
+package services
+
+import "testing"
+
+// 这些用例只覆盖权限模块中不依赖数据库的纯函数：角色 rights 解析。
+// CheckUserPermission 需要查用户/角色/菜单表，属于集成测试范围，此处不覆盖。
+
+func TestParseMenuRights(t *testing.T) {
+	cases := []struct {
+		name string
+		raw  string
+		want []uint64
+	}{
+		// 规范格式：角色保存接口 json.Marshal([]uint64) 写回的数字数组。
+		// 曾经只按 []string 反序列化，整体失败后退化成逗号切分，
+		// 首尾元素带上 [ / ] 解析不出数字，第一个和最后一个菜单被静默丢弃。
+		{"数字数组", "[15,36,37,263]", []uint64{15, 36, 37, 263}},
+		{"单元素数组", "[7]", []uint64{7}},
+		{"字符串数组", `["15","36"]`, []uint64{15, 36}},
+		{"逗号分隔", "15, 36 ,263", []uint64{15, 36, 263}},
+		{"空数组", "[]", nil},
+		{"空串", "", nil},
+		{"脏数据", "abc", nil},
+	}
+
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			got := ParseMenuRights(c.raw)
+			if len(got) != len(c.want) {
+				t.Fatalf("rights=%q 期望解析出 %d 个菜单 ID，实际 %d 个：%v", c.raw, len(c.want), len(got), got)
+			}
+			for _, id := range c.want {
+				if !got[id] {
+					t.Fatalf("rights=%q 期望包含菜单 ID %d，实际结果 %v", c.raw, id, got)
+				}
+			}
+		})
+	}
+}
+
+func TestParseMenuRightsKeepsBoundaryIDs(t *testing.T) {
+	// 单独锁住边界元素：丢首尾是线上真实出现过的故障表现（菜单页渲染成 404）
+	got := ParseMenuRights("[15,36,37,38,263]")
+	for _, id := range []uint64{15, 263} {
+		if !got[id] {
+			t.Fatalf("首尾菜单 ID %d 丢失，解析结果 %v", id, got)
+		}
+	}
+}
diff --git a/milktea-site/preview-server.mjs b/milktea-site/preview-server.mjs
new file mode 100644
index 0000000..c95c2d0
--- /dev/null
+++ b/milktea-site/preview-server.mjs
@@ -0,0 +1,24 @@
+import { createServer } from "node:http";
+import { readFile } from "node:fs/promises";
+import { extname, join } from "node:path";
+
+const root = join(import.meta.dirname, "dist");
+const port = Number(process.argv[2] || 4173);
+const types = {
+  ".html": "text/html; charset=utf-8",
+  ".css": "text/css; charset=utf-8",
+  ".js": "text/javascript; charset=utf-8",
+  ".svg": "image/svg+xml",
+};
+
+createServer(async (req, res) => {
+  const path = new URL(req.url, "http://127.0.0.1").pathname;
+  const file = path === "/" ? "index.html" : path;
+  try {
+    const body = await readFile(join(root, file));
+    res.writeHead(200, { "content-type": types[extname(file)] || "application/octet-stream" });
+    res.end(body);
+  } catch {
+    res.writeHead(404).end("not found");
+  }
+}).listen(port, "127.0.0.1", () => console.log(`preview http://127.0.0.1:${port}/`));
diff --git a/platform/src/views/basicSettings/roles/index.vue b/platform/src/views/basicSettings/roles/index.vue
index 8992b38..bedbe64 100644
--- a/platform/src/views/basicSettings/roles/index.vue
+++ b/platform/src/views/basicSettings/roles/index.vue
@@ -63,6 +63,25 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="租户端" width="120" align="center">
+          <template #default="{ row }">
+            <el-tag v-if="Number(row.cid) !== 2" size="small" effect="plain">
+              不适用
+            </el-tag>
+            <el-tooltip
+              v-else-if="isLockedForTenant(row)"
+              content="租户后台只能查看和使用该角色，不能改名、改权限或删除"
+              placement="top"
+            >
+              <el-tag type="success" size="small" effect="plain">
+                只读下发
+              </el-tag>
+            </el-tooltip>
+            <el-tag v-else type="warning" size="small" effect="plain">
+              租户自管
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="status" label="状态" width="90" align="center">
           <template #default="{ row }">
             <el-tag :type="row.status === 1 ? 'success' : 'info'" size="small">
@@ -181,6 +200,10 @@ const getScopeLabel = (row: any) => {
   return tenantNameMap.value[tid] || `租户ID: ${tid}`;
 };
 
+// 租户端是否只读：口径同后端 tenantRoleReadOnly（is_locked 或全局角色）
+const isLockedForTenant = (row: any) =>
+  Number(row.is_locked || 0) === 1 || Number(row.tenant_id || 0) === 0;
+
 // 权限展示：空 = 全权限；有值展示权限项数量
 const formatRights = (rights: any) => {
   if (rights === null || rights === undefined) return "全权限";
diff --git a/uniapp/api/erp.js b/uniapp/api/erp.js
new file mode 100644
index 0000000..db5d573
--- /dev/null
+++ b/uniapp/api/erp.js
@@ -0,0 +1,784 @@
+import { request } from '@/api/request.js'
+
+/**
+ * 进销存移动端接口封装，对应后端 /api/erp/*（路由表 go/routers/api/erp.go）。
+ * 与 Web 后台 /backend/erp/* 共用同一份统计口径：报表只认「已生效」单据与库存流水，
+ * 所以手机端看到的金额、毛利、预警数与 Web 端永远一致。
+ * 商品/仓库/客商在本端只读，建档一律回 Web 端完成。
+ */
+
+/** 单据状态机：草稿 →(提交审批) 审批中 →(引擎通过) 已生效；驳回/作废为终态 */
+export const DOC_STATUS = {
+	DRAFT: 0,
+	APPROVING: 1,
+	APPROVED: 2,
+	REJECTED: 3,
+	CANCELLED: 4
+}
+
+export const DOC_STATUS_OPTIONS = [
+	{ value: DOC_STATUS.DRAFT, label: '草稿', type: 'info' },
+	{ value: DOC_STATUS.APPROVING, label: '审批中', type: 'primary' },
+	{ value: DOC_STATUS.APPROVED, label: '已生效', type: 'success' },
+	{ value: DOC_STATUS.REJECTED, label: '已驳回', type: 'error' },
+	{ value: DOC_STATUS.CANCELLED, label: '已作废', type: 'warning' }
+]
+
+/** 往来账核销状态 */
+export const BILL_STATUS_OPTIONS = [
+	{ value: 0, label: '未核销', type: 'warning' },
+	{ value: 1, label: '部分核销', type: 'primary' },
+	{ value: 2, label: '已结清', type: 'success' }
+]
+
+/** 收付款方式：1收款 2付款 3其他收入 4费用支出 */
+export const FUND_TYPES = [
+	{ value: 1, label: '收款', color: 'success' },
+	{ value: 2, label: '付款', color: 'error' },
+	{ value: 3, label: '其他收入', color: 'primary' },
+	{ value: 4, label: '费用支出', color: 'warning' }
+]
+
+/** 收款/付款单的结算方式（与 Web 端 payment.vue methodOptions 同一套值） */
+export const FUND_METHODS = [
+	{ value: 'cash', label: '现金' },
+	{ value: 'bank', label: '银行转账' },
+	{ value: 'wechat', label: '微信' },
+	{ value: 'alipay', label: '支付宝' }
+]
+
+/** 收付款单状态：仅草稿可改，确认后驱动核销，作废会回滚已核销余额 */
+export const FUND_STATUS_OPTIONS = [
+	{ value: 0, label: '草稿', type: 'info' },
+	{ value: 1, label: '已确认', type: 'success' },
+	{ value: 4, label: '已作废', type: 'warning' }
+]
+
+/** 往来账核销状态（列表筛选值，与后端 settle_state 参数一致） */
+export const SETTLE_STATES = [
+	{ value: 'open', label: '未结清' },
+	{ value: 'part', label: '部分核销' },
+	{ value: 'done', label: '已结清' }
+]
+
+/** 单据类型 → 中文名（列表/流水里只有 doc_type 字符串时兜底用） */
+export const DOC_TYPE_LABELS = {
+	purchase_order: '采购订单',
+	purchase_in: '采购入库',
+	purchase_return: '采购退货',
+	sales_order: '销售订单',
+	sales_out: '销售出库',
+	sales_return: '销售退货',
+	other_in: '其他入库',
+	other_out: '其他出库',
+	transfer: '库存调拨',
+	stock_take: '库存盘点'
+}
+
+export function docTypeLabel(type) {
+	return DOC_TYPE_LABELS[type] || type
+}
+
+/** 往来账类型 */
+export const BILL_TYPES = [
+	{ value: 1, label: '应收', color: 'error' },
+	{ value: 2, label: '应付', color: 'success' }
+]
+
+export const PARTNER_TYPES = [
+	{ value: 'supplier', label: '供应商' },
+	{ value: 'customer', label: '客户' }
+]
+
+/** 库存预警状态（后端 safety_state 三值） */
+export const SAFETY_STATE_OPTIONS = [
+	{ value: '', label: '全部' },
+	{ value: 'low', label: '低于安全库存', type: 'warning' },
+	{ value: 'over', label: '库存积压', type: 'primary' },
+	{ value: 'normal', label: '正常', type: 'success' }
+]
+
+/** 批次效期状态 */
+export const EXPIRE_STATE_OPTIONS = [
+	{ value: '', label: '全部' },
+	{ value: 'expired', label: '已过期', type: 'error' },
+	{ value: 'expiring', label: '30天内到期', type: 'warning' },
+	{ value: 'normal', label: '正常', type: 'success' }
+]
+
+/** 购销汇总维度 */
+export const REPORT_DIMENSIONS = [
+	{ value: 'product', label: '按商品' },
+	{ value: 'supplier', label: '按供应商' },
+	{ value: 'customer', label: '按客户' },
+	{ value: 'month', label: '按月' }
+]
+
+const LABEL_FALLBACK = { value: '未知' }
+
+export function findOption(options, value) {
+	return options.find(item => String(item.value) === String(value ?? '')) || LABEL_FALLBACK
+}
+
+export function docStatusLabel(status) {
+	return findOption(DOC_STATUS_OPTIONS, status).label || status
+}
+
+export function docStatusType(status) {
+	return findOption(DOC_STATUS_OPTIONS, status).type || 'info'
+}
+
+export function billStatusLabel(status) {
+	return findOption(BILL_STATUS_OPTIONS, status).label
+}
+
+export function billStatusType(status) {
+	return findOption(BILL_STATUS_OPTIONS, status).type || 'info'
+}
+
+export function fundMethodLabel(method) {
+	return findOption(FUND_METHODS, method).label || method
+}
+
+export function fundStatusLabel(status) {
+	return findOption(FUND_STATUS_OPTIONS, status).label
+}
+
+export function fundStatusType(status) {
+	return findOption(FUND_STATUS_OPTIONS, status).type || 'info'
+}
+
+export function partnerTypeLabel(type) {
+	return findOption(PARTNER_TYPES, type).label
+}
+
+export function safetyStateLabel(state) {
+	return findOption(SAFETY_STATE_OPTIONS, state).label || state
+}
+
+/** 金额展示：千分位可选，统一两位小数 */
+export function moneyText(value) {
+	const num = Number(value || 0)
+	return num.toFixed(2)
+}
+
+/** 数量展示：去掉浮点尾巴，最多四位小数 */
+export function qtyText(value) {
+	const num = Number(value || 0)
+	return String(Math.round(num * 10000) / 10000)
+}
+
+/** ISO 时间串取日期部分 */
+export function dayText(value) {
+	return String(value || '').slice(0, 10)
+}
+
+export function dateTimeText(value) {
+	const s = String(value || '')
+	return s ? `${s.slice(0, 10)} ${s.slice(11, 16)}` : ''
+}
+
+/** 分页参数归一：后端 pageSize 上限 100，越界回落 20 */
+function pageArgs(params) {
+	return {
+		page: params.page || 1,
+		pageSize: params.pageSize || 20
+	}
+}
+
+/** 日期区间参数：空值不传，避免覆盖后端默认口径 */
+function rangeArgs(params) {
+	const out = {}
+	if (params.dateFrom) out.date_from = params.dateFrom
+	if (params.dateTo) out.date_to = params.dateTo
+	return out
+}
+
+// ----------------------------------------------------------------- 元数据 / 看板
+
+/**
+ * 开单字典：单据类型（含往来口径与是否动库存）、状态档、默认仓库、价格体系、负库存开关
+ */
+export function fetchErpMeta() {
+	return request({ url: '/api/erp/meta' })
+}
+
+/** 单据类型字典（列表筛选、开单选择都用它，避免端上硬编码十种类型） */
+export async function fetchDocTypes() {
+	const meta = await fetchErpMeta()
+	return meta.doc_types || []
+}
+
+/**
+ * 经营看板：本月购销/毛利、今日销售、库存价值、往来余额、待办、近 6 月趋势、预警计数
+ */
+export async function fetchErpDashboard() {
+	const data = await request({ url: '/api/erp/dashboard' })
+	return {
+		month: data.month || {},
+		today: data.today || {},
+		stock: data.stock || {},
+		partnerBill: data.partner_bill || {},
+		todo: data.todo || {},
+		trend: data.trend || [],
+		warning: data.warning || {}
+	}
+}
+
+// ----------------------------------------------------------------- 单据
+
+/**
+ * 单据列表
+ * params: { docType | docTypes[], status, keyword, partnerId, warehouseId, sourceDocId,
+ *           dateFrom, dateTo, page, pageSize }
+ */
+export async function fetchDocs(params = {}) {
+	const data = await request({
+		url: '/api/erp/document/list',
+		data: {
+			...pageArgs(params),
+			doc_type: params.docType || '',
+			doc_types: Array.isArray(params.docTypes) ? params.docTypes.join(',') : (params.docTypes || ''),
+			status: params.status ?? '',
+			keyword: params.keyword || '',
+			partner_id: params.partnerId || '',
+			warehouse_id: params.warehouseId || '',
+			source_doc_id: params.sourceDocId || '',
+			...rangeArgs(params)
+		}
+	})
+	return { list: (data.list || []).map(normalizeDoc), total: data.total || 0 }
+}
+
+/** 单据详情（含明细行、实时库存与审批实例摘要） */
+export async function getDoc(id) {
+	const data = await request({ url: `/api/erp/document/detail/${id}` })
+	if (!data) return null
+	return normalizeDoc(data, true)
+}
+
+/**
+ * 新建/覆盖保存单据（草稿），返回 { id, docNo }
+ * doc: { id?, docType, bizDate, warehouseId, toWarehouseId, partnerId, sourceDocId,
+ *        discountAmount, remark, items: [{ productId, quantity, unitPrice, ... }] }
+ */
+export async function saveDoc(doc) {
+	const res = await request({
+		url: '/api/erp/document/save',
+		method: 'POST',
+		data: buildDocPayload(doc)
+	})
+	return { id: res?.id, docNo: res?.doc_no || '' }
+}
+
+/** 直接审核生效（跳过审批引擎，用于未绑定审批流的租户） */
+export function approveDoc(id) {
+	return request({ url: `/api/erp/document/approve/${id}`, method: 'POST', data: {} })
+}
+
+/** 作废单据（草稿/审批中/已驳回可作废） */
+export function cancelDoc(id) {
+	return request({ url: `/api/erp/document/cancel/${id}`, method: 'POST', data: {} })
+}
+
+/** 删除单据（仅草稿/已驳回） */
+export async function deleteDoc(id) {
+	await request({ url: `/api/erp/document/delete/${id}`, method: 'DELETE' })
+	return true
+}
+
+/** 提交审批：flowId 为空时后端按单据类型自动选流（flow_id 走 query，不进 body） */
+export async function submitDoc(id, flowId) {
+	const query = flowId ? `?flow_id=${flowId}` : ''
+	const res = await request({ url: `/api/erp/document/submit/${id}${query}`, method: 'POST', data: {} })
+	return res?.instance_id
+}
+
+/** 单据类型可用的审批流 */
+export async function fetchDocFlows(docType) {
+	const data = await request({ url: '/api/erp/document/flows', data: { doc_type: docType } })
+	return { list: data.list || [], bizType: data.biz_type || '' }
+}
+
+/**
+ * 来源订单的可执行明细行（下单量 - 已执行量），用于「订单转入库/出库」
+ */
+export async function fetchExecutableDocs(docId) {
+	const data = await request({ url: `/api/erp/document/executable/${docId}` })
+	return {
+		doc: data.doc || null,
+		items: (data.items || []).map(item => ({
+			...item,
+			remain_qty: Number(item.remain_qty || 0),
+			quantity: Number(item.quantity || 0),
+			executed_qty: Number(item.executed_qty || 0)
+		}))
+	}
+}
+
+/** 盘点表：带出仓库账面库存，供盘点录入对比差异 */
+export async function fetchTakeSheet(warehouseId) {
+	const data = await request({ url: '/api/erp/document/takeSheet', data: { warehouse_id: warehouseId } })
+	return (data.list || []).map(row => ({ ...row, book_qty: Number(row.book_qty || 0) }))
+}
+
+// ----------------------------------------------------------------- 库存
+
+/**
+ * 库存查询
+ * params: { warehouseId, productId, categoryId, batchNo, keyword, groupBy('product'|其它=分仓批次),
+ *           safetyState, onlyStock, page, pageSize } → { list, total, sumAmount }
+ */
+export async function fetchStocks(params = {}) {
+	const data = await request({
+		url: '/api/erp/stock/list',
+		data: {
+			...pageArgs(params),
+			warehouse_id: params.warehouseId || '',
+			product_id: params.productId || '',
+			category_id: params.categoryId || '',
+			batch_no: params.batchNo || '',
+			keyword: params.keyword || '',
+			group_by: params.groupBy || '',
+			safety_state: params.safetyState || '',
+			only_stock: params.onlyStock ? 1 : ''
+		}
+	})
+	return { list: data.list || [], total: data.total || 0, sumAmount: Number(data.sum_amount || 0) }
+}
+
+/**
+ * 库存流水（收发存台账）
+ * params: { productId, warehouseId, docType, batchNo, docNo, dateFrom, dateTo, page, pageSize }
+ */
+export async function fetchStockLedger(params = {}) {
+	const data = await request({
+		url: '/api/erp/stock/ledger',
+		data: {
+			...pageArgs(params),
+			product_id: params.productId || '',
+			warehouse_id: params.warehouseId || '',
+			doc_type: params.docType || '',
+			batch_no: params.batchNo || '',
+			doc_no: params.docNo || '',
+			...rangeArgs(params)
+		}
+	})
+	return {
+		list: (data.list || []).map(row => ({
+			...row,
+			create_time_text: dateTimeText(row.create_time),
+			biz_date: dayText(row.create_time)
+		})),
+		total: data.total || 0
+	}
+}
+
+/** 库存预警四类分组 + 计数 */
+export async function fetchStockWarning() {
+	const data = await request({ url: '/api/erp/stock/warning' })
+	return {
+		low: data.low || [],
+		over: data.over || [],
+		out: data.out || [],
+		expiring: data.expiring || [],
+		counts: data.counts || { low: 0, over: 0, out: 0, expiring: 0 }
+	}
+}
+
+/** 智能补货建议（含在途、近 30 天销量、建议量与金额） */
+export async function fetchReplenish() {
+	const data = await request({ url: '/api/erp/stock/replenish' })
+	return { list: data.list || [], total: data.total || 0 }
+}
+
+/**
+ * 批次台账
+ * params: { warehouseId, productId, keyword, expireState, onlyPositive, page, pageSize }
+ */
+export async function fetchBatches(params = {}) {
+	const data = await request({
+		url: '/api/erp/stock/batch',
+		data: {
+			...pageArgs(params),
+			warehouse_id: params.warehouseId || '',
+			product_id: params.productId || '',
+			keyword: params.keyword || '',
+			expire_state: params.expireState || '',
+			only_positive: params.onlyPositive ? 1 : ''
+		}
+	})
+	return { list: data.list || [], total: data.total || 0 }
+}
+
+// ----------------------------------------------------------------- 档案（只读）
+
+/**
+ * 商品列表
+ * params: { keyword, categoryId, brand, onlyEnabled, page, pageSize }
+ */
+export async function fetchProducts(params = {}) {
+	const data = await request({
+		url: '/api/erp/product/list',
+		data: {
+			...pageArgs(params),
+			keyword: params.keyword || '',
+			category_id: params.categoryId || '',
+			brand: params.brand || '',
+			only_enabled: params.onlyEnabled ? 1 : ''
+		}
+	})
+	return { list: data.list || [], total: data.total || 0 }
+}
+
+/** 商品详情（含分仓库存 stocks[]） */
+export function getProduct(id) {
+	return request({ url: `/api/erp/product/detail/${id}` })
+}
+
+/** 商品分类：list 平铺 + tree 递归树 */
+export async function fetchCategories() {
+	const data = await request({ url: '/api/erp/product/category/list' })
+	return { list: data.list || [], tree: data.tree || [] }
+}
+
+/** 仓库列表（带在库品种数与货值，无分页） */
+export async function fetchWarehouses(params = {}) {
+	const data = await request({
+		url: '/api/erp/warehouse/list',
+		data: { keyword: params.keyword || '', only_enabled: params.onlyEnabled ? 1 : '' }
+	})
+	return (data.list || []).map(row => ({
+		...(row.warehouse || {}),
+		stock_kinds: row.stock_kinds || 0,
+		stock_value: Number(row.stock_value || 0)
+	}))
+}
+
+/**
+ * 客商列表（统一出参）
+ * params: { partnerType('supplier'|其它=客户), keyword, onlyEnabled, page, pageSize }
+ */
+export async function fetchPartners(params = {}) {
+	const data = await request({
+		url: '/api/erp/partner/list',
+		data: {
+			...pageArgs(params),
+			partner_type: params.partnerType || 'customer',
+			keyword: params.keyword || '',
+			only_enabled: params.onlyEnabled ? 1 : ''
+		}
+	})
+	return { list: data.list || [], total: data.total || 0 }
+}
+
+/**
+ * 客商详情：必须显式带 partner_type，缺省后端按客户查
+ */
+export function getPartner(id, partnerType) {
+	return request({ url: `/api/erp/partner/detail/${id}`, data: { partner_type: partnerType || 'customer' } })
+}
+
+// ----------------------------------------------------------------- 往来账 / 收付款
+
+/**
+ * 应收应付列表
+ * params: { billType(1|2), partnerId, sourceDocId, settleState('open'|'part'|'done'),
+ *           keyword, dateFrom, dateTo, page, pageSize }
+ * → { list, total, summary: { openReceivable, openPayable } }
+ */
+export async function fetchBills(params = {}) {
+	const data = await request({
+		url: '/api/erp/finance/bill/list',
+		data: {
+			...pageArgs(params),
+			bill_type: params.billType ?? '',
+			partner_id: params.partnerId || '',
+			source_doc_id: params.sourceDocId || '',
+			partner_type: params.partnerType || '',
+			settle_state: params.settleState || '',
+			keyword: params.keyword || '',
+			...rangeArgs(params)
+		}
+	})
+	return {
+		list: (data.list || []).map(normalizeBillRow),
+		total: data.total || 0,
+		summary: {
+			openReceivable: Number((data.summary || {}).open_receivable || 0),
+			openPayable: Number((data.summary || {}).open_payable || 0)
+		}
+	}
+}
+
+/** 往来账详情：核销记录、关联收付款单、来源单据明细 */
+export async function getBill(id) {
+	const data = await request({ url: `/api/erp/finance/bill/detail/${id}` })
+	if (!data) return null
+	return {
+		bill: normalizeBillRow({ bill: data.bill, balance: Number(data.bill?.amount || 0) - Number(data.bill?.settled_amount || 0) }),
+		settles: data.settles || [],
+		funds: Object.keys(data.funds || {}).map(key => data.funds[key]),
+		docItems: data.doc_items || []
+	}
+}
+
+/** 账龄分析：按客商分桶 + 应收/应付合计 */
+export async function fetchAging() {
+	const data = await request({ url: '/api/erp/finance/aging' })
+	return {
+		list: data.list || [],
+		summary: data.summary || {},
+		buckets: data.buckets || []
+	}
+}
+
+/** 资金流水（按日汇总，默认近 30 天） */
+export async function fetchCashFlow(params = {}) {
+	const data = await request({
+		url: '/api/erp/finance/cashflow',
+		data: rangeArgs(params)
+	})
+	return {
+		list: data.list || [],
+		totalIn: Number(data.total_in || 0),
+		totalOut: Number(data.total_out || 0),
+		net: Number(data.net || 0)
+	}
+}
+
+/** 客商往来汇总（累计/未结，收付双向） */
+export async function fetchPartnerSummary(partnerType) {
+	const data = await request({
+		url: '/api/erp/finance/partner',
+		data: { partner_type: partnerType || '' }
+	})
+	return data.list || []
+}
+
+/**
+ * 收付款单列表
+ * params: { fundType(1..4), status, partnerId, keyword, dateFrom, dateTo, page, pageSize }
+ */
+export async function fetchFunds(params = {}) {
+	const data = await request({
+		url: '/api/erp/finance/fund/list',
+		data: {
+			...pageArgs(params),
+			fund_type: params.fundType ?? '',
+			status: params.status ?? '',
+			partner_id: params.partnerId || '',
+			keyword: params.keyword || '',
+			...rangeArgs(params)
+		}
+	})
+	return { list: (data.list || []).map(normalizeFund), total: data.total || 0 }
+}
+
+/** 收付款单详情（含核销行与被核销的往来账） */
+export async function getFund(id) {
+	const data = await request({ url: `/api/erp/finance/fund/detail/${id}` })
+	if (!data) return null
+	return { fund: normalizeFund(data.fund || {}), settles: data.fund?.settles || [], bills: data.bills || [] }
+}
+
+/** 待核销的往来账（confirm 页面选账用）：fundType=2 查应付，其余查应收 */
+export async function fetchOpenBills(fundType, partnerId) {
+	const data = await request({
+		url: '/api/erp/finance/fund/openBills',
+		data: { fund_type: fundType, partner_id: partnerId || '' }
+	})
+	return (data.list || []).map(row => ({ ...row, balance: Number(row.balance || 0) }))
+}
+
+/** 新建/修改收付款草稿，返回 { id, fundNo } */
+export async function saveFund(fund) {
+	const res = await request({
+		url: '/api/erp/finance/fund/save',
+		method: 'POST',
+		data: {
+			id: fund.id || 0,
+			fund_type: Number(fund.fundType),
+			partner_id: fund.partnerId || 0,
+			amount: Number(fund.amount) || 0,
+			pay_method: fund.payMethod || 'cash',
+			pay_account: fund.payAccount || '',
+			biz_date: fund.bizDate || '',
+			remark: fund.remark || ''
+		}
+	})
+	return { id: res?.id, fundNo: res?.fund_no || '' }
+}
+
+/**
+ * 确认收付款并核销
+ * settles 为空 → 后端按到期日 FIFO 自动核销；
+ * settles = [{ partnerBillId, amount }] → 按单核销
+ */
+export function confirmFund(id, settles) {
+	return request({
+		url: `/api/erp/finance/fund/confirm/${id}`,
+		method: 'POST',
+		data: { settles: (settles || []).map(s => ({ partner_bill_id: s.partnerBillId, amount: Number(s.amount) })) }
+	})
+}
+
+/** 作废收付款单（已发生核销的不可作废，需做反向冲销） */
+export function voidFund(id) {
+	return request({ url: `/api/erp/finance/fund/void/${id}`, method: 'POST', data: {} })
+}
+
+/** 删除收付款草稿（仅草稿） */
+export async function deleteFund(id) {
+	await request({ url: `/api/erp/finance/fund/delete/${id}`, method: 'DELETE' })
+	return true
+}
+
+// ----------------------------------------------------------------- 报表
+
+/** 采购汇总：dimension = product|supplier|month */
+export async function fetchPurchaseSummary(params = {}) {
+	const data = await request({
+		url: '/api/erp/report/purchase',
+		data: { dimension: params.dimension || 'product', partner_id: params.partnerId || '', ...rangeArgs(params) }
+	})
+	return normalizeSummary(data)
+}
+
+/** 销售汇总：dimension = product|customer|month */
+export async function fetchSalesSummary(params = {}) {
+	const data = await request({
+		url: '/api/erp/report/sales',
+		data: { dimension: params.dimension || 'product', partner_id: params.partnerId || '', ...rangeArgs(params) }
+	})
+	return normalizeSummary(data)
+}
+
+/** 热销（order=desc）/滞销（order=asc）排行 */
+export async function fetchSalesRank(params = {}) {
+	const data = await request({
+		url: '/api/erp/report/rank',
+		data: { order: params.order || 'desc', top: params.top || 10, ...rangeArgs(params) }
+	})
+	return { list: data.list || [], order: data.order || 'desc', range: data.range || [] }
+}
+
+/** 收发存汇总表：期初 = 期末 -(本期入 - 本期出)，与库存结存账实一致 */
+export async function fetchStockMove(params = {}) {
+	const data = await request({
+		url: '/api/erp/report/stockmove',
+		data: {
+			...pageArgs(params),
+			warehouse_id: params.warehouseId || '',
+			keyword: params.keyword || '',
+			...rangeArgs(params)
+		}
+	})
+	return { list: data.list || [], total: data.total || 0, summary: data.summary || {} }
+}
+
+/** 毛利分析：收入=销售出库-销售退货，成本取库存流水实际出库成本 */
+export async function fetchProfit(params = {}) {
+	const data = await request({
+		url: '/api/erp/report/profit',
+		data: rangeArgs(params)
+	})
+	return { list: data.list || [], summary: data.summary || {} }
+}
+
+// ----------------------------------------------------------------- 归一化
+
+/** 单据主表归一；withItems=true 时明细行日期/金额也归一 */
+function normalizeDoc(row, withItems) {
+	const out = {
+		...row,
+		biz_date: dayText(row.biz_date),
+		create_time_text: dateTimeText(row.create_time),
+		audit_time_text: dateTimeText(row.audit_time),
+		total_qty: Number(row.total_qty || 0),
+		total_amount: Number(row.total_amount || 0),
+		discount_amount: Number(row.discount_amount || 0),
+		actual_amount: Number(row.actual_amount || 0)
+	}
+	if (withItems) {
+		out.items = (row.items || []).map(item => ({
+			...item,
+			quantity: Number(item.quantity || 0),
+			unit_price: Number(item.unit_price || 0),
+			amount: Number(item.amount || 0),
+			stock_qty: Number(item.stock_qty || 0),
+			production_date: dayText(item.production_date),
+			expire_date: dayText(item.expire_date)
+		}))
+		out.instance = row.instance || null
+	}
+	return out
+}
+
+/** 组装后端要求的单据请求体（明细只传可编辑字段，单价缺省由后端按价格体系取） */
+function buildDocPayload(doc) {
+	return {
+		id: doc.id || 0,
+		doc_type: doc.docType,
+		biz_date: doc.bizDate || '',
+		warehouse_id: Number(doc.warehouseId) || 0,
+		to_warehouse_id: Number(doc.toWarehouseId) || 0,
+		partner_id: Number(doc.partnerId) || 0,
+		source_doc_id: Number(doc.sourceDocId) || 0,
+		discount_amount: Number(doc.discountAmount) || 0,
+		remark: doc.remark || '',
+		items: (doc.items || []).map(item => ({
+			id: item.id || 0,
+			product_id: Number(item.productId || item.product_id) || 0,
+			warehouse_id: Number(item.warehouseId || item.warehouse_id) || 0,
+			batch_no: item.batchNo || item.batch_no || '',
+			quantity: Number(item.quantity) || 0,
+			book_qty: Number(item.bookQty ?? item.book_qty) || 0,
+			ref_item_id: Number(item.refItemId || item.ref_item_id) || 0,
+			unit_price: Number(item.unitPrice ?? item.unit_price) || 0,
+			amount: Number(item.amount) || 0,
+			production_date: item.productionDate || item.production_date || '',
+			expire_date: item.expireDate || item.expire_date || '',
+			remark: item.remark || '',
+			sort_order: Number(item.sortOrder || item.sort_order) || 0
+		}))
+	}
+}
+
+/** 往来账行：后端返回 { bill, balance, overdue_days, status_label }，摊平给列表用 */
+function normalizeBillRow(row) {
+	const bill = row.bill || {}
+	return {
+		...bill,
+		balance: Number(row.balance ?? (Number(bill.amount || 0) - Number(bill.settled_amount || 0))),
+		overdue_days: Number(row.overdue_days || 0),
+		status_label: row.status_label || billStatusLabel(bill.status),
+		bill_date: dayText(bill.bill_date),
+		due_date: dayText(bill.due_date)
+	}
+}
+
+function normalizeFund(row) {
+	return {
+		...row,
+		amount: Number(row.amount || 0),
+		settled_amount: Number(row.settled_amount || 0),
+		biz_date: dayText(row.biz_date),
+		create_time_text: dateTimeText(row.create_time)
+	}
+}
+
+function normalizeSummary(data) {
+	return {
+		list: (data.list || []).map(row => ({
+			...row,
+			qty: Number(row.qty || 0),
+			amount: Number(row.amount || 0)
+		})),
+		dimension: data.dimension || 'product',
+		summary: {
+			qty: Number((data.summary || {}).qty || 0),
+			amount: Number((data.summary || {}).amount || 0)
+		}
+	}
+}
diff --git a/uniapp/components/erp/ErpPicker.vue b/uniapp/components/erp/ErpPicker.vue
new file mode 100644
index 0000000..fbb5f83
--- /dev/null
+++ b/uniapp/components/erp/ErpPicker.vue
@@ -0,0 +1,234 @@
+<template>
+	<view v-if="show" class="picker-mask" @tap="close">
+		<view class="picker-sheet" @tap.stop>
+			<view class="sheet-head">
+				<text class="sheet-title">{{ title }}</text>
+				<text class="sheet-close" @tap="close">关闭</text>
+			</view>
+
+			<view class="sheet-search">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="15" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					:placeholder="placeholder"
+					confirm-type="search"
+				/>
+			</view>
+
+			<scroll-view class="sheet-body" scroll-y :show-scrollbar="false">
+				<text v-if="tip" class="sheet-tip">{{ tip }}</text>
+				<view v-if="loading" class="sheet-empty">
+					<text>搜索中...</text>
+				</view>
+				<view v-else-if="!filtered.length" class="sheet-empty">
+					<text>没有匹配项</text>
+				</view>
+				<view
+					v-for="opt in filtered"
+					:key="String(opt.value)"
+					class="option-row"
+					:class="{ active: String(opt.value) === String(modelValue) }"
+					@tap="choose(opt)"
+				>
+					<view class="option-main">
+						<text class="option-label">{{ opt.label }}</text>
+						<text v-if="opt.sub" class="option-sub">{{ opt.sub }}</text>
+					</view>
+					<text v-if="opt.extra" class="option-extra">{{ opt.extra }}</text>
+					<FaIcon
+						v-if="String(opt.value) === String(modelValue)"
+						name="check"
+						color="#2563eb"
+						:size="16"
+					/>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 移动端通用底部选择器（单选）。
+ * 单据开单要选商品/仓库/客商/审批流，选项动辄上千条，
+ * 原生 picker 无法搜索，这里统一用「搜索 + 列表 + 点选即回填」的抽屉。
+ * 默认本地过滤；数据量大时传 remote 并监听 search，由页面做服务端搜索。
+ */
+import { computed, ref, watch } from 'vue'
+import FaIcon from '@/components/FaIcon.vue'
+
+const props = defineProps({
+	show: { type: Boolean, default: false },
+	title: { type: String, default: '请选择' },
+	placeholder: { type: String, default: '搜索' },
+	options: { type: Array, default: () => [] },
+	/** 当前选中值，用于高亮（可选） */
+	modelValue: { type: [String, Number, null], default: null },
+	/** 服务端搜索：关键字变化时向外抛 search，不在本地过滤 */
+	remote: { type: Boolean, default: false },
+	loading: { type: Boolean, default: false },
+	/** 列表顶部提示（如「仅显示前 50 条」） */
+	tip: { type: String, default: '' }
+})
+
+const emit = defineEmits(['update:show', 'select', 'search'])
+
+const keyword = ref('')
+
+let searchTimer = null
+watch(keyword, (val) => {
+	if (!props.remote) return
+	clearTimeout(searchTimer)
+	searchTimer = setTimeout(() => emit('search', val.trim()), 300)
+})
+
+const filtered = computed(() => {
+	if (props.remote) return props.options
+	const kw = keyword.value.trim().toLowerCase()
+	if (!kw) return props.options
+	return props.options.filter(
+		(opt) =>
+			String(opt.label || '').toLowerCase().includes(kw) ||
+			String(opt.sub || '').toLowerCase().includes(kw)
+	)
+})
+
+function choose(opt) {
+	emit('select', opt)
+	close()
+}
+
+function close() {
+	clearTimeout(searchTimer)
+	keyword.value = ''
+	emit('update:show', false)
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.picker-mask {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(15, 23, 42, 0.45);
+	z-index: 998;
+	display: flex;
+	align-items: flex-end;
+	@include mask-responsive;
+}
+
+.picker-sheet {
+	width: 100%;
+	max-height: 76vh;
+	background: $color-card;
+	border-radius: 32rpx 32rpx 0 0;
+	display: flex;
+	flex-direction: column;
+	padding-bottom: env(safe-area-inset-bottom);
+	@include sheet-responsive;
+}
+
+.sheet-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 28rpx $page-padding-x 12rpx;
+}
+
+.sheet-title {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: $color-text;
+}
+
+.sheet-close {
+	font-size: 26rpx;
+	color: $color-text-muted;
+}
+
+.sheet-search {
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	margin: 0 $page-padding-x 12rpx;
+	height: 66rpx;
+	padding: 0 22rpx;
+	background: $color-bg-page;
+	border-radius: $radius-full;
+}
+
+.search-input {
+	flex: 1;
+	font-size: 26rpx;
+	color: $color-text;
+}
+
+.sheet-body {
+	flex: 1;
+	min-height: 0;
+	max-height: 52vh;
+	padding: 0 $page-padding-x 20rpx;
+	/* scroll-view 默认 content-box，加左右内边距会把内容顶出屏幕右侧 */
+	box-sizing: border-box;
+}
+
+.sheet-tip {
+	display: block;
+	padding: 8rpx 4rpx 16rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.sheet-empty {
+	padding: 80rpx 0;
+	text-align: center;
+	font-size: 26rpx;
+	color: $color-text-muted;
+}
+
+.option-row {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 16rpx;
+	padding: 24rpx 20rpx;
+	border-radius: $radius-md;
+
+	&:active {
+		background: $color-bg-page;
+	}
+
+	&.active {
+		background: $color-primary-bg;
+	}
+}
+
+.option-main {
+	flex: 1;
+	min-width: 0;
+}
+
+.option-label {
+	display: block;
+	font-size: 28rpx;
+	color: $color-text;
+}
+
+.option-sub {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.option-extra {
+	font-size: 24rpx;
+	color: $color-text-secondary;
+	flex-shrink: 0;
+}
+</style>
diff --git a/uniapp/pages.json b/uniapp/pages.json
index 9ff1388..1c1be56 100644
--- a/uniapp/pages.json
+++ b/uniapp/pages.json
@@ -78,6 +78,150 @@
 				"navigationBarTitleText": "进销存 · 我的"
 			}
 		},
+		{
+			"path": "pages/erp/dashboard/index",
+			"style": {
+				"navigationBarTitleText": "进销存工作台",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/document/index",
+			"style": {
+				"navigationBarTitleText": "单据列表",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/document/detail",
+			"style": {
+				"navigationBarTitleText": "单据详情",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/document/edit",
+			"style": {
+				"navigationBarTitleText": "开单",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/basic/product",
+			"style": {
+				"navigationBarTitleText": "商品档案",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/basic/product-detail",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/basic/warehouse",
+			"style": {
+				"navigationBarTitleText": "仓库档案",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/partner/index",
+			"style": {
+				"navigationBarTitleText": "客商管理",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/partner/detail",
+			"style": {
+				"navigationBarTitleText": "客商详情",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/stock/index",
+			"style": {
+				"navigationBarTitleText": "库存结存",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/stock/ledger",
+			"style": {
+				"navigationBarTitleText": "收发存流水",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/stock/batch",
+			"style": {
+				"navigationBarTitleText": "批次效期",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/stock/warning",
+			"style": {
+				"navigationBarTitleText": "库存预警",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/finance/bill",
+			"style": {
+				"navigationBarTitleText": "应收应付",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/finance/bill-detail",
+			"style": {
+				"navigationBarTitleText": "账单详情",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/finance/fund",
+			"style": {
+				"navigationBarTitleText": "收付款单",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/finance/fund-edit",
+			"style": {
+				"navigationBarTitleText": "收付款",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/erp/report/index",
+			"style": {
+				"navigationBarTitleText": "报表中心",
+				"navigationBarBackgroundColor": "#F8FAFC",
+				"navigationBarTextStyle": "black"
+			}
+		},
 		{
 			"path": "pages/oa/home/home",
 			"style": {
diff --git a/uniapp/pages/erp/basic/product-detail.vue b/uniapp/pages/erp/basic/product-detail.vue
new file mode 100644
index 0000000..d7b5291
--- /dev/null
+++ b/uniapp/pages/erp/basic/product-detail.vue
@@ -0,0 +1,391 @@
+<template>
+	<view class="page">
+		<view v-if="loading && !product" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+
+		<block v-else-if="product">
+			<view class="hero">
+				<view class="hero-top">
+					<text class="hero-name">{{ product.product_name }}</text>
+					<u-tag v-if="!isOnSale" text="停用/草稿" type="info" size="mini" />
+				</view>
+				<text class="hero-code">{{ product.product_code || '无编码' }}</text>
+				<view class="hero-grid">
+					<view class="hero-cell">
+						<text class="cell-label">总库存</text>
+						<text class="cell-value">{{ qtyText(product.total_stock) }} {{ product.base_unit || '' }}</text>
+					</view>
+					<view class="hero-cell">
+						<text class="cell-label">库存状态</text>
+						<text class="cell-value">{{ safetyStateLabel(product.safety_state) }}</text>
+					</view>
+					<view class="hero-cell">
+						<text class="cell-label">售价</text>
+						<text class="cell-value">¥{{ moneyText(product.sale_price) }}</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="card">
+				<view class="block-head">
+					<text class="block-title">商品资料</text>
+				</view>
+				<view class="line">
+					<text class="line-label">分类</text>
+					<text class="line-value">{{ product.category_name || '未分类' }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">品牌 / 规格</text>
+					<text class="line-value">{{ join([product.brand, product.spec]) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">型号</text>
+					<text class="line-value">{{ dash(product.model) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">单位</text>
+					<text class="line-value">
+						{{ dash(product.base_unit) }}
+						<text v-if="product.aux_unit"> / 辅 {{ product.aux_unit }} × {{ qtyText(product.aux_ratio || 1) }}</text>
+					</text>
+				</view>
+				<view class="line">
+					<text class="line-label">条码</text>
+					<text class="line-value">{{ dash(product.barcode) }}</text>
+				</view>
+				<view v-if="product.remark" class="remark">
+					<text>{{ product.remark }}</text>
+				</view>
+			</view>
+
+			<view class="card">
+				<view class="block-head">
+					<text class="block-title">价格与管控</text>
+					<text class="block-tip">手机端只读</text>
+				</view>
+				<view class="grid3">
+					<view v-for="p in priceCells" :key="p.label" class="g-cell">
+						<text class="cell-label">{{ p.label }}</text>
+						<text class="cell-value">{{ p.value }}</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="card">
+				<view class="block-head">
+					<text class="block-title">分仓库存（{{ stocks.length }} 行）</text>
+					<text class="block-tip">货值 ¥{{ moneyText(stockAmount) }}</text>
+				</view>
+				<view v-if="!stocks.length" class="empty-line">
+					<text>暂无在库库存</text>
+				</view>
+				<view v-for="(s, i) in stocks" :key="i" class="line">
+					<view class="line-label grow">
+						<text>{{ s.warehouse_name || `仓库#${s.warehouse_id}` }}</text>
+						<text v-if="s.batch_no" class="sub">批次 {{ s.batch_no }}</text>
+					</view>
+					<text class="line-value">{{ qtyText(s.quantity) }} · ¥{{ moneyText(s.cost_price) }}</text>
+				</view>
+			</view>
+
+			<view class="footer-space"></view>
+
+			<view class="actions">
+				<view class="act" @tap="go('/pages/erp/stock/ledger')">
+					<text>出入库流水</text>
+				</view>
+				<view class="act" @tap="go('/pages/erp/stock/batch')">
+					<text>批次台账</text>
+				</view>
+				<view class="act primary" @tap="go('/pages/erp/document/index')">
+					<text>相关单据</text>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 商品详情（只读）：资料 / 价格 / 库存管控 / 分仓结存。
+ * 建档与改价一律回 Web 端，这里把「这个货现在有多少、成本多少、卖多少」讲清楚，
+ * 现场接单或盘库时一眼能判断能不能发。
+ */
+import { computed, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import {
+	getProduct,
+	moneyText,
+	qtyText,
+	safetyStateLabel
+} from '@/api/erp.js'
+
+const product = ref(null)
+const loading = ref(false)
+const productId = ref(0)
+
+const stocks = computed(() => product.value?.stocks || [])
+const stockAmount = computed(() => stocks.value.reduce((sum, s) => sum + Number(s.amount || 0), 0))
+const isOnSale = computed(() => Number(product.value?.status) === 1 && Number(product.value?.is_draft) !== 1)
+
+const priceCells = computed(() => {
+	const p = product.value || {}
+	return [
+		{ label: '采购价', value: `¥${moneyText(p.purchase_price)}` },
+		{ label: '销售价', value: `¥${moneyText(p.sale_price)}` },
+		{ label: '批发价', value: `¥${moneyText(p.wholesale_price)}` },
+		{ label: '会员价', value: `¥${moneyText(p.member_price)}` },
+		{ label: '最低售价', value: `¥${moneyText(p.min_price)}` },
+		{ label: '税率', value: `${Number(p.tax_rate || 0)}%` },
+		{ label: '安全库存', value: qtyText(p.safety_qty) },
+		{ label: '最高库存', value: qtyText(p.max_qty) },
+		{ label: '保质期', value: Number(p.shelf_life_days) > 0 ? `${p.shelf_life_days} 天` : '不管理' },
+		{ label: '批次管理', value: Number(p.enable_batch) === 1 ? '启用' : '关闭' }
+	]
+})
+
+onLoad((query = {}) => {
+	productId.value = Number(query.id) || 0
+	load()
+})
+
+async function load() {
+	if (!productId.value) {
+		uni.showToast({ title: '缺少商品 ID', icon: 'none' })
+		return
+	}
+	loading.value = true
+	try {
+		product.value = await getProduct(productId.value)
+		if (product.value?.product_name) uni.setNavigationBarTitle({ title: product.value.product_name })
+	} catch (e) {
+		uni.showToast({ title: '商品加载失败', icon: 'none' })
+	} finally {
+		loading.value = false
+	}
+}
+
+function go(base) {
+	uni.navigateTo({ url: `${base}?product_id=${productId.value}` })
+}
+
+function dash(v) {
+	const s = String(v ?? '').trim()
+	return s || '—'
+}
+
+function join(arr) {
+	const s = (arr || []).filter(Boolean).join(' / ')
+	return s || '—'
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-top: 20rpx;
+}
+
+.hero {
+	margin: 0 $page-padding-x 24rpx;
+	padding: 32rpx;
+	border-radius: $radius-lg;
+	background: $hero-gradient;
+	color: #ffffff;
+	box-shadow: $shadow-float;
+}
+
+.hero-top {
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+	gap: 16rpx;
+}
+
+.hero-name {
+	flex: 1;
+	font-size: 36rpx;
+	font-weight: 600;
+	line-height: 1.4;
+}
+
+.hero-code {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 24rpx;
+	opacity: 0.85;
+}
+
+.hero-grid {
+	display: flex;
+	margin-top: 28rpx;
+	padding-top: 22rpx;
+	border-top: 1rpx solid rgba(255, 255, 255, 0.22);
+}
+
+.hero-cell {
+	flex: 1;
+
+	.cell-label {
+		display: block;
+		font-size: 22rpx;
+		opacity: 0.8;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 28rpx;
+		font-weight: 500;
+	}
+}
+
+.card {
+	@include card;
+	margin: 0 $page-padding-x 24rpx;
+	padding: 24rpx 28rpx;
+}
+
+.block-head {
+	@include block-head;
+}
+
+.block-title {
+	@include section-title;
+}
+
+.block-tip {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.line {
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+	gap: 20rpx;
+	padding: 14rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+	font-size: 26rpx;
+
+	&:last-child {
+		border-bottom: none;
+	}
+}
+
+.line-label {
+	color: $color-text-secondary;
+	flex-shrink: 0;
+
+	&.grow {
+		flex: 1;
+		min-width: 0;
+	}
+}
+
+.sub {
+	display: block;
+	margin-top: 4rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.line-value {
+	flex: 1;
+	text-align: right;
+	color: $color-text;
+	word-break: break-all;
+}
+
+.grid3 {
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.g-cell {
+	width: 33.33%;
+	padding: 12rpx 0;
+
+	.cell-label {
+		display: block;
+		font-size: 22rpx;
+		color: $color-text-muted;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 4rpx;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+}
+
+.remark {
+	margin-top: 12rpx;
+	padding: 16rpx 20rpx;
+	background: $color-bg-page;
+	border-radius: $radius-sm;
+	font-size: 24rpx;
+	line-height: 1.6;
+	color: $color-text-secondary;
+}
+
+.empty-line {
+	padding: 40rpx 0;
+	text-align: center;
+	font-size: 25rpx;
+	color: $color-text-muted;
+}
+
+.footer-space {
+	height: calc(150rpx + env(safe-area-inset-bottom));
+}
+
+.actions {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	gap: 16rpx;
+	padding: 18rpx $page-padding-x calc(18rpx + env(safe-area-inset-bottom));
+	background: $color-card;
+	box-shadow: 0 -4rpx 16rpx rgba(15, 23, 42, 0.06);
+	@include dialog-responsive;
+}
+
+.act {
+	flex: 1;
+	height: 76rpx;
+	line-height: 76rpx;
+	text-align: center;
+	border-radius: $radius-full;
+	background: $color-bg-page;
+	font-size: 26rpx;
+	color: $color-text-secondary;
+
+	&.primary {
+		background: #2563eb;
+		color: #ffffff;
+	}
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.state-box {
+	display: flex;
+	justify-content: center;
+	padding: 140rpx 0;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/pages/erp/basic/product.vue b/uniapp/pages/erp/basic/product.vue
new file mode 100644
index 0000000..616a207
--- /dev/null
+++ b/uniapp/pages/erp/basic/product.vue
@@ -0,0 +1,368 @@
+<template>
+	<view class="page">
+		<view class="filter-bar">
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					placeholder="搜索商品名称 / 编码 / 条码"
+					confirm-type="search"
+					@confirm="refresh"
+				/>
+				<text v-if="keyword" class="search-clear" @tap="clearKeyword">清空</text>
+			</view>
+			<view class="chip-row">
+				<view class="chip" :class="{ active: filterKey === 'category' }" @tap="openPicker('category')">
+					<text>{{ categoryName || '全部分类' }}</text>
+					<FaIcon name="chevron-right" color="#94a3b8" :size="12" />
+				</view>
+				<view class="chip" :class="{ active: onlyEnabled }" @tap="toggleEnabled">
+					<text>仅在售</text>
+				</view>
+				<view class="chip count">
+					<text>共 {{ total }} 个</text>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="search" text="没有匹配的商品" />
+			<text class="state-tip">商品建档请在 Web 后台「进销存 - 商品档案」完成</text>
+		</view>
+		<template v-else>
+			<view v-for="row in list" :key="row.id" class="p-card" @tap="openDetail(row)">
+				<view class="p-top">
+					<text class="p-name">{{ row.product_name }}</text>
+					<u-tag
+						v-if="row.safety_state !== 'normal'"
+						:text="safetyStateLabel(row.safety_state)"
+						:type="row.safety_state === 'low' ? 'warning' : 'primary'"
+						size="mini"
+					/>
+					<u-tag v-else-if="!isOnSale(row)" text="停用" type="info" size="mini" />
+				</view>
+				<text class="p-sub">{{ [row.product_code, row.spec, row.category_name].filter(Boolean).join(' · ') || '—' }}</text>
+				<view class="p-grid">
+					<view class="p-cell">
+						<text class="cell-label">库存</text>
+						<text class="cell-value">{{ qtyText(row.total_stock) }} {{ row.base_unit || '' }}</text>
+					</view>
+					<view class="p-cell">
+						<text class="cell-label">售价</text>
+						<text class="cell-value">¥{{ moneyText(row.sale_price) }}</text>
+					</view>
+					<view class="p-cell">
+						<text class="cell-label">采购价</text>
+						<text class="cell-value">¥{{ moneyText(row.purchase_price) }}</text>
+					</view>
+				</view>
+			</view>
+			<view v-if="finished" class="load-done">
+				<text>{{ list.length ? '没有更多了' : '' }}</text>
+			</view>
+		</template>
+
+		<ErpPicker
+			:show="picker.show"
+			title="选择分类"
+			placeholder="搜索分类"
+			:options="categoryOptions"
+			:model-value="categoryId"
+			@update:show="picker.show = false"
+			@select="onCategory"
+		/>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 商品档案（移动端只读）。
+ * 建档、改价、启停都在 Web 后台做，手机端只负责「查得到、看得清、点得进」，
+ * 库存与价格取的正是 Web 端同一批接口字段，两端不会出现两套数。
+ */
+import { computed, ref } from 'vue'
+import { onReachBottom, onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import ErpPicker from '@/components/erp/ErpPicker.vue'
+import {
+	fetchCategories,
+	fetchProducts,
+	moneyText,
+	qtyText,
+	safetyStateLabel
+} from '@/api/erp.js'
+
+const PAGE_SIZE = 20
+
+const list = ref([])
+const total = ref(0)
+const page = ref(1)
+const loading = ref(false)
+const finished = ref(false)
+const keyword = ref('')
+const categoryId = ref('')
+const onlyEnabled = ref(false)
+const categories = ref([])
+
+const picker = ref({ show: false })
+const filterKey = ref('')
+
+const categoryName = computed(() => {
+	const hit = categories.value.find((c) => String(c.id) === String(categoryId.value))
+	return hit ? hit.name : ''
+})
+
+const categoryOptions = computed(() =>
+	categories.value.map((c) => ({
+		value: c.id,
+		label: c.name,
+		sub: c.level_text || '',
+		extra: `${c.product_count || 0} 个`
+	}))
+)
+
+onShow(() => {
+	refresh()
+	loadCategories()
+})
+
+onReachBottom(() => {
+	if (finished.value || loading.value) return
+	loadMore()
+})
+
+async function loadCategories() {
+	if (categories.value.length) return
+	try {
+		const { list: rows } = await fetchCategories()
+		const nameOf = {}
+		rows.forEach((c) => {
+			nameOf[c.id] = c.category_name
+		})
+		categories.value = rows.map((c) => ({
+			id: c.id,
+			name: c.category_name,
+			level_text: c.parent_id && nameOf[c.parent_id] ? `上级：${nameOf[c.parent_id]}` : '',
+			product_count: c.product_count || 0
+		}))
+	} catch (e) {
+		// 分类拉不到不影响商品列表，只是筛选栏少一项
+	}
+}
+
+async function refresh() {
+	page.value = 1
+	finished.value = false
+	list.value = []
+	await loadPage()
+}
+
+async function loadMore() {
+	page.value += 1
+	await loadPage()
+}
+
+async function loadPage() {
+	loading.value = true
+	try {
+		const data = await fetchProducts({
+			page: page.value,
+			pageSize: PAGE_SIZE,
+			keyword: keyword.value.trim(),
+			categoryId: categoryId.value,
+			onlyEnabled: onlyEnabled.value
+		})
+		const rows = data.list || []
+		list.value = page.value === 1 ? rows : [...list.value, ...rows]
+		total.value = data.total || 0
+		finished.value = list.value.length >= total.value
+	} catch (e) {
+		if (page.value > 1) page.value -= 1
+	} finally {
+		loading.value = false
+	}
+}
+
+function clearKeyword() {
+	keyword.value = ''
+	refresh()
+}
+
+function toggleEnabled() {
+	onlyEnabled.value = !onlyEnabled.value
+	refresh()
+}
+
+function openPicker(key) {
+	filterKey.value = key
+	picker.value.show = true
+}
+
+function onCategory(opt) {
+	categoryId.value = String(opt.value) === String(categoryId.value) ? '' : opt.value
+	refresh()
+}
+
+function isOnSale(row) {
+	return Number(row.status) === 1 && Number(row.is_draft) !== 1
+}
+
+function openDetail(row) {
+	uni.navigateTo({ url: `/pages/erp/basic/product-detail?id=${row.id}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 40rpx;
+}
+
+.filter-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	background: $color-bg-page;
+	padding: 20rpx $page-padding-x 8rpx;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.search-clear {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.chip-row {
+	display: flex;
+	align-items: center;
+	gap: 16rpx;
+	margin-top: 18rpx;
+}
+
+.chip {
+	display: inline-flex;
+	align-items: center;
+	gap: 6rpx;
+	padding: 10rpx 22rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 24rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+	}
+
+	&.count {
+		margin-left: auto;
+		background: transparent;
+		box-shadow: none;
+		color: $color-text-muted;
+	}
+}
+
+.p-card {
+	@include card;
+	margin: 0 $page-padding-x 20rpx;
+	padding: 24rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.p-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 12rpx;
+}
+
+.p-name {
+	flex: 1;
+	font-size: 29rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.p-sub {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.p-grid {
+	display: flex;
+	margin-top: 18rpx;
+	padding-top: 16rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.p-cell {
+	flex: 1;
+
+	.cell-label {
+		display: block;
+		font-size: 22rpx;
+		color: $color-text-muted;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 27rpx;
+		color: $color-text;
+	}
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text,
+.state-tip {
+	font-size: 26rpx;
+	color: $color-text-muted;
+	margin-top: 16rpx;
+}
+
+.load-done {
+	display: flex;
+	justify-content: center;
+	padding: 8rpx 0 24rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/pages/erp/basic/warehouse.vue b/uniapp/pages/erp/basic/warehouse.vue
new file mode 100644
index 0000000..fbe9496
--- /dev/null
+++ b/uniapp/pages/erp/basic/warehouse.vue
@@ -0,0 +1,235 @@
+<template>
+	<view class="page">
+		<view class="filter-bar">
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					placeholder="搜索仓库名称"
+					confirm-type="search"
+					@confirm="load"
+				/>
+			</view>
+			<view class="sum-row">
+				<text class="sum-item">仓库 {{ list.length }} 个</text>
+				<text class="sum-item">在库货值 ¥{{ moneyText(totalValue) }}</text>
+			</view>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="list" text="没有仓库" />
+			<text class="state-tip">先在 Web 后台「进销存 - 仓库档案」建仓库</text>
+		</view>
+		<template v-else>
+			<view v-for="row in list" :key="row.id" class="w-card" @tap="openStock(row)">
+				<view class="w-top">
+					<view class="w-icon">
+						<FaIcon name="warehouse" color="#2563eb" :size="18" />
+					</view>
+					<view class="w-main">
+						<view class="w-name-row">
+							<text class="w-name">{{ row.warehouse_name }}</text>
+							<u-tag v-if="Number(row.is_default) === 1" text="默认" type="primary" size="mini" />
+							<u-tag v-if="Number(row.status) !== 1" text="停用" type="info" size="mini" />
+						</view>
+						<text class="w-sub">{{ [row.warehouse_code, row.manager, row.phone].filter(Boolean).join(' · ') || '—' }}</text>
+					</view>
+					<FaIcon name="chevron-right" color="#cbd5e1" :size="15" />
+				</view>
+				<view class="w-grid">
+					<view class="w-cell">
+						<text class="cell-label">在库品种</text>
+						<text class="cell-value">{{ row.stock_kinds || 0 }}</text>
+					</view>
+					<view class="w-cell">
+						<text class="cell-label">货值</text>
+						<text class="cell-value">¥{{ moneyText(row.stock_value) }}</text>
+					</view>
+					<view class="w-cell">
+						<text class="cell-label">地址</text>
+						<text class="cell-value ellipsis">{{ row.address || '—' }}</text>
+					</view>
+				</view>
+			</view>
+		</template>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 仓库档案（移动端只读）：一屏看清每个仓压了多少货，点进去直接查该仓库存。
+ */
+import { computed, ref } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import { fetchWarehouses, moneyText } from '@/api/erp.js'
+
+const list = ref([])
+const keyword = ref('')
+const loading = ref(false)
+
+const totalValue = computed(() => list.value.reduce((sum, w) => sum + Number(w.stock_value || 0), 0))
+
+onShow(() => {
+	load()
+})
+
+async function load() {
+	loading.value = true
+	try {
+		list.value = await fetchWarehouses({ keyword: keyword.value.trim() })
+	} catch (e) {
+		uni.showToast({ title: '仓库加载失败', icon: 'none' })
+	} finally {
+		loading.value = false
+	}
+}
+
+function openStock(row) {
+	uni.navigateTo({ url: `/pages/erp/stock/index?warehouse_id=${row.id}&warehouse_name=${encodeURIComponent(row.warehouse_name || '')}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 40rpx;
+}
+
+.filter-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	background: $color-bg-page;
+	padding: 20rpx $page-padding-x 12rpx;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+}
+
+.sum-row {
+	display: flex;
+	gap: 28rpx;
+	padding: 16rpx 8rpx 4rpx;
+}
+
+.sum-item {
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.w-card {
+	@include card;
+	margin: 0 $page-padding-x 20rpx;
+	padding: 24rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.w-top {
+	display: flex;
+	align-items: center;
+	gap: 18rpx;
+}
+
+.w-icon {
+	@include icon-box(64rpx);
+}
+
+.w-main {
+	flex: 1;
+	min-width: 0;
+}
+
+.w-name-row {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+}
+
+.w-name {
+	font-size: 29rpx;
+	font-weight: 500;
+	color: $color-text;
+}
+
+.w-sub {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.w-grid {
+	display: flex;
+	margin-top: 20rpx;
+	padding-top: 16rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.w-cell {
+	flex: 1;
+	min-width: 0;
+
+	&:nth-child(3) {
+		flex: 1.4;
+		padding-left: 20rpx;
+	}
+
+	.cell-label {
+		display: block;
+		font-size: 22rpx;
+		color: $color-text-muted;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.ellipsis {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text,
+.state-tip {
+	font-size: 26rpx;
+	color: $color-text-muted;
+	margin-top: 16rpx;
+}
+</style>
diff --git a/uniapp/pages/erp/dashboard/index.vue b/uniapp/pages/erp/dashboard/index.vue
new file mode 100644
index 0000000..867a623
--- /dev/null
+++ b/uniapp/pages/erp/dashboard/index.vue
@@ -0,0 +1,496 @@
+<template>
+	<view class="page">
+		<view v-if="loading && !dash" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+
+		<block v-else-if="dash">
+			<!-- 本月经营 -->
+			<view class="hero-card">
+				<view class="hero-main">
+					<text class="hero-label">本月销售金额</text>
+					<text class="hero-amount">¥{{ moneyText(month.sales_amount) }}</text>
+					<text class="hero-sub">
+						销售 {{ month.sales_count || 0 }} 单 · 采购 {{ month.purchase_count || 0 }} 单 · 退货 ¥{{ moneyText(month.return_amount) }}
+					</text>
+				</view>
+				<view class="hero-side">
+					<view class="hero-line">
+						<text class="hero-line-label">本月毛利</text>
+						<text class="hero-line-value">{{ moneyText(month.profit) }}</text>
+					</view>
+					<view class="hero-line">
+						<text class="hero-line-label">毛利率</text>
+						<text class="hero-line-value">{{ moneyText(month.profit_rate) }}%</text>
+					</view>
+					<view class="hero-line">
+						<text class="hero-line-label">采购金额</text>
+						<text class="hero-line-value">{{ moneyText(month.purchase_amount) }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 指标格子 -->
+			<view class="kpi-grid">
+				<view class="kpi-cell" @tap="go('/pages/erp/document/index?doc_type=sales_out')">
+					<text class="kpi-value">{{ moneyText(today.sales_amount) }}</text>
+					<text class="kpi-label">今日销售（{{ today.sales_count || 0 }} 单）</text>
+				</view>
+				<view class="kpi-cell" @tap="go('/pages/erp/stock/index')">
+					<text class="kpi-value">{{ moneyText(stock.value) }}</text>
+					<text class="kpi-label">库存货值（{{ qtyText(stock.qty) }} 件）</text>
+				</view>
+				<view class="kpi-cell" @tap="go('/pages/erp/finance/bill?bill_type=1')">
+					<text class="kpi-value danger">{{ moneyText(bill.receivable) }}</text>
+					<text class="kpi-label">未收应收</text>
+				</view>
+				<view class="kpi-cell" @tap="go('/pages/erp/finance/bill?bill_type=2')">
+					<text class="kpi-value">{{ moneyText(bill.payable) }}</text>
+					<text class="kpi-label">未付应付</text>
+				</view>
+				<view class="kpi-cell" @tap="go('/pages/erp/document/index?status=2')">
+					<text class="kpi-value primary">{{ todo.approval_pending || 0 }}</text>
+					<text class="kpi-label">待我审批</text>
+				</view>
+				<view class="kpi-cell" @tap="go('/pages/erp/document/index?status=0')">
+					<text class="kpi-value">{{ todo.draft_docs || 0 }}</text>
+					<text class="kpi-label">草稿单据</text>
+				</view>
+			</view>
+
+			<!-- 库存预警 -->
+			<view class="card warn-card">
+				<view class="block-head">
+					<text class="block-title">库存预警</text>
+					<view class="block-more" @tap="go('/pages/erp/stock/warning')">
+						<text>查看全部</text>
+						<FaIcon name="chevron-right" color="#94a3b8" :size="14" />
+					</view>
+				</view>
+				<view class="warn-row">
+					<view class="warn-item" @tap="go('/pages/erp/stock/warning?tab=low')">
+						<text class="warn-value warning">{{ warning.low || 0 }}</text>
+						<text class="warn-label">低于安全库存</text>
+					</view>
+					<view class="warn-item" @tap="go('/pages/erp/stock/warning?tab=out')">
+						<text class="warn-value danger">{{ warning.out || 0 }}</text>
+						<text class="warn-label">缺货</text>
+					</view>
+					<view class="warn-item" @tap="go('/pages/erp/stock/warning?tab=over')">
+						<text class="warn-value primary">{{ warning.over || 0 }}</text>
+						<text class="warn-label">库存积压</text>
+					</view>
+					<view class="warn-item" @tap="go('/pages/erp/stock/batch?expire_state=expiring')">
+						<text class="warn-value warning">{{ warning.expiring || 0 }}</text>
+						<text class="warn-label">效期临近</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 近 6 个月购销趋势 -->
+			<view class="card trend-card">
+				<view class="block-head">
+					<text class="block-title">近 6 个月购销趋势</text>
+					<view class="legend">
+						<view class="legend-item">
+							<view class="legend-dot buy"></view>
+							<text>采购</text>
+						</view>
+						<view class="legend-item">
+							<view class="legend-dot sale"></view>
+							<text>销售</text>
+						</view>
+					</view>
+				</view>
+				<view v-for="row in trend" :key="row.month" class="trend-row">
+					<text class="trend-month">{{ row.month }}</text>
+					<view class="trend-bars">
+						<view class="bar-track">
+							<view class="bar buy" :style="{ width: barWidth(row.buy) }"></view>
+						</view>
+						<view class="bar-track">
+							<view class="bar sale" :style="{ width: barWidth(row.sale) }"></view>
+						</view>
+					</view>
+					<text class="trend-value">¥{{ moneyText(row.sale) }}</text>
+				</view>
+			</view>
+
+			<!-- 常用入口 -->
+			<view class="card entry-card">
+				<view class="block-head">
+					<text class="block-title">常用功能</text>
+				</view>
+				<view class="entry-grid">
+					<view v-for="item in entries" :key="item.route" class="entry-item" @tap="go(item.route)">
+						<view class="entry-icon">
+							<FaIcon :name="item.icon" color="#2563eb" :size="18" />
+						</view>
+						<text class="entry-label">{{ item.label }}</text>
+					</view>
+				</view>
+			</view>
+		</block>
+
+		<view v-else class="state-box">
+			<u-empty mode="network" text="看板加载失败" />
+			<view class="retry" @tap="load">重新加载</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { computed, ref } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import { fetchErpDashboard, moneyText, qtyText } from '@/api/erp.js'
+
+const dash = ref(null)
+const loading = ref(false)
+
+const month = computed(() => (dash.value || {}).month || {})
+const today = computed(() => (dash.value || {}).today || {})
+const stock = computed(() => (dash.value || {}).stock || {})
+const bill = computed(() => (dash.value || {}).partnerBill || {})
+const todo = computed(() => (dash.value || {}).todo || {})
+const warning = computed(() => (dash.value || {}).warning || {})
+const trend = computed(() => (dash.value || {}).trend || [])
+
+const maxTrend = computed(() => {
+	let max = 0
+	trend.value.forEach(row => {
+		max = Math.max(max, Number(row.buy || 0), Number(row.sale || 0))
+	})
+	return max || 1
+})
+
+const entries = [
+	{ label: '开单', icon: 'plus', route: '/pages/erp/document/edit' },
+	{ label: '单据', icon: 'clipboard-list', route: '/pages/erp/document/index' },
+	{ label: '商品', icon: 'boxes-stacked', route: '/pages/erp/product/index' },
+	{ label: '库存', icon: 'warehouse', route: '/pages/erp/stock/index' },
+	{ label: '客商', icon: 'users', route: '/pages/erp/partner/index' },
+	{ label: '收付款', icon: 'wallet', route: '/pages/erp/finance/fund' },
+	{ label: '报表', icon: 'chart-column', route: '/pages/erp/report/index' },
+	{ label: '流水', icon: 'arrow-right-arrow-left', route: '/pages/erp/stock/ledger' }
+]
+
+onShow(() => {
+	load()
+})
+
+function barWidth(value) {
+	const pct = (Number(value || 0) / maxTrend.value) * 100
+	return `${Math.max(pct, 2).toFixed(1)}%`
+}
+
+async function load() {
+	loading.value = true
+	try {
+		dash.value = await fetchErpDashboard()
+	} catch (e) {
+		dash.value = null
+	} finally {
+		loading.value = false
+	}
+}
+
+function go(route) {
+	uni.navigateTo({ url: route })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding: 24rpx $page-padding-x 60rpx;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 160rpx 0;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+
+.retry {
+	margin-top: 24rpx;
+	padding: 12rpx 36rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 26rpx;
+	color: $color-primary;
+	box-shadow: $shadow-card;
+}
+
+.card {
+	@include card;
+	padding: 28rpx;
+	margin-bottom: 24rpx;
+}
+
+.block-head {
+	@include block-head;
+}
+
+.block-title {
+	@include section-title;
+}
+
+.block-more {
+	display: flex;
+	align-items: center;
+	gap: 4rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.hero-card {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 24rpx;
+	padding: 32rpx 28rpx;
+	margin-bottom: 24rpx;
+	border-radius: $radius-lg;
+	background: $hero-gradient;
+	color: #ffffff;
+	box-shadow: $shadow-card;
+}
+
+.hero-label {
+	display: block;
+	font-size: 24rpx;
+	opacity: 0.85;
+}
+
+.hero-amount {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 48rpx;
+	font-weight: 600;
+}
+
+.hero-sub {
+	display: block;
+	margin-top: 10rpx;
+	font-size: 22rpx;
+	opacity: 0.85;
+}
+
+.hero-side {
+	flex-shrink: 0;
+	text-align: right;
+}
+
+.hero-line {
+	margin-bottom: 10rpx;
+}
+
+.hero-line-label {
+	display: block;
+	font-size: 21rpx;
+	opacity: 0.8;
+}
+
+.hero-line-value {
+	display: block;
+	font-size: 28rpx;
+	font-weight: 600;
+}
+
+.kpi-grid {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 20rpx;
+	margin-bottom: 24rpx;
+}
+
+.kpi-cell {
+	width: calc((100% - 40rpx) / 3);
+	box-sizing: border-box;
+	@include card;
+	padding: 24rpx 16rpx;
+	text-align: center;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.kpi-value {
+	display: block;
+	font-size: 30rpx;
+	font-weight: 600;
+	color: $color-text;
+
+	&.danger {
+		color: $color-danger;
+	}
+
+	&.warning {
+		color: $color-warning;
+	}
+
+	&.primary {
+		color: $color-primary;
+	}
+}
+
+.kpi-label {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 21rpx;
+	color: $color-text-muted;
+	line-height: 1.4;
+}
+
+.warn-row {
+	display: flex;
+	gap: 12rpx;
+}
+
+.warn-item {
+	flex: 1;
+	text-align: center;
+	padding: 20rpx 0;
+	border-radius: $radius-md;
+	background: $color-bg-page;
+}
+
+.warn-value {
+	display: block;
+	font-size: 34rpx;
+	font-weight: 600;
+
+	&.warning {
+		color: $color-warning;
+	}
+
+	&.danger {
+		color: $color-danger;
+	}
+
+	&.primary {
+		color: $color-primary;
+	}
+}
+
+.warn-label {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 21rpx;
+	color: $color-text-muted;
+}
+
+.legend {
+	display: flex;
+	gap: 20rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.legend-item {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+}
+
+.legend-dot {
+	width: 16rpx;
+	height: 16rpx;
+	border-radius: 4rpx;
+
+	&.buy {
+		background: #93c5fd;
+	}
+
+	&.sale {
+		background: $color-primary;
+	}
+}
+
+.trend-row {
+	display: flex;
+	align-items: center;
+	gap: 16rpx;
+	padding: 14rpx 0;
+}
+
+.trend-month {
+	width: 110rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+	flex-shrink: 0;
+}
+
+.trend-bars {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	gap: 8rpx;
+}
+
+.bar-track {
+	height: 14rpx;
+	border-radius: $radius-full;
+	background: $color-bg-page;
+	overflow: hidden;
+}
+
+.bar {
+	height: 100%;
+	border-radius: $radius-full;
+
+	&.buy {
+		background: #93c5fd;
+	}
+
+	&.sale {
+		background: $color-primary;
+	}
+}
+
+.trend-value {
+	width: 150rpx;
+	text-align: right;
+	font-size: 22rpx;
+	color: $color-text-secondary;
+	flex-shrink: 0;
+}
+
+.entry-grid {
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.entry-item {
+	width: 25%;
+	padding: 18rpx 0;
+	text-align: center;
+}
+
+.entry-icon {
+	width: 84rpx;
+	height: 84rpx;
+	margin: 0 auto 10rpx;
+	border-radius: $radius-md;
+	background: $color-primary-bg;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.entry-label {
+	font-size: 24rpx;
+	color: $color-text-secondary;
+}
+</style>
diff --git a/uniapp/pages/erp/document/detail.vue b/uniapp/pages/erp/document/detail.vue
new file mode 100644
index 0000000..19e16d4
--- /dev/null
+++ b/uniapp/pages/erp/document/detail.vue
@@ -0,0 +1,580 @@
+<template>
+	<view class="page">
+		<view v-if="loading && !doc" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+
+		<block v-else-if="doc">
+			<!-- 概要 -->
+			<view class="head-card">
+				<view class="head-top">
+					<text class="head-type">{{ doc.doc_type_label || doc.doc_type }}</text>
+					<u-tag :text="doc.status_label || docStatusLabel(doc.status)" :type="docStatusType(doc.status)" size="mini" />
+				</view>
+				<text class="head-amount">¥{{ moneyText(doc.actual_amount) }}</text>
+				<text class="head-no">{{ doc.doc_no }}</text>
+				<view class="head-grid">
+					<view class="head-cell">
+						<text class="cell-label">业务日期</text>
+						<text class="cell-value">{{ doc.biz_date }}</text>
+					</view>
+					<view class="head-cell">
+						<text class="cell-label">数量合计</text>
+						<text class="cell-value">{{ qtyText(doc.total_qty) }}</text>
+					</view>
+					<view class="head-cell">
+						<text class="cell-label">优惠金额</text>
+						<text class="cell-value">¥{{ moneyText(doc.discount_amount) }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 往来与仓储 -->
+			<view class="card">
+				<view class="line">
+					<text class="line-label">{{ partnerLabel }}</text>
+					<text class="line-value">{{ doc.partner_name || '—' }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">仓库</text>
+					<text class="line-value">{{ doc.warehouse_name || '—' }}</text>
+				</view>
+				<view v-if="doc.to_warehouse_name" class="line">
+					<text class="line-label">调入仓库</text>
+					<text class="line-value">{{ doc.to_warehouse_name }}</text>
+				</view>
+				<view v-if="doc.source_doc_no" class="line" @tap="goSource">
+					<text class="line-label">来源单据</text>
+					<view class="line-value link">
+						<text>{{ doc.source_doc_no }}</text>
+						<FaIcon name="chevron-right" color="#2563eb" :size="14" />
+					</view>
+				</view>
+				<view class="line">
+					<text class="line-label">制单</text>
+					<text class="line-value">{{ doc.create_user_name || '—' }} · {{ doc.create_time_text }}</text>
+				</view>
+				<view v-if="doc.auditor_name" class="line">
+					<text class="line-label">审核</text>
+					<text class="line-value">{{ doc.auditor_name }} · {{ doc.audit_time_text }}</text>
+				</view>
+				<view v-if="doc.remark" class="remark">
+					<text>备注：{{ doc.remark }}</text>
+				</view>
+			</view>
+
+			<!-- 明细 -->
+			<view class="card">
+				<view class="block-head">
+					<text class="block-title">商品明细（{{ items.length }} 行）</text>
+					<text class="block-tip">点行可看实时库存</text>
+				</view>
+				<view v-for="(item, index) in items" :key="item.id || index" class="item-row">
+					<view class="item-head">
+						<text class="item-name">{{ item.product_name }}</text>
+						<text class="item-amount">¥{{ moneyText(item.amount) }}</text>
+					</view>
+					<view class="item-meta">
+						<text v-if="item.spec">{{ item.spec }}</text>
+						<text>{{ qtyText(item.quantity) }} {{ item.unit }} × ¥{{ moneyText(item.unit_price) }}</text>
+						<text v-if="item.batch_no">批次 {{ item.batch_no }}</text>
+						<text>结存 {{ qtyText(item.stock_qty) }}</text>
+					</view>
+				</view>
+				<view v-if="!items.length" class="item-empty">
+					<text>暂无明细</text>
+				</view>
+			</view>
+
+			<!-- 审批实例 -->
+			<view v-if="instance" class="card">
+				<view class="block-head">
+					<text class="block-title">审批进度</text>
+					<u-tag :text="instance.status_label || ''" type="primary" size="mini" />
+				</view>
+				<view class="line">
+					<text class="line-label">流程</text>
+					<text class="line-value">{{ instance.flow_name || '—' }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">当前节点</text>
+					<text class="line-value">{{ instance.current_node || '已结束' }}</text>
+				</view>
+				<view v-for="task in instance.tasks || []" :key="task.task_id" class="task-row">
+					<view class="task-dot" :class="taskClass(task)"></view>
+					<view class="task-body">
+						<view class="task-line1">
+							<text class="task-node">{{ task.node_name }}</text>
+							<text class="task-status">{{ task.status_label }}</text>
+						</view>
+						<text class="task-sub">
+							{{ task.approver_name }}{{ task.finish_time ? ' · ' + dateTimeText(task.finish_time) : '' }}
+						</text>
+						<text v-if="task.comment" class="task-comment">{{ task.comment }}</text>
+					</view>
+				</view>
+			</view>
+		</block>
+
+		<!-- 操作栏 -->
+		<view v-if="doc" class="actions">
+			<block v-if="isDraft">
+				<view class="act ghost" @tap="goEdit">编辑</view>
+				<view class="act ghost" @tap="onDelete">删除</view>
+				<view class="act" :class="{ disabled: busy }" @tap="onSubmit">提交审批</view>
+				<view class="act primary" :class="{ disabled: busy }" @tap="onApprove">审核生效</view>
+			</block>
+			<block v-else-if="doc.status === DOC_STATUS.APPROVING">
+				<view class="act ghost" @tap="onCancel">撤回作废</view>
+			</block>
+			<block v-else-if="doc.status === DOC_STATUS.APPROVED">
+				<view v-if="nextTypes.length" class="act ghost" @tap="onCancel">作废</view>
+				<view
+					v-for="next in nextTypes"
+					:key="next.value"
+					class="act primary"
+					@tap="goDownstream(next.value)"
+				>
+					生成{{ next.label }}
+				</view>
+			</block>
+			<block v-else>
+				<view class="act ghost" @tap="goEdit">再次编辑</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { computed, ref } from 'vue'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import {
+	DOC_STATUS,
+	cancelDoc,
+	dateTimeText,
+	deleteDoc,
+	docStatusLabel,
+	docStatusType,
+	approveDoc,
+	fetchDocTypes,
+	getDoc,
+	moneyText,
+	qtyText,
+	submitDoc
+} from '@/api/erp.js'
+
+/** 已生效单据可继续生成的下游单据（与后端来源单类型白名单一致） */
+const NEXT_MAP = {
+	purchase_order: ['purchase_in'],
+	sales_order: ['sales_out'],
+	purchase_in: ['purchase_return'],
+	sales_out: ['sales_return', 'other_out']
+}
+
+const id = ref(0)
+const doc = ref(null)
+const loading = ref(false)
+const busy = ref(false)
+const docTypes = ref([])
+
+const items = computed(() => (doc.value || {}).items || [])
+const instance = computed(() => (doc.value || {}).instance || null)
+const isDraft = computed(() => {
+	const s = (doc.value || {}).status
+	return s === DOC_STATUS.DRAFT || s === DOC_STATUS.REJECTED
+})
+const partnerLabel = computed(() => {
+	const type = (doc.value || {}).partner_type
+	if (type === 'supplier') return '供应商'
+	if (type === 'customer') return '客户'
+	return '往来单位'
+})
+const nextTypes = computed(() => {
+	const types = NEXT_MAP[(doc.value || {}).doc_type] || []
+	return types.map(value => {
+		const hit = docTypes.value.find(item => item.value === value)
+		return { value, label: hit ? hit.label : value }
+	})
+})
+
+onLoad(query => {
+	id.value = Number((query || {}).id || 0)
+})
+
+onShow(() => {
+	load()
+	loadTypes()
+})
+
+async function load() {
+	if (!id.value) return
+	loading.value = true
+	try {
+		doc.value = await getDoc(id.value)
+	} catch (e) {
+		doc.value = null
+	} finally {
+		loading.value = false
+	}
+}
+
+async function loadTypes() {
+	try {
+		docTypes.value = await fetchDocTypes()
+	} catch (e) {
+		docTypes.value = []
+	}
+}
+
+function taskClass(task) {
+	const label = String(task.status_label || '')
+	if (label.includes('通过') || label.includes('完成')) return 'done'
+	if (label.includes('驳回')) return 'rejected'
+	if (label.includes('待') || label.includes('进行')) return 'pending'
+	return 'waiting'
+}
+
+function goEdit() {
+	uni.navigateTo({ url: `/pages/erp/document/edit?id=${id.value}` })
+}
+
+function goSource() {
+	const sourceId = (doc.value || {}).source_doc_id
+	if (!sourceId) return
+	uni.navigateTo({ url: `/pages/erp/document/detail?id=${sourceId}` })
+}
+
+function goDownstream(docType) {
+	uni.navigateTo({ url: `/pages/erp/document/edit?doc_type=${docType}&source_doc_id=${id.value}` })
+}
+
+async function onApprove() {
+	if (busy.value) return
+	busy.value = true
+	try {
+		await approveDoc(id.value)
+		uni.showToast({ title: '已审核生效', icon: 'success' })
+		await load()
+	} catch (e) {
+		// 错误提示已由请求层统一弹出
+	} finally {
+		busy.value = false
+	}
+}
+
+async function onSubmit() {
+	if (busy.value) return
+	busy.value = true
+	try {
+		const instanceId = await submitDoc(id.value)
+		uni.showToast({ title: instanceId ? '已提交审批' : '已提交', icon: 'success' })
+		await load()
+	} catch (e) {
+		// 未绑定审批流等业务失败已在请求层提示，可退回用「审核生效」
+	} finally {
+		busy.value = false
+	}
+}
+
+async function onCancel() {
+	const confirmed = await confirm('作废后单据不再参与库存与报表，确定继续？')
+	if (!confirmed) return
+	await cancelDoc(id.value)
+	uni.showToast({ title: '已作废', icon: 'success' })
+	await load()
+}
+
+async function onDelete() {
+	const confirmed = await confirm('删除该草稿单据？')
+	if (!confirmed) return
+	await deleteDoc(id.value)
+	uni.showToast({ title: '已删除', icon: 'success' })
+	setTimeout(() => uni.navigateBack(), 400)
+}
+
+function confirm(content) {
+	return new Promise(resolve => {
+		uni.showModal({
+			title: '提示',
+			content,
+			success: res => resolve(!!res.confirm),
+			fail: () => resolve(false)
+		})
+	})
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding: 24rpx $page-padding-x calc(160rpx + env(safe-area-inset-bottom));
+}
+
+.state-box {
+	display: flex;
+	justify-content: center;
+	padding: 160rpx 0;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+
+.head-card {
+	padding: 32rpx 28rpx;
+	margin-bottom: 24rpx;
+	border-radius: $radius-lg;
+	background: $hero-gradient;
+	color: #ffffff;
+	box-shadow: $shadow-card;
+}
+
+.head-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.head-type {
+	font-size: 30rpx;
+	font-weight: 600;
+}
+
+.head-amount {
+	display: block;
+	margin-top: 16rpx;
+	font-size: 48rpx;
+	font-weight: 600;
+}
+
+.head-no {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 23rpx;
+	opacity: 0.85;
+}
+
+.head-grid {
+	display: flex;
+	margin-top: 24rpx;
+	padding-top: 20rpx;
+	border-top: 1rpx solid rgba(255, 255, 255, 0.25);
+}
+
+.head-cell {
+	flex: 1;
+}
+
+.card {
+	@include card;
+	padding: 28rpx;
+	margin-bottom: 24rpx;
+}
+
+.block-head {
+	@include block-head;
+}
+
+.block-title {
+	@include section-title;
+}
+
+.block-tip {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.line {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 20rpx;
+	padding: 14rpx 0;
+}
+
+.line-label {
+	font-size: 26rpx;
+	color: $color-text-muted;
+	flex-shrink: 0;
+}
+
+.line-value {
+	flex: 1;
+	text-align: right;
+	font-size: 26rpx;
+	color: $color-text;
+}
+
+.line-value.link {
+	color: $color-primary;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	gap: 4rpx;
+}
+
+.remark {
+	margin-top: 12rpx;
+	padding-top: 16rpx;
+	border-top: 1rpx solid $color-divider;
+	font-size: 24rpx;
+	color: $color-text-secondary;
+	line-height: 1.6;
+}
+
+.item-row {
+	padding: 20rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:last-child {
+		border-bottom: none;
+	}
+}
+
+.item-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.item-name {
+	font-size: 28rpx;
+	color: $color-text;
+	font-weight: 500;
+}
+
+.item-amount {
+	font-size: 28rpx;
+	color: $color-text;
+	font-weight: 600;
+}
+
+.item-meta {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 20rpx;
+	margin-top: 8rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.item-empty {
+	padding: 40rpx 0;
+	text-align: center;
+	font-size: 26rpx;
+	color: $color-text-muted;
+}
+
+.task-row {
+	display: flex;
+	gap: 16rpx;
+	padding: 18rpx 0;
+}
+
+.task-dot {
+	width: 18rpx;
+	height: 18rpx;
+	margin-top: 10rpx;
+	border-radius: 50%;
+	flex-shrink: 0;
+	background: $color-border;
+
+	&.done {
+		background: $color-success;
+	}
+
+	&.rejected {
+		background: $color-danger;
+	}
+
+	&.pending {
+		background: $color-warning;
+	}
+}
+
+.task-body {
+	flex: 1;
+}
+
+.task-line1 {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.task-node {
+	font-size: 26rpx;
+	color: $color-text;
+	font-weight: 500;
+}
+
+.task-status {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.task-sub {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.task-comment {
+	display: block;
+	margin-top: 8rpx;
+	padding: 12rpx 16rpx;
+	border-radius: $radius-sm;
+	background: $color-bg-page;
+	font-size: 23rpx;
+	color: $color-text-secondary;
+}
+
+.actions {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	gap: 16rpx;
+	padding: 20rpx $page-padding-x calc(20rpx + env(safe-area-inset-bottom));
+	background: $color-card;
+	box-shadow: 0 -4rpx 16rpx rgba(15, 23, 42, 0.06);
+	@include dialog-responsive;
+}
+
+.act {
+	flex: 1;
+	height: 78rpx;
+	line-height: 78rpx;
+	text-align: center;
+	border-radius: $radius-full;
+	font-size: 26rpx;
+	background: $color-bg-page;
+	color: $color-text-secondary;
+
+	&.ghost {
+		background: $color-bg-page;
+		color: $color-text-secondary;
+	}
+
+	&.primary {
+		background: #2563eb;
+		color: #ffffff;
+		font-weight: 500;
+	}
+
+	&.disabled {
+		opacity: 0.5;
+	}
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+</style>
diff --git a/uniapp/pages/erp/document/edit.vue b/uniapp/pages/erp/document/edit.vue
new file mode 100644
index 0000000..10db28b
--- /dev/null
+++ b/uniapp/pages/erp/document/edit.vue
@@ -0,0 +1,1303 @@
+<template>
+	<view class="page">
+		<view v-if="blocked" class="state-box">
+			<text class="state-text">{{ blocked }}</text>
+			<view class="state-back" @tap="goBack">
+				<text>返回单据详情</text>
+			</view>
+		</view>
+
+		<block v-else>
+			<!-- 表头 -->
+			<view class="card">
+				<view class="card-head">
+					<text class="card-title">{{ typeLabel }}</text>
+					<text v-if="form.id" class="card-no">{{ form.docNo }}</text>
+					<text v-else class="card-tip">保存后生成单号</text>
+				</view>
+
+				<view class="field">
+					<text class="field-label">业务日期 <text class="required">*</text></text>
+					<picker mode="date" :value="form.bizDate" @change="onBizDateChange">
+						<view class="field-value">
+							<text>{{ form.bizDate || '选择日期' }}</text>
+							<FaIcon name="calendar-days" color="#94a3b8" :size="16" />
+						</view>
+					</picker>
+				</view>
+
+				<view v-for="row in headRows" :key="row.key" class="field">
+					<text class="field-label">
+						{{ row.label }}<text v-if="row.required" class="required"> *</text>
+					</text>
+					<view class="field-value tap" @tap="openPicker(row.key)">
+						<text :class="{ muted: !row.text }">{{ row.text || row.placeholder }}</text>
+						<FaIcon name="chevron-right" color="#cbd5e1" :size="15" />
+					</view>
+				</view>
+
+				<view v-if="sourceTip" class="inline-tip">
+					<text>{{ sourceTip }}</text>
+				</view>
+
+				<view class="field">
+					<text class="field-label">备注</text>
+					<u-input
+						v-model="form.remark"
+						placeholder="选填"
+						:maxlength="200"
+						border="none"
+					/>
+				</view>
+			</view>
+
+			<!-- 明细 -->
+			<view class="card">
+				<view class="card-head">
+					<text class="card-title">商品明细（{{ items.length }} 行）</text>
+					<text class="card-total">¥{{ moneyText(totalAmount) }}</text>
+				</view>
+
+				<view v-if="!items.length" class="items-empty">
+					<text>还没有明细行</text>
+				</view>
+				<view
+					v-for="(item, index) in items"
+					:key="index"
+					class="item-row"
+					@tap="openItem(index)"
+				>
+					<view class="item-main">
+						<view class="item-line1">
+							<text class="item-name">{{ item.product_name || '未选商品' }}</text>
+							<text class="item-amount">¥{{ moneyText(lineAmount(item)) }}</text>
+						</view>
+						<view class="item-line2">
+							<text>{{ qtyText(item.quantity) }} {{ item.unit || '' }} × ¥{{ moneyText(item.unit_price) }}</text>
+							<text v-if="item.batch_no">批次 {{ item.batch_no }}</text>
+							<text v-if="isStockTake && item.book_qty">账面 {{ qtyText(item.book_qty) }} · 差异 {{ signed(qtyText(diffOf(item))) }}</text>
+						</view>
+					</view>
+					<view class="item-del" @tap.stop="removeItem(index)">
+						<FaIcon name="trash-can" color="#f56c6c" :size="17" />
+					</view>
+				</view>
+
+				<view class="item-tools">
+					<view class="tool" @tap="openItem(-1)">
+						<FaIcon name="plus" color="#2563eb" :size="15" />
+						<text>添加明细</text>
+					</view>
+					<view v-if="isStockTake && form.warehouseId" class="tool" @tap="loadTakeSheet">
+						<FaIcon name="clipboard-list" color="#2563eb" :size="15" />
+						<text>载入账面库存</text>
+					</view>
+					<view v-if="form.sourceDocId" class="tool" @tap="pullFromSource">
+						<FaIcon name="rotate" color="#2563eb" :size="15" />
+						<text>按剩余量带出</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 金额 -->
+			<view class="card">
+				<view class="line">
+					<text class="line-label">数量合计</text>
+					<text class="line-value">{{ qtyText(totalQty) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">单据金额</text>
+					<text class="line-value">¥{{ moneyText(totalAmount) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">优惠金额</text>
+					<view class="line-value input-cell">
+						<u-input
+							v-model="form.discountAmount"
+							type="digit"
+							placeholder="0.00"
+							border="none"
+							inputAlign="right"
+						/>
+					</view>
+				</view>
+				<view class="line highlight">
+					<text class="line-label">实付/实收</text>
+					<text class="line-value strong">¥{{ moneyText(actualAmount) }}</text>
+				</view>
+			</view>
+
+			<view class="footer-space"></view>
+
+			<view class="footer">
+				<u-button
+					type="primary"
+					plain
+					color="#2563eb"
+					shape="circle"
+					:loading="saving"
+					text="保存草稿"
+					@click="onSave(false)"
+				/>
+				<u-button
+					type="primary"
+					color="#2563eb"
+					shape="circle"
+					:loading="saving"
+					:text="flowable ? '保存并提交审批' : '保存并审核生效'"
+					@click="onSave(true)"
+				/>
+			</view>
+		</block>
+
+		<!-- 明细编辑抽屉 -->
+		<view v-if="itemVisible" class="item-mask" @tap="closeItem">
+			<view class="item-sheet" @tap.stop>
+				<view class="sheet-head">
+					<text class="sheet-btn" @tap="closeItem">取消</text>
+					<text class="sheet-title">{{ editingIndex >= 0 ? '编辑明细' : '添加明细' }}</text>
+					<text class="sheet-btn strong" @tap="confirmItem">确定</text>
+				</view>
+				<scroll-view class="sheet-body" scroll-y>
+					<view class="field">
+						<text class="field-label">商品 <text class="required">*</text></text>
+						<view class="field-value tap" @tap="openPicker('product')">
+							<text :class="{ muted: !draft.product_name }">{{ draft.product_name || '选择商品' }}</text>
+							<FaIcon name="chevron-right" color="#cbd5e1" :size="15" />
+						</view>
+					</view>
+					<view v-if="stockText" class="inline-tip">
+						<text>{{ stockText }}</text>
+					</view>
+
+					<view v-if="isStockTake" class="field">
+						<text class="field-label">账面数量</text>
+						<view class="field-value static">
+							<text>{{ qtyText(draft.book_qty) }}</text>
+						</view>
+					</view>
+
+					<view class="field">
+						<text class="field-label">{{ isStockTake ? '实盘数量' : '数量' }} <text class="required">*</text></text>
+						<u-input v-model="draft.quantity" type="digit" placeholder="0" border="none" />
+					</view>
+
+					<view v-if="!isStockTake || draft.unit_price" class="field">
+						<text class="field-label">单价</text>
+						<view class="two-col">
+							<u-input v-model="draft.unit_price" type="digit" placeholder="0.00" border="none" />
+							<text class="col-amount">¥{{ moneyText(lineAmount(draft)) }}</text>
+						</view>
+						<text class="field-hint">留空按商品资料与价格体系自动取价</text>
+					</view>
+
+					<view v-if="showBatch" class="field">
+						<text class="field-label">
+							批次号<text v-if="batchRequired" class="required"> *</text>
+						</text>
+						<u-input v-model="draft.batch_no" placeholder="批次管理商品必填" :maxlength="64" border="none" />
+					</view>
+
+					<view v-if="showProductDate" class="field">
+						<text class="field-label">生产日期</text>
+						<picker mode="date" :value="draft.production_date" @change="onProductDateChange">
+							<view class="field-value">
+								<text>{{ draft.production_date || '选择日期' }}</text>
+								<FaIcon name="calendar-days" color="#94a3b8" :size="16" />
+							</view>
+						</picker>
+					</view>
+
+					<view v-if="draft.shelf_life_days > 0 && draft.production_date" class="inline-tip">
+						<text>保质期 {{ draft.shelf_life_days }} 天，到期日由后端按保质期推算</text>
+					</view>
+
+					<view class="field">
+						<text class="field-label">行备注</text>
+						<u-input v-model="draft.remark" placeholder="选填" :maxlength="200" border="none" />
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+
+		<ErpPicker
+			:show="picker.show"
+			:title="picker.title"
+			:placeholder="picker.placeholder"
+			:options="picker.options"
+			:remote="picker.remote"
+			:loading="picker.loading"
+			:tip="picker.tip"
+			:model-value="picker.current"
+			@update:show="picker.show = false"
+			@search="onPickerSearch"
+			@select="onPickerSelect"
+		/>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 单据开单 / 草稿编辑页（十类单据共用）。
+ *
+ * 表头字段按单据类型动态出现：采购类选供应商、销售类选客户、调拨多一个调入仓库、
+ * 盘点只需要仓库不需要客商 —— 这些规则全部取自 /api/erp/meta 的 doc_types，
+ * 与 Web 端 DocEditor、Go 端 erpValidateDocHead 同一份口径，避免端上自己判型判错。
+ *
+ * 明细只传可编辑字段：单价留空由后端按价格体系取价，金额由后端重算，
+ * 保证手机端提交的单与 Web 端算出来的一分不差。
+ */
+import { computed, reactive, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import ErpPicker from '@/components/erp/ErpPicker.vue'
+import {
+	DOC_STATUS,
+	approveDoc,
+	dayText,
+	docStatusLabel,
+	fetchDocFlows,
+	fetchDocTypes,
+	fetchDocs,
+	fetchErpMeta,
+	fetchExecutableDocs,
+	fetchPartners,
+	fetchProducts,
+	fetchStocks,
+	fetchTakeSheet,
+	fetchWarehouses,
+	getDoc,
+	getProduct,
+	moneyText,
+	qtyText,
+	saveDoc,
+	submitDoc
+} from '@/api/erp.js'
+
+const EDITABLE = [DOC_STATUS.DRAFT, DOC_STATUS.REJECTED]
+
+const items = ref([])
+const form = reactive({
+	id: 0,
+	docType: '',
+	docNo: '',
+	bizDate: today(),
+	warehouseId: 0,
+	warehouseName: '',
+	toWarehouseId: 0,
+	toWarehouseName: '',
+	partnerId: 0,
+	partnerName: '',
+	partnerType: '',
+	sourceDocId: 0,
+	sourceDocNo: '',
+	discountAmount: '',
+	remark: ''
+})
+
+const typeDict = ref([])
+const meta = ref({ default_warehouse_id: 0, sales_price_type: '', negative_stock: false })
+const warehouses = ref([])
+/** 商品选择器当前页的原始行，选中后要拿 enable_batch / shelf_life_days / 价格字段 */
+const productRows = ref([])
+const blocked = ref('')
+const saving = ref(false)
+const flowable = ref(true)
+
+const itemVisible = ref(false)
+const editingIndex = ref(-1)
+const draft = reactive({})
+const stockText = ref('')
+
+const picker = reactive({
+	show: false,
+	key: '',
+	title: '',
+	placeholder: '搜索',
+	remote: false,
+	loading: false,
+	tip: '',
+	options: [],
+	current: null
+})
+
+onLoad(async (query = {}) => {
+	form.docType = String(query.doc_type || '')
+	await loadDicts()
+
+	if (query.id) {
+		await loadDoc(Number(query.id))
+	} else {
+		if (form.docType) syncTypeFields()
+		applyDefaultWarehouse()
+	}
+
+	if (query.source_doc_id) await attachSource(Number(query.source_doc_id))
+	if (query.product_id && !query.id) await prefillProduct(Number(query.product_id), query.quantity)
+
+	loadFlowable()
+	uni.setNavigationBarTitle({ title: typeLabel.value || '开单' })
+})
+
+/** 该类型有没有配审批流：有则第二个按钮是「提交审批」，没有就是「直接审核生效」 */
+async function loadFlowable() {
+	if (!form.docType) return
+	const flows = await fetchDocFlows(form.docType).catch(() => ({ list: [] }))
+	flowable.value = (flows.list || []).length > 0
+}
+
+async function loadDicts() {
+	try {
+		const [types, m, whs] = await Promise.all([fetchDocTypes(), fetchErpMeta(), fetchWarehouses({ onlyEnabled: true })])
+		typeDict.value = types
+		meta.value = {
+			default_warehouse_id: m.default_warehouse_id || 0,
+			sales_price_type: m.sales_price_type || '',
+			negative_stock: !!m.negative_stock
+		}
+		warehouses.value = whs
+	} catch (e) {
+		blocked.value = '基础资料加载失败，请下拉重试或稍后再试'
+	}
+}
+
+async function loadDoc(id) {
+	const doc = await getDoc(id)
+	if (!doc) {
+		blocked.value = '单据不存在或无权查看'
+		return
+	}
+	if (!EDITABLE.includes(Number(doc.status))) {
+		blocked.value = `${docStatusLabel(doc.status)}的单据不可编辑`
+		return
+	}
+	form.id = doc.id
+	form.docType = doc.doc_type
+	form.docNo = doc.doc_no
+	form.bizDate = dayText(doc.biz_date) || form.bizDate
+	form.warehouseId = doc.warehouse_id || 0
+	form.warehouseName = doc.warehouse_name || ''
+	form.toWarehouseId = doc.to_warehouse_id || 0
+	form.toWarehouseName = doc.to_warehouse_name || ''
+	form.partnerId = doc.partner_id || 0
+	form.partnerName = doc.partner_name || ''
+	form.sourceDocId = doc.source_doc_id || 0
+	form.sourceDocNo = doc.source_doc_no || ''
+	form.discountAmount = doc.discount_amount ? String(doc.discount_amount) : ''
+	form.remark = doc.remark || ''
+	items.value = (doc.items || []).map(toRow)
+	syncTypeFields()
+}
+
+/** 列表/详情的明细行 → 端上行模型（保留 id 与来源行引用，价格与库存档案快照单独存） */
+function toRow(it) {
+	return {
+		id: it.id || 0,
+		product_id: it.product_id,
+		product_name: it.product_name,
+		product_code: it.product_code || '',
+		spec: it.spec || '',
+		unit: it.unit || '',
+		batch_no: it.batch_no || '',
+		quantity: String(it.quantity ?? ''),
+		book_qty: Number(it.book_qty || 0),
+		ref_item_id: it.ref_item_id || 0,
+		unit_price: String(it.unit_price ?? ''),
+		production_date: dayText(it.production_date),
+		remark: it.remark || '',
+		enable_batch: Number(it.enable_batch || 0),
+		shelf_life_days: Number(it.shelf_life_days || 0)
+	}
+}
+
+// ------------------------------------------------------------ 类型派生的表单形态
+
+const typeInfo = computed(() => typeDict.value.find((t) => t.value === form.docType) || {})
+const typeLabel = computed(() => typeInfo.value.label || '')
+const needWarehouse = computed(() => !!typeInfo.value.affects_stock || isStockTake.value)
+const isTransfer = computed(() => form.docType === 'transfer')
+const isStockTake = computed(() => form.docType === 'stock_take')
+const partnerRequired = computed(() => !!typeInfo.value.partner_type)
+
+/** 需要往来单位时才出现客商行；调拨多一行调入仓库 */
+const headRows = computed(() => {
+	const rows = []
+	if (needWarehouse.value) {
+		rows.push({
+			key: 'warehouse',
+			label: isStockTake.value ? '盘点仓库' : isTransfer.value ? '调出仓库' : '仓库',
+			text: form.warehouseName,
+			placeholder: '请选择仓库',
+			required: true
+		})
+	}
+	if (isTransfer.value) {
+		rows.push({
+			key: 'toWarehouse',
+			label: '调入仓库',
+			text: form.toWarehouseName,
+			placeholder: '请选择调入仓库',
+			required: true
+		})
+	}
+	if (partnerRequired.value) {
+		rows.push({
+			key: 'partner',
+			label: typeInfo.value.partner_type === 'supplier' ? '供应商' : '客户',
+			text: form.partnerName,
+			placeholder: '请选择往来单位',
+			required: true
+		})
+	}
+	if (sourceTypes.value.length) {
+		rows.push({
+			key: 'source',
+			label: '来源单据',
+			text: form.sourceDocNo,
+			placeholder: '选填，可关联订单/出库单',
+			required: false
+		})
+	}
+	return rows
+})
+
+/** 允许的来源单据类型（与 Go 端 docTypeSources 一致） */
+const sourceTypes = computed(() => {
+	switch (form.docType) {
+		case 'purchase_in':
+			return ['purchase_order']
+		case 'purchase_return':
+			return ['purchase_order', 'purchase_in']
+		case 'sales_out':
+			return ['sales_order']
+		case 'sales_return':
+			return ['sales_order', 'sales_out']
+		default:
+			return []
+	}
+})
+
+const sourceTip = computed(() =>
+	form.sourceDocNo ? `已关联「${form.sourceDocNo}」，可点「按剩余量带出」生成明细` : ''
+)
+
+function syncTypeFields() {
+	form.partnerType = typeInfo.value.partner_type || ''
+	if (!partnerRequired.value) {
+		form.partnerId = 0
+		form.partnerName = ''
+	}
+	if (!isTransfer.value) {
+		form.toWarehouseId = 0
+		form.toWarehouseName = ''
+	}
+	if (!sourceTypes.value.length) {
+		form.sourceDocId = 0
+		form.sourceDocNo = ''
+	}
+}
+
+function applyDefaultWarehouse() {
+	const id = Number(meta.value.default_warehouse_id) || 0
+	const hit = warehouses.value.find((w) => Number(w.id) === id)
+	if (hit && !form.warehouseId) {
+		form.warehouseId = Number(hit.id)
+		form.warehouseName = hit.warehouse_name || ''
+	}
+}
+
+// ------------------------------------------------------------ 选择器
+
+function openPicker(key) {
+	picker.key = key
+	picker.loading = false
+	picker.tip = ''
+	picker.remote = false
+	picker.current = null
+	picker.placeholder = '搜索'
+	if (key === 'warehouse' || key === 'toWarehouse') {
+		picker.title = key === 'warehouse' ? '选择仓库' : '选择调入仓库'
+		picker.current = key === 'warehouse' ? form.warehouseId : form.toWarehouseId
+		picker.options = warehouseOptions(key)
+	} else if (key === 'partner') {
+		picker.title = typeInfo.value.partner_type === 'supplier' ? '选择供应商' : '选择客户'
+		picker.remote = true
+		picker.current = form.partnerId
+		picker.options = []
+		loadPartners('')
+	} else if (key === 'product') {
+		picker.title = '选择商品'
+		picker.remote = true
+		picker.current = draft.product_id
+		picker.options = []
+		loadProducts('')
+	} else if (key === 'source') {
+		picker.title = '选择来源单据'
+		picker.remote = true
+		picker.current = form.sourceDocId
+		picker.options = []
+		loadSources('')
+	}
+	picker.show = true
+}
+
+function warehouseOptions(key) {
+	return warehouses.value
+		.filter((w) => !(key === 'warehouse' && form.toWarehouseId && Number(w.id) === form.toWarehouseId))
+		.filter((w) => !(key === 'toWarehouse' && Number(w.id) === form.warehouseId))
+		.map((w) => ({
+			value: w.id,
+			label: w.warehouse_name || `仓库#${w.id}`,
+			sub: w.remark || '',
+			extra: `${w.stock_kinds || 0} 种 / ¥${moneyText(w.stock_value || 0)}`
+		}))
+}
+
+async function loadPartners(keyword) {
+	picker.loading = true
+	try {
+		const { list, total } = await fetchPartners({
+			partnerType: typeInfo.value.partner_type || 'customer',
+			keyword,
+			onlyEnabled: true,
+			pageSize: 50
+		})
+		picker.options = list.map((p) => ({
+			value: p.partner_id,
+			label: p.partner_name,
+			sub: [p.contact_person, p.contact_phone].filter(Boolean).join(' · '),
+			extra: Number(p.open_amount) > 0 ? `未结 ¥${moneyText(p.open_amount)}` : ''
+		}))
+		picker.tip = total > list.length ? `共 ${total} 家，输入关键字继续找` : ''
+	} finally {
+		picker.loading = false
+	}
+}
+
+async function loadProducts(keyword) {
+	picker.loading = true
+	try {
+		const { list, total } = await fetchProducts({ keyword, onlyEnabled: true, pageSize: 50 })
+		productRows.value = list
+		picker.options = list.map((p) => ({
+			value: p.id,
+			label: p.product_name,
+			sub: [p.product_code, p.spec, p.category_name].filter(Boolean).join(' · '),
+			extra: `${qtyText(p.total_stock)} ${p.base_unit || ''}`
+		}))
+		picker.tip = total > list.length ? `共 ${total} 个商品，输入关键字继续找` : ''
+	} finally {
+		picker.loading = false
+	}
+}
+
+async function loadSources(keyword) {
+	picker.loading = true
+	try {
+		const { list } = await fetchDocs({
+			docTypes: sourceTypes.value,
+			status: DOC_STATUS.APPROVED,
+			keyword,
+			pageSize: 30
+		})
+		picker.options = list.map((d) => ({
+			value: d.id,
+			label: d.doc_no,
+			sub: `${docTypeText(d.doc_type)} · ${d.biz_date} · ${d.partner_name || ''}`,
+			extra: `¥${moneyText(d.actual_amount)}`
+		}))
+	} finally {
+		picker.loading = false
+	}
+}
+
+function onPickerSearch(keyword) {
+	if (picker.key === 'partner') loadPartners(keyword)
+	else if (picker.key === 'product') loadProducts(keyword)
+	else if (picker.key === 'source') loadSources(keyword)
+}
+
+async function onPickerSelect(opt) {
+	if (picker.key === 'warehouse') {
+		form.warehouseId = Number(opt.value)
+		form.warehouseName = opt.label
+		if (isTransfer.value && form.toWarehouseId === form.warehouseId) {
+			form.toWarehouseId = 0
+			form.toWarehouseName = ''
+		}
+	} else if (picker.key === 'toWarehouse') {
+		form.toWarehouseId = Number(opt.value)
+		form.toWarehouseName = opt.label
+	} else if (picker.key === 'partner') {
+		form.partnerId = Number(opt.value)
+		form.partnerName = opt.label
+	} else if (picker.key === 'source') {
+		form.sourceDocId = Number(opt.value)
+		form.sourceDocNo = opt.label
+		await pullFromSource()
+	} else if (picker.key === 'product') {
+		const raw = productRows.value.find((p) => Number(p.id) === Number(opt.value))
+		if (raw) fillDraftProduct(raw)
+	}
+}
+
+function docTypeText(type) {
+	return (typeDict.value.find((t) => t.value === type) || {}).label || type
+}
+
+// ------------------------------------------------------------ 明细
+
+const showBatch = computed(() => !!draft.enable_batch || !!draft.batch_no || isStockTake.value)
+const batchRequired = computed(() => Number(draft.enable_batch) === 1 && form.docType === 'purchase_in')
+const showProductDate = computed(
+	() => Number(draft.shelf_life_days) > 0 || !!draft.enable_batch || !!draft.production_date
+)
+
+function openItem(index) {
+	editingIndex.value = index
+	const src = index >= 0 ? items.value[index] : emptyRow()
+	Object.keys(draft).forEach((k) => delete draft[k])
+	Object.assign(draft, { ...src })
+	stockText.value = ''
+	itemVisible.value = true
+	if (src.product_id) loadStockHint(src.product_id)
+}
+
+function closeItem() {
+	itemVisible.value = false
+}
+
+function emptyRow() {
+	return {
+		id: 0,
+		product_id: 0,
+		product_name: '',
+		spec: '',
+		unit: '',
+		batch_no: '',
+		quantity: '',
+		book_qty: 0,
+		ref_item_id: 0,
+		unit_price: '',
+		production_date: '',
+		remark: '',
+		enable_batch: 0,
+		shelf_life_days: 0
+	}
+}
+
+function fillDraftProduct(p) {
+	draft.product_id = p.id
+	draft.product_name = p.product_name
+	draft.spec = p.spec || ''
+	draft.unit = p.base_unit || ''
+	draft.enable_batch = Number(p.enable_batch || 0)
+	draft.shelf_life_days = Number(p.shelf_life_days || 0)
+	if (!draft.unit_price || draft.unit_price === '0') draft.unit_price = String(pickPrice(p) || '')
+	loadStockHint(p.id)
+}
+
+/** 预警/补货页带商品过来开单：直接铺好一行，用户只补供应商和数量 */
+async function prefillProduct(id, quantity) {
+	try {
+		const p = await getProduct(id)
+		if (!p) return
+		items.value = [
+			{
+				...emptyRow(),
+				product_id: p.id,
+				product_name: p.product_name,
+				spec: p.spec || '',
+				unit: p.base_unit || '',
+				enable_batch: Number(p.enable_batch || 0),
+				shelf_life_days: Number(p.shelf_life_days || 0),
+				quantity: Number(quantity) > 0 ? String(quantity) : '',
+				unit_price: pickPrice(p) ? String(pickPrice(p)) : ''
+			}
+		]
+	} catch (e) {
+		// 商品拉不到就让用户手动加行，不拦开单入口
+	}
+}
+
+/** 与 Go 端 erpPickPrice 同规则：采购价/销售价按租户价格体系回落 */
+function pickPrice(p) {
+	const type = form.docType
+	if (['purchase_order', 'purchase_in', 'purchase_return', 'other_in'].includes(type)) {
+		return Number(p.purchase_price || 0)
+	}
+	if (['sales_return'].includes(type)) return Number(p.sale_price || 0)
+	if (['sales_order', 'sales_out', 'other_out'].includes(type)) {
+		const sys = meta.value.sales_price_type
+		if (sys === 'wholesale' && Number(p.wholesale_price) > 0) return Number(p.wholesale_price)
+		if (sys === 'member' && Number(p.member_price) > 0) return Number(p.member_price)
+		return Number(p.sale_price || 0)
+	}
+	return 0
+}
+
+async function loadStockHint(productId) {
+	stockText.value = ''
+	if (!typeInfo.value.affects_stock || !form.warehouseId || !productId) return
+	// 同一商品可能有多批次行，按商品聚合才是这一仓真正可发的量
+	const { list } = await fetchStocks({ warehouseId: form.warehouseId, productId, groupBy: 'product', pageSize: 1 })
+	const row = list[0]
+	if (!row) {
+		stockText.value = meta.value.negative_stock
+			? '该仓暂无此商品库存（租户允许负库存，可先开单后补货）'
+			: '该仓暂无此商品库存，出库会被拦截'
+		return
+	}
+	stockText.value = `当前库存 ${qtyText(row.quantity)} ${row.unit || ''} · 成本 ¥${moneyText(row.cost_price)}`
+}
+
+function confirmItem() {
+	const msg = checkDraft()
+	if (msg) {
+		uni.showToast({ title: msg, icon: 'none' })
+		return
+	}
+	const row = { ...draft }
+	if (editingIndex.value >= 0) items.value.splice(editingIndex.value, 1, row)
+	else items.value.push(row)
+	closeItem()
+}
+
+function checkDraft() {
+	if (!draft.product_id) return '请选择商品'
+	if (!(Number(draft.quantity) > 0)) return isStockTake.value ? '请填写实盘数量' : '数量必须大于 0'
+	if (batchRequired.value && !String(draft.batch_no || '').trim()) return '批次管理商品请填写批次号'
+	return ''
+}
+
+function removeItem(index) {
+	uni.showModal({
+		title: '删除明细',
+		content: `确定移除「${items.value[index].product_name}」这一行？`,
+		success: (res) => {
+			if (res.confirm) items.value.splice(index, 1)
+		}
+	})
+}
+
+function lineAmount(row) {
+	return (Number(row.quantity) || 0) * (Number(row.unit_price) || 0)
+}
+
+function diffOf(row) {
+	return (Number(row.quantity) || 0) - Number(row.book_qty || 0)
+}
+
+function signed(text) {
+	const num = Number(text) || 0
+	return (num > 0 ? '+' : '') + text
+}
+
+const totalQty = computed(() => items.value.reduce((sum, r) => sum + (Number(r.quantity) || 0), 0))
+const totalAmount = computed(() => items.value.reduce((sum, r) => sum + lineAmount(r), 0))
+const actualAmount = computed(() => {
+	const minus = Number(form.discountAmount) || 0
+	return Math.max(0, totalAmount.value - minus)
+})
+
+/** 盘点：按仓库账面库存铺行，盘点员只改实盘数 */
+async function loadTakeSheet() {
+	const rows = await fetchTakeSheet(form.warehouseId)
+	if (!rows.length) {
+		uni.showToast({ title: '该仓库暂无在库商品', icon: 'none' })
+		return
+	}
+	items.value = rows.map((r) => ({
+		...emptyRow(),
+		product_id: r.product_id,
+		product_name: r.product_name,
+		spec: r.spec || '',
+		unit: r.unit || '',
+		batch_no: r.batch_no || '',
+		book_qty: Number(r.book_qty || 0),
+		quantity: String(r.book_qty || 0),
+		unit_price: r.cost_price ? String(r.cost_price) : ''
+	}))
+	uni.showToast({ title: `已载入 ${rows.length} 行`, icon: 'none' })
+}
+
+/** 订单转入库/出库：按「下单量 - 已执行量」带出，行 ID 作为 ref_item_id 供后端做超收校验 */
+async function pullFromSource() {
+	if (!form.sourceDocId) return
+	const data = await fetchExecutableDocs(form.sourceDocId)
+	const rows = (data.items || []).filter((it) => it.remain_qty > 0)
+	if (!rows.length) {
+		uni.showToast({ title: '来源单据已全部执行完毕', icon: 'none' })
+		return
+	}
+	const build = () => {
+		items.value = rows.map((it) => ({
+			...emptyRow(),
+			product_id: it.product_id,
+			product_name: it.product_name,
+			spec: it.spec || '',
+			unit: it.unit || '',
+			batch_no: it.batch_no || '',
+			quantity: String(it.remain_qty),
+			unit_price: String(it.unit_price || ''),
+			ref_item_id: it.item_id
+		}))
+		if (partnerRequired.value && data.doc?.partner_id) {
+			form.partnerId = data.doc.partner_id
+			form.partnerName = data.doc.partner_name || ''
+		}
+		uni.showToast({ title: `已带出 ${rows.length} 行`, icon: 'none' })
+	}
+	if (!items.value.length) {
+		build()
+		return
+	}
+	uni.showModal({
+		title: '替换明细',
+		content: `按来源单据剩余量生成 ${rows.length} 行，会覆盖当前 ${items.value.length} 行明细`,
+		success: (res) => {
+			if (res.confirm) build()
+		}
+	})
+}
+
+/** 从详情页「生成下游单」进入：带出来源单号、客商、仓库与可执行明细 */
+async function attachSource(id) {
+	form.sourceDocId = Number(id)
+	const doc = await getDoc(id)
+	if (!doc) return
+	form.sourceDocNo = doc.doc_no
+	if (partnerRequired.value && doc.partner_id) {
+		form.partnerId = doc.partner_id
+		form.partnerName = doc.partner_name || ''
+	}
+	if (needWarehouse.value && doc.warehouse_id && !form.warehouseId) {
+		form.warehouseId = doc.warehouse_id
+		form.warehouseName = doc.warehouse_name || ''
+	}
+	await pullFromSource()
+}
+
+// ------------------------------------------------------------ 保存
+
+function headCheck() {
+	if (!form.docType) return '缺少单据类型'
+	if (!form.bizDate) return '请选择业务日期'
+	if (needWarehouse.value && !form.warehouseId) return '请选择仓库'
+	if (isTransfer.value) {
+		if (!form.toWarehouseId) return '请选择调入仓库'
+		if (form.toWarehouseId === form.warehouseId) return '调入仓库不能与调出仓库相同'
+	}
+	if (partnerRequired.value && !form.partnerId) {
+		return '请选择' + (typeInfo.value.partner_type === 'supplier' ? '供应商' : '客户')
+	}
+	if (!items.value.length) return '请至少添加一行明细'
+	return ''
+}
+
+async function onSave(thenGo) {
+	const msg = headCheck()
+	if (msg) {
+		uni.showToast({ title: msg, icon: 'none' })
+		return
+	}
+	saving.value = true
+	try {
+		const { id, docNo } = await saveDoc({
+			id: form.id,
+			docType: form.docType,
+			bizDate: form.bizDate,
+			warehouseId: form.warehouseId,
+			toWarehouseId: form.toWarehouseId,
+			partnerId: form.partnerId,
+			sourceDocId: form.sourceDocId,
+			discountAmount: Number(form.discountAmount) || 0,
+			remark: form.remark,
+			items: items.value.map((row, i) => ({
+				id: row.id,
+				productId: row.product_id,
+				productName: row.product_name,
+				spec: row.spec,
+				unit: row.unit,
+				batchNo: row.batch_no,
+				quantity: Number(row.quantity) || 0,
+				bookQty: row.book_qty,
+				refItemId: row.ref_item_id,
+				unitPrice: Number(row.unit_price) || 0,
+				productionDate: row.production_date,
+				remark: row.remark,
+				sortOrder: i + 1
+			}))
+		})
+		form.id = id
+		form.docNo = docNo
+
+		if (thenGo) await advance(id)
+		else uni.showToast({ title: '草稿已保存', icon: 'success' })
+	} catch (e) {
+		// 具体原因由请求层 toast，这里只负责不吞掉「已保存但提交失败」这种半成功状态
+	} finally {
+		saving.value = false
+	}
+}
+
+/** 提交审批：未配置审批流时直接审核生效，与 Web 端按钮语义一致 */
+async function advance(id) {
+	if (flowable.value) {
+		await submitDoc(id, 0)
+		uni.showToast({ title: '已提交审批', icon: 'success' })
+	} else {
+		await approveDoc(id)
+		uni.showToast({ title: '单据已审核生效', icon: 'success' })
+	}
+	setTimeout(() => uni.redirectTo({ url: `/pages/erp/document/detail?id=${id}` }), 600)
+}
+
+function goBack() {
+	if (form.id) uni.redirectTo({ url: `/pages/erp/document/detail?id=${form.id}` })
+	else uni.navigateBack()
+}
+
+function onBizDateChange(e) {
+	form.bizDate = e.detail.value
+}
+
+function onProductDateChange(e) {
+	draft.production_date = e.detail.value
+}
+
+function today() {
+	const d = new Date()
+	const m = String(d.getMonth() + 1).padStart(2, '0')
+	const day = String(d.getDate()).padStart(2, '0')
+	return `${d.getFullYear()}-${m}-${day}`
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding: 20rpx $page-padding-x 0;
+	box-sizing: border-box;
+}
+
+.card {
+	@include card;
+	margin-bottom: 24rpx;
+	padding: 24rpx 28rpx;
+}
+
+.card-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 20rpx;
+}
+
+.card-title {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: $color-text;
+}
+
+.card-no {
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.card-tip {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.card-total {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #dc2626;
+}
+
+.field {
+	padding: 16rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:last-child {
+		border-bottom: none;
+	}
+}
+
+.field-label {
+	display: block;
+	margin-bottom: 10rpx;
+	font-size: 25rpx;
+	color: $color-text-secondary;
+}
+
+.required {
+	color: $color-danger;
+}
+
+.field-value {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-size: 28rpx;
+	color: $color-text;
+
+	&.tap:active {
+		opacity: 0.6;
+	}
+
+	&.static {
+		justify-content: flex-start;
+		color: $color-text-muted;
+	}
+
+	.muted {
+		color: $color-text-muted;
+	}
+}
+
+.field-hint {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.inline-tip {
+	margin: 12rpx 0;
+	padding: 14rpx 18rpx;
+	background: $color-primary-bg;
+	border-radius: $radius-sm;
+	font-size: 23rpx;
+	line-height: 1.5;
+	color: $color-primary-dark;
+}
+
+.two-col {
+	display: flex;
+	align-items: center;
+	gap: 16rpx;
+}
+
+.col-amount {
+	flex-shrink: 0;
+	font-size: 26rpx;
+	color: #dc2626;
+}
+
+.items-empty {
+	padding: 50rpx 0;
+	text-align: center;
+	font-size: 26rpx;
+	color: $color-text-muted;
+}
+
+.item-row {
+	display: flex;
+	align-items: center;
+	gap: 16rpx;
+	padding: 20rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:active {
+		opacity: 0.7;
+	}
+}
+
+.item-main {
+	flex: 1;
+	min-width: 0;
+}
+
+.item-line1 {
+	display: flex;
+	align-items: baseline;
+	justify-content: space-between;
+	gap: 12rpx;
+}
+
+.item-name {
+	flex: 1;
+	font-size: 27rpx;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.item-amount {
+	flex-shrink: 0;
+	font-size: 27rpx;
+	font-weight: 500;
+	color: $color-text;
+}
+
+.item-line2 {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 8rpx 20rpx;
+	margin-top: 8rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.item-del {
+	padding: 8rpx;
+	flex-shrink: 0;
+}
+
+.item-tools {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 20rpx;
+	padding-top: 20rpx;
+}
+
+.tool {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	padding: 12rpx 24rpx;
+	border-radius: $radius-full;
+	background: $color-primary-bg;
+	font-size: 24rpx;
+	color: $color-primary-dark;
+
+	&:active {
+		opacity: 0.7;
+	}
+}
+
+.line {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 14rpx 0;
+	font-size: 26rpx;
+	color: $color-text-secondary;
+
+	&.highlight {
+		margin: 8rpx -28rpx -24rpx;
+		padding: 20rpx 28rpx;
+		border-top: 1rpx solid $color-divider;
+		font-size: 28rpx;
+		color: $color-text;
+	}
+}
+
+.line-value {
+	color: $color-text;
+
+	&.strong {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #dc2626;
+	}
+}
+
+.input-cell {
+	flex: 1;
+	max-width: 260rpx;
+}
+
+.footer-space {
+	height: calc(160rpx + env(safe-area-inset-bottom));
+}
+
+.footer {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 20;
+	display: flex;
+	gap: 20rpx;
+	padding: 16rpx $page-padding-x calc(16rpx + env(safe-area-inset-bottom));
+	background: $color-card;
+	box-shadow: $shadow-header;
+	@include dialog-responsive;
+}
+
+.item-mask {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 997;
+	background: rgba(15, 23, 42, 0.45);
+	display: flex;
+	align-items: flex-end;
+	@include mask-responsive;
+}
+
+.item-sheet {
+	width: 100%;
+	max-height: 82vh;
+	background: $color-card;
+	border-radius: 32rpx 32rpx 0 0;
+	padding-bottom: env(safe-area-inset-bottom);
+	display: flex;
+	flex-direction: column;
+	@include sheet-responsive;
+}
+
+.sheet-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 28rpx $page-padding-x 12rpx;
+}
+
+.sheet-title {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: $color-text;
+}
+
+.sheet-btn {
+	font-size: 26rpx;
+	color: $color-text-muted;
+
+	&.strong {
+		color: $color-primary;
+		font-weight: 500;
+	}
+}
+
+.sheet-body {
+	flex: 1;
+	min-height: 0;
+	max-height: 64vh;
+	padding: 0 $page-padding-x 24rpx;
+	box-sizing: border-box;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 160rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-secondary;
+	line-height: 1.6;
+	text-align: center;
+}
+
+.state-back {
+	margin-top: 36rpx;
+	padding: 16rpx 40rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 26rpx;
+	color: $color-primary;
+	box-shadow: $shadow-card;
+}
+</style>
diff --git a/uniapp/pages/erp/document/index.vue b/uniapp/pages/erp/document/index.vue
new file mode 100644
index 0000000..a8940e0
--- /dev/null
+++ b/uniapp/pages/erp/document/index.vue
@@ -0,0 +1,476 @@
+<template>
+	<view class="page">
+		<view class="filter-bar">
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					placeholder="搜索单号 / 往来单位 / 备注"
+					confirm-type="search"
+					@confirm="refresh"
+				/>
+				<text v-if="keyword" class="search-clear" @tap="clearKeyword">清空</text>
+			</view>
+
+			<view class="chip-row">
+				<view class="chip" @tap="typePicker = true">
+					<FaIcon name="filter" color="#2563eb" :size="14" />
+					<text>{{ currentTypeLabel }}</text>
+				</view>
+				<view class="chip" @tap="openWarehousePicker">
+					<FaIcon name="warehouse" color="#2563eb" :size="14" />
+					<text>{{ currentWarehouseLabel }}</text>
+				</view>
+			</view>
+
+			<scroll-view class="tab-scroll" scroll-x :show-scrollbar="false">
+				<view class="tab-list">
+					<view
+						v-for="tab in statusTabs"
+						:key="String(tab.value)"
+						class="tab-item"
+						:class="{ active: currentStatus === tab.value }"
+						@tap="onTabChange(tab.value)"
+					>
+						<text>{{ tab.label }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="list" text="暂无单据" />
+		</view>
+		<template v-else>
+			<view v-for="row in list" :key="row.id" class="doc-card" @tap="openDetail(row)">
+				<view class="card-top">
+					<view class="card-title">
+						<text class="card-type">{{ row.doc_type_label || row.doc_type }}</text>
+						<text class="card-no">{{ row.doc_no }}</text>
+					</view>
+					<u-tag :text="row.status_label || docStatusLabel(row.status)" :type="docStatusType(row.status)" size="mini" />
+				</view>
+				<view class="card-partner">
+					<FaIcon :name="row.partner_type === 'supplier' ? 'truck' : 'user'" color="#94a3b8" :size="14" />
+					<text>{{ row.partner_name || row.warehouse_name || '内部单据' }}</text>
+				</view>
+				<view class="card-amounts">
+					<view class="amount-item">
+						<text class="amount-label">金额</text>
+						<text class="amount-value">¥{{ moneyText(row.actual_amount) }}</text>
+					</view>
+					<view class="amount-item">
+						<text class="amount-label">数量</text>
+						<text class="amount-value">{{ qtyText(row.total_qty) }}</text>
+					</view>
+					<view class="amount-item">
+						<text class="amount-label">业务日期</text>
+						<text class="amount-value">{{ row.biz_date }}</text>
+					</view>
+				</view>
+				<view v-if="row.remark" class="card-remark">
+					<text>{{ row.remark }}</text>
+				</view>
+			</view>
+			<view v-if="finished" class="load-done">
+				<text>{{ list.length ? '没有更多了' : '' }}</text>
+			</view>
+		</template>
+
+		<view class="fab" @tap="openCreate">
+			<FaIcon name="pen" color="#ffffff" :size="18" />
+			<text>新建单据</text>
+		</view>
+
+		<ErpPicker
+			v-model:show="typePicker"
+			title="单据类型"
+			placeholder="搜索类型"
+			:options="typeOptions"
+			:model-value="docType"
+			@select="onTypeSelect"
+		/>
+		<ErpPicker
+			v-model:show="warehousePicker"
+			title="仓库"
+			placeholder="搜索仓库名"
+			:options="warehouseOptions"
+			:model-value="warehouseId"
+			@select="onWarehouseSelect"
+		/>
+	</view>
+</template>
+
+<script setup>
+import { computed, ref } from 'vue'
+import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import ErpPicker from '@/components/erp/ErpPicker.vue'
+import {
+	DOC_STATUS_OPTIONS,
+	docStatusLabel,
+	docStatusType,
+	fetchDocTypes,
+	fetchDocs,
+	fetchWarehouses,
+	moneyText,
+	qtyText
+} from '@/api/erp.js'
+
+const PAGE_SIZE = 20
+
+const statusTabs = [{ value: '', label: '全部' }, ...DOC_STATUS_OPTIONS]
+
+const list = ref([])
+const total = ref(0)
+const page = ref(1)
+const loading = ref(false)
+const finished = ref(false)
+const keyword = ref('')
+const currentStatus = ref('')
+const docType = ref('')
+const warehouseId = ref('')
+const docTypes = ref([])
+const warehouses = ref([])
+
+const typePicker = ref(false)
+const warehousePicker = ref(false)
+
+const typeOptions = computed(() => [
+	{ value: '', label: '全部类型', sub: '不限单据类型' },
+	...docTypes.value.map(item => ({ value: item.value, label: item.label, sub: describeType(item) }))
+])
+
+const warehouseOptions = computed(() => [
+	{ value: '', label: '全部仓库' },
+	...warehouses.value.map(item => ({
+		value: item.id,
+		label: item.warehouse_name,
+		sub: `${item.stock_kinds || 0} 个品种 · 货值 ¥${moneyText(item.stock_value)}`
+	}))
+])
+
+const currentTypeLabel = computed(() => {
+	const hit = docTypes.value.find(item => item.value === docType.value)
+	return hit ? hit.label : '全部类型'
+})
+
+const currentWarehouseLabel = computed(() => {
+	const hit = warehouses.value.find(item => String(item.id) === String(warehouseId.value))
+	return hit ? hit.warehouse_name : '全部仓库'
+})
+
+onLoad((query = {}) => {
+	if (query.doc_type) docType.value = query.doc_type
+	if (query.status !== undefined && query.status !== '') currentStatus.value = Number(query.status)
+})
+
+onShow(() => {
+	refresh()
+	loadDictionaries()
+})
+
+onReachBottom(() => {
+	if (finished.value || loading.value) return
+	loadMore()
+})
+
+async function refresh() {
+	page.value = 1
+	finished.value = false
+	list.value = []
+	await loadPage()
+}
+
+async function loadMore() {
+	page.value += 1
+	await loadPage()
+}
+
+async function loadPage() {
+	loading.value = true
+	try {
+		const data = await fetchDocs({
+			page: page.value,
+			pageSize: PAGE_SIZE,
+			docType: docType.value,
+			status: currentStatus.value,
+			keyword: keyword.value.trim(),
+			warehouseId: warehouseId.value
+		})
+		const rows = data.list || []
+		list.value = page.value === 1 ? rows : [...list.value, ...rows]
+		total.value = data.total || 0
+		finished.value = list.value.length >= total.value
+	} catch (e) {
+		if (page.value > 1) page.value -= 1
+		uni.showToast({ title: '加载失败', icon: 'none' })
+	} finally {
+		loading.value = false
+	}
+}
+
+async function loadDictionaries() {
+	try {
+		const [types, houses] = await Promise.all([fetchDocTypes(), fetchWarehouses({ onlyEnabled: true })])
+		docTypes.value = types
+		warehouses.value = houses
+	} catch (e) {
+		// 字典失败不影响列表，筛选降级为「全部」
+	}
+}
+
+function describeType(item) {
+	const parts = []
+	parts.push(item.partner_type === 'supplier' ? '供应商' : item.partner_type === 'customer' ? '客户' : '内部')
+	parts.push(item.affects_stock ? '动库存' : '不动库存')
+	return parts.join(' · ')
+}
+
+function clearKeyword() {
+	keyword.value = ''
+	refresh()
+}
+
+function onTabChange(value) {
+	if (currentStatus.value === value) return
+	currentStatus.value = value
+	refresh()
+}
+
+function onTypeSelect(opt) {
+	docType.value = opt.value
+	refresh()
+}
+
+function onWarehouseSelect(opt) {
+	warehouseId.value = opt.value
+	refresh()
+}
+
+function openWarehousePicker() {
+	warehousePicker.value = true
+}
+
+function openDetail(row) {
+	uni.navigateTo({ url: `/pages/erp/document/detail?id=${row.id}` })
+}
+
+function openCreate() {
+	const query = docType.value ? `?doc_type=${docType.value}` : ''
+	uni.navigateTo({ url: `/pages/erp/document/edit${query}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: calc(160rpx + env(safe-area-inset-bottom));
+}
+
+.filter-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	background: $color-bg-page;
+	padding: 20rpx $page-padding-x 8rpx;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.search-clear {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.chip-row {
+	display: flex;
+	gap: 16rpx;
+	margin-top: 16rpx;
+}
+
+.chip {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	padding: 10rpx 22rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	box-shadow: $shadow-card;
+	font-size: 24rpx;
+	color: $color-text-secondary;
+	max-width: 46%;
+
+	text {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+}
+
+.tab-scroll {
+	margin-top: 16rpx;
+	white-space: nowrap;
+}
+
+.tab-list {
+	display: inline-flex;
+	gap: 16rpx;
+	padding: 4rpx 0 12rpx;
+}
+
+.tab-item {
+	padding: 10rpx 28rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 26rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+		font-weight: 500;
+	}
+}
+
+.doc-card {
+	@include card;
+	margin: 0 $page-padding-x 24rpx;
+	padding: 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.card-top {
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+	gap: 16rpx;
+}
+
+.card-title {
+	flex: 1;
+	min-width: 0;
+}
+
+.card-type {
+	display: block;
+	font-size: 30rpx;
+	font-weight: 600;
+	color: $color-text;
+}
+
+.card-no {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.card-partner {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	margin-top: 16rpx;
+	font-size: 25rpx;
+	color: $color-text-secondary;
+}
+
+.card-amounts {
+	display: flex;
+	margin-top: 18rpx;
+	padding-top: 18rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.amount-item {
+	flex: 1;
+}
+
+.amount-label {
+	display: block;
+	font-size: 21rpx;
+	color: $color-text-muted;
+}
+
+.amount-value {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 26rpx;
+	color: $color-text;
+	font-weight: 500;
+}
+
+.card-remark {
+	margin-top: 14rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+	line-height: 1.5;
+}
+
+.state-box {
+	display: flex;
+	justify-content: center;
+	padding: 140rpx 0;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+
+.load-done {
+	display: flex;
+	justify-content: center;
+	padding: 8rpx 0 24rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.fab {
+	position: fixed;
+	left: 50%;
+	transform: translateX(-50%);
+	bottom: calc(48rpx + env(safe-area-inset-bottom));
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	height: 88rpx;
+	padding: 0 48rpx;
+	border-radius: $radius-full;
+	background: #2563eb;
+	color: #ffffff;
+	font-size: 28rpx;
+	font-weight: 500;
+	box-shadow: 0 8rpx 24rpx rgba(37, 99, 235, 0.4);
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+</style>
diff --git a/uniapp/pages/erp/finance/bill-detail.vue b/uniapp/pages/erp/finance/bill-detail.vue
new file mode 100644
index 0000000..859e94c
--- /dev/null
+++ b/uniapp/pages/erp/finance/bill-detail.vue
@@ -0,0 +1,454 @@
+<template>
+	<view v-if="bill" class="page">
+		<view class="hero">
+			<view class="hero-top">
+				<text class="hero-partner">{{ bill.partner_name }}</text>
+				<u-tag :text="bill.status_label" :type="statusType" size="mini" />
+			</view>
+			<text class="hero-label">{{ billTypeText }}金额</text>
+			<text class="hero-amount">¥{{ moneyText(bill.amount) }}</text>
+			<view class="hero-grid">
+				<view class="hero-cell">
+					<text class="hero-cell-label">已核销</text>
+					<text class="hero-cell-value">¥{{ moneyText(bill.settled_amount) }}</text>
+				</view>
+				<view class="hero-cell">
+					<text class="hero-cell-label">未{{ bill.bill_type === 1 ? '收' : '付' }}</text>
+					<text class="hero-cell-value strong">¥{{ moneyText(balance) }}</text>
+				</view>
+				<view class="hero-cell">
+					<text class="hero-cell-label">{{ progressText }}</text>
+					<text class="hero-cell-value">{{ progressPercent }}%</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="blk">
+			<view class="blk-head">
+				<text class="blk-title">账单信息</text>
+			</view>
+			<view class="kv">
+				<text class="kv-label">账单编号</text>
+				<text class="kv-value">{{ bill.id }}</text>
+			</view>
+			<view class="kv">
+				<text class="kv-label">来源单据</text>
+				<text class="kv-value link" @tap="openDoc">{{ bill.source_doc_no || '手工账单' }}</text>
+			</view>
+			<view class="kv">
+				<text class="kv-label">账单日期</text>
+				<text class="kv-value">{{ bill.bill_date || '—' }}</text>
+			</view>
+			<view class="kv">
+				<text class="kv-label">账期到期</text>
+				<text class="kv-value">
+					{{ bill.due_date || '未设账期' }}
+					<text v-if="bill.overdue_days > 0" class="kv-warn">（已逾期 {{ bill.overdue_days }} 天）</text>
+				</text>
+			</view>
+			<view v-if="bill.remark" class="kv">
+				<text class="kv-label">备注</text>
+				<text class="kv-value">{{ bill.remark }}</text>
+			</view>
+		</view>
+
+		<view class="blk">
+			<view class="blk-head">
+				<text class="blk-title">核销记录</text>
+				<text class="blk-count">{{ settles.length }} 笔</text>
+			</view>
+			<view v-if="!settles.length" class="blk-empty">
+				<text>尚未核销，登记{{ bill.bill_type === 1 ? '收款' : '付款' }}后自动冲抵</text>
+			</view>
+			<view v-for="s in settles" :key="s.id" class="st-row" @tap="openFund(s)">
+				<view class="st-icon">
+					<FaIcon
+						:name="fundOf(s) && fundOf(s).fund_type <= 2 ? 'money-bill-transfer' : 'wallet'"
+						color="#2563eb"
+						:size="15"
+					/>
+				</view>
+				<view class="st-main">
+					<text class="st-title">{{ (fundOf(s) || {}).fund_no || s.partner_bill_no || '核销记录' }}</text>
+					<text class="st-sub">{{ dayText(s.create_time) }}<text v-if="fundOf(s)"> · {{ fundMethodText(s) }}</text></text>
+				</view>
+				<text class="st-amount">¥{{ moneyText(s.amount) }}</text>
+			</view>
+		</view>
+
+		<view v-if="docItems.length" class="blk">
+			<view class="blk-head">
+				<text class="blk-title">来源单据明细</text>
+				<text class="blk-count">{{ docItems.length }} 行</text>
+			</view>
+			<view v-for="it in docItems" :key="it.id" class="di-row">
+				<view class="di-main">
+					<text class="di-name">{{ it.product_name }}</text>
+					<text class="di-sub">{{ [it.product_code, it.spec].filter(Boolean).join(' · ') }}</text>
+				</view>
+				<view class="di-right">
+					<text class="di-amount">¥{{ moneyText(it.amount) }}</text>
+					<text class="di-qty">{{ qtyText(it.quantity) }} {{ it.unit || '' }} × ¥{{ moneyText(it.unit_price) }}</text>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="balance > 0.005" class="footer">
+			<u-button
+				type="primary"
+				color="#2563eb"
+				shape="circle"
+				:text="`登记${bill.bill_type === 1 ? '收款' : '付款'}冲抵`"
+				@click="goSettle"
+			/>
+		</view>
+	</view>
+
+	<view v-else class="page">
+		<view v-if="loading" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else class="state-box">
+			<u-empty text="账单不存在或已删除" mode="data" />
+		</view>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 往来账单详情：核销进度、逐笔核销来源、关联的收付款单与原始单据明细。
+ * funds 是后端按核销记录聚合出来的收付款单字典，核销行靠 fund_bill_id 反查单号与方式。
+ */
+import { computed, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import { billStatusType, dayText, fundMethodLabel, getBill, moneyText, qtyText } from '@/api/erp.js'
+
+const bill = ref(null)
+const settles = ref([])
+const funds = ref([])
+const docItems = ref([])
+const balance = ref(0)
+const loading = ref(true)
+
+const billTypeText = computed(() => (bill.value && bill.value.bill_type === 1 ? '应收' : '应付'))
+const statusType = computed(() => billStatusType((bill.value || {}).status))
+const progressPercent = computed(() => {
+	const amount = Number((bill.value || {}).amount || 0)
+	if (!amount) return 0
+	return Math.min(100, Math.round((Number(bill.value.settled_amount || 0) / amount) * 100))
+})
+const progressText = computed(() => (progressPercent.value >= 100 ? '已结清' : '已核销比例'))
+
+onLoad(async (query = {}) => {
+	const id = Number(query.id || 0)
+	try {
+		if (id) {
+			const data = await getBill(id)
+			if (data) {
+				bill.value = data.bill
+				settles.value = data.settles || []
+				funds.value = data.funds || []
+				docItems.value = data.docItems || []
+				balance.value = Number(data.bill.balance || 0)
+			}
+		}
+	} finally {
+		loading.value = false
+	}
+	uni.setNavigationBarTitle({ title: billTypeText.value + '详情' })
+})
+
+function fundOf(s) {
+	return funds.value.find((f) => Number(f.id) === Number(s.fund_bill_id))
+}
+
+function fundMethodText(s) {
+	const f = fundOf(s)
+	return f ? fundMethodLabel(f.pay_method) : ''
+}
+
+function openDoc() {
+	if (!bill.value.source_doc_id) return
+	uni.navigateTo({ url: `/pages/erp/document/detail?id=${bill.value.source_doc_id}` })
+}
+
+function openFund(s) {
+	const f = fundOf(s)
+	if (!f) return
+	uni.navigateTo({ url: `/pages/erp/finance/fund-edit?id=${f.id}` })
+}
+
+function goSettle() {
+	const q = `fund_type=${bill.value.bill_type}&partner_id=${bill.value.partner_id}&partner_name=${encodeURIComponent(
+		bill.value.partner_name || ''
+	)}&bill_id=${bill.value.id}`
+	uni.navigateTo({ url: `/pages/erp/finance/fund-edit?${q}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 160rpx;
+}
+
+.hero {
+	margin: 24rpx $page-padding-x 0;
+	padding: 32rpx 32rpx 28rpx;
+	border-radius: $radius-lg;
+	background: $hero-gradient;
+	color: #ffffff;
+	box-shadow: $shadow-card;
+}
+
+.hero-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 16rpx;
+}
+
+.hero-partner {
+	flex: 1;
+	min-width: 0;
+	font-size: 30rpx;
+	font-weight: 600;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.hero-label {
+	display: block;
+	margin-top: 22rpx;
+	font-size: 22rpx;
+	opacity: 0.85;
+}
+
+.hero-amount {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 52rpx;
+	font-weight: 600;
+	line-height: 1.2;
+}
+
+.hero-grid {
+	display: flex;
+	margin-top: 24rpx;
+	padding-top: 20rpx;
+	border-top: 1rpx solid rgba(255, 255, 255, 0.25);
+}
+
+.hero-cell {
+	flex: 1;
+	min-width: 0;
+
+	.hero-cell-label {
+		display: block;
+		font-size: 21rpx;
+		opacity: 0.85;
+	}
+
+	.hero-cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 26rpx;
+		font-weight: 500;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		&.strong {
+			font-weight: 600;
+		}
+	}
+}
+
+.blk {
+	@include card;
+	margin: 20rpx $page-padding-x 0;
+	padding: 24rpx 28rpx;
+}
+
+.blk-head {
+	@include block-head;
+}
+
+.blk-title {
+	@include section-title;
+}
+
+.blk-count {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.blk-empty {
+	padding: 20rpx 0 8rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+	line-height: 1.6;
+}
+
+.kv {
+	display: flex;
+	gap: 20rpx;
+	padding: 14rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:last-child {
+		border-bottom: none;
+		padding-bottom: 4rpx;
+	}
+
+	.kv-label {
+		width: 150rpx;
+		flex-shrink: 0;
+		font-size: 25rpx;
+		color: $color-text-muted;
+	}
+
+	.kv-value {
+		flex: 1;
+		min-width: 0;
+		font-size: 26rpx;
+		color: $color-text;
+		word-break: break-all;
+
+		&.link {
+			color: $color-primary;
+		}
+	}
+
+	.kv-warn {
+		color: $color-danger;
+		font-size: 23rpx;
+	}
+}
+
+.st-row {
+	display: flex;
+	align-items: center;
+	gap: 18rpx;
+	padding: 18rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:last-child {
+		border-bottom: none;
+	}
+}
+
+.st-icon {
+	@include icon-box(60rpx);
+}
+
+.st-main {
+	flex: 1;
+	min-width: 0;
+
+	.st-title {
+		display: block;
+		font-size: 27rpx;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.st-sub {
+		display: block;
+		margin-top: 4rpx;
+		font-size: 22rpx;
+		color: $color-text-muted;
+	}
+}
+
+.st-amount {
+	flex-shrink: 0;
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #16a34a;
+}
+
+.di-row {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 20rpx;
+	padding: 16rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:last-child {
+		border-bottom: none;
+		padding-bottom: 4rpx;
+	}
+}
+
+.di-main {
+	flex: 1;
+	min-width: 0;
+
+	.di-name {
+		display: block;
+		font-size: 27rpx;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.di-sub {
+		display: block;
+		margin-top: 4rpx;
+		font-size: 22rpx;
+		color: $color-text-muted;
+	}
+}
+
+.di-right {
+	flex-shrink: 0;
+	text-align: right;
+
+	.di-amount {
+		display: block;
+		font-size: 27rpx;
+		font-weight: 600;
+		color: $color-text;
+	}
+
+	.di-qty {
+		display: block;
+		margin-top: 4rpx;
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+}
+
+.footer {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 20rpx $page-padding-x calc(20rpx + env(safe-area-inset-bottom));
+	background: $color-card;
+	box-shadow: $shadow-float;
+	@include dialog-responsive;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 200rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/pages/erp/finance/bill.vue b/uniapp/pages/erp/finance/bill.vue
new file mode 100644
index 0000000..8aed51f
--- /dev/null
+++ b/uniapp/pages/erp/finance/bill.vue
@@ -0,0 +1,524 @@
+<template>
+	<view class="page">
+		<view class="tab-bar">
+			<view
+				v-for="bt in BILL_TYPES"
+				:key="bt.value"
+				class="tab"
+				:class="{ active: billType === bt.value }"
+				@tap="switchType(bt.value)"
+			>
+				<text class="tab-label">{{ bt.label }}</text>
+				<text class="tab-sum">未{{ bt.value === 1 ? '收' : '付' }} ¥{{ moneyText(openOf(bt.value)) }}</text>
+			</view>
+		</view>
+
+		<view class="filter-bar">
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					placeholder="搜索客商 / 单据号"
+					confirm-type="search"
+					@confirm="refresh"
+				/>
+				<text v-if="keyword" class="search-clear" @tap="clearKeyword">清空</text>
+			</view>
+			<view class="chip-row">
+				<view
+					v-for="opt in STATE_OPTIONS"
+					:key="opt.value || 'all'"
+					class="chip"
+					:class="{ active: settleState === opt.value }"
+					@tap="onState(opt.value)"
+				>
+					<text>{{ opt.label }}</text>
+				</view>
+			</view>
+			<view class="date-row">
+				<picker mode="date" :value="dateFrom" @change="onDate('from', $event)">
+					<view class="date-cell">
+						<FaIcon name="calendar-days" color="#94a3b8" :size="14" />
+						<text>{{ dateFrom || '开始日期' }}</text>
+					</view>
+				</picker>
+				<text class="date-sep">至</text>
+				<picker mode="date" :value="dateTo" @change="onDate('to', $event)">
+					<view class="date-cell">
+						<FaIcon name="calendar-days" color="#94a3b8" :size="14" />
+						<text>{{ dateTo || '结束日期' }}</text>
+					</view>
+				</picker>
+				<text v-if="dateFrom || dateTo" class="date-clear" @tap="clearDates">重置</text>
+			</view>
+		</view>
+
+		<view class="sum-bar">
+			<text class="sum-item">共 {{ total }} 张账单</text>
+			<text v-if="partnerName" class="sum-item" @tap="clearPartner">已筛「{{ partnerName }}」×</text>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="search" :text="`没有${billTypeLabel}账单`" />
+		</view>
+		<template v-else>
+			<view v-for="row in list" :key="row.id" class="f-card" @tap="openBill(row)">
+				<view class="f-top">
+					<text class="f-partner">{{ row.partner_name }}</text>
+					<u-tag :text="row.status_label" :type="row.status === 2 ? 'success' : row.status === 1 ? 'primary' : 'warning'" size="mini" />
+				</view>
+				<text class="f-sub">{{ row.source_doc_no || '手工账单' }} · {{ row.bill_date }}</text>
+				<view class="f-amounts">
+					<view class="f-cell">
+						<text class="cell-label">{{ billType === 1 ? '应收' : '应付' }}</text>
+						<text class="cell-value">¥{{ moneyText(row.amount) }}</text>
+					</view>
+					<view class="f-cell">
+						<text class="cell-label">已核销</text>
+						<text class="cell-value">¥{{ moneyText(row.settled_amount) }}</text>
+					</view>
+					<view class="f-cell">
+						<text class="cell-label">{{ billType === 1 ? '未收' : '未付' }}</text>
+						<text class="cell-value open">¥{{ moneyText(row.balance) }}</text>
+					</view>
+				</view>
+				<view class="f-foot">
+					<text class="foot-due">{{ row.due_date ? `到期 ${row.due_date}` : '未设账期' }}</text>
+					<text v-if="row.overdue_days > 0" class="foot-over">逾期 {{ row.overdue_days }} 天</text>
+					<text v-else-if="row.status !== 2" class="foot-ok">账期内</text>
+				</view>
+			</view>
+			<view v-if="finished" class="load-done">
+				<text>{{ list.length ? '没有更多了' : '' }}</text>
+			</view>
+		</template>
+
+		<view class="fab" @tap="goFund">
+			<FaIcon name="money-bill-wave" color="#ffffff" :size="18" />
+			<text>{{ billType === 1 ? '登记收款' : '登记付款' }}</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 应收应付账单列表。
+ * 「未收/未付合计」用的是接口随列表返回的全量汇总，不是本页累加，翻页也不会跳数。
+ */
+import { computed, ref } from 'vue'
+import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import { BILL_TYPES, SETTLE_STATES, fetchBills, moneyText } from '@/api/erp.js'
+
+const PAGE_SIZE = 20
+
+const STATE_OPTIONS = [{ value: '', label: '全部' }, ...SETTLE_STATES]
+
+const list = ref([])
+const total = ref(0)
+const page = ref(1)
+const loading = ref(false)
+const finished = ref(false)
+const billType = ref(1)
+const partnerId = ref('')
+const partnerName = ref('')
+const keyword = ref('')
+const settleState = ref('')
+const dateFrom = ref('')
+const dateTo = ref('')
+const summary = ref({ openReceivable: 0, openPayable: 0 })
+
+const billTypeLabel = computed(() => (billType.value === 1 ? '应收' : '应付'))
+
+onLoad((query = {}) => {
+	if (query.bill_type) billType.value = Number(query.bill_type) === 2 ? 2 : 1
+	if (query.partner_id) {
+		partnerId.value = String(query.partner_id)
+		partnerName.value = decodeURIComponent(query.partner_name || '')
+	}
+	if (query.settle_state) settleState.value = String(query.settle_state)
+})
+
+onShow(() => refresh())
+
+onReachBottom(() => {
+	if (finished.value || loading.value) return
+	loadMore()
+})
+
+function openOf(type) {
+	return type === 1 ? summary.value.openReceivable : summary.value.openPayable
+}
+
+async function refresh() {
+	page.value = 1
+	finished.value = false
+	list.value = []
+	await loadPage()
+}
+
+async function loadMore() {
+	page.value += 1
+	await loadPage()
+}
+
+async function loadPage() {
+	loading.value = true
+	try {
+		const data = await fetchBills({
+			page: page.value,
+			pageSize: PAGE_SIZE,
+			billType: billType.value,
+			partnerId: partnerId.value,
+			partnerType: billType.value === 1 ? 'customer' : 'supplier',
+			settleState: settleState.value,
+			keyword: keyword.value.trim(),
+			dateFrom: dateFrom.value,
+			dateTo: dateTo.value
+		})
+		const rows = data.list || []
+		list.value = page.value === 1 ? rows : [...list.value, ...rows]
+		total.value = data.total || 0
+		summary.value = data.summary || summary.value
+		finished.value = list.value.length >= total.value
+	} catch (e) {
+		if (page.value > 1) page.value -= 1
+	} finally {
+		loading.value = false
+	}
+}
+
+function switchType(value) {
+	if (billType.value === value) return
+	billType.value = value
+	// 应收只看客户、应付只看供应商，跨类型带的客商筛选必须一起清掉
+	partnerId.value = ''
+	partnerName.value = ''
+	refresh()
+}
+
+function clearPartner() {
+	partnerId.value = ''
+	partnerName.value = ''
+	refresh()
+}
+
+function clearKeyword() {
+	keyword.value = ''
+	refresh()
+}
+
+function onState(value) {
+	if (settleState.value === value) return
+	settleState.value = value
+	refresh()
+}
+
+function onDate(key, e) {
+	const val = e.detail.value
+	if (key === 'from') dateFrom.value = val
+	else dateTo.value = val
+	if (dateFrom.value && dateTo.value && dateFrom.value > dateTo.value) dateFrom.value = dateTo.value
+	refresh()
+}
+
+function clearDates() {
+	dateFrom.value = ''
+	dateTo.value = ''
+	refresh()
+}
+
+function openBill(row) {
+	uni.navigateTo({ url: `/pages/erp/finance/bill-detail?id=${row.id}` })
+}
+
+function goFund() {
+	const q = `fund_type=${billType.value}${partnerId.value ? `&partner_id=${partnerId.value}&partner_name=${encodeURIComponent(partnerName.value)}` : ''}`
+	uni.navigateTo({ url: `/pages/erp/finance/fund-edit?${q}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 160rpx;
+}
+
+.tab-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	display: flex;
+	background: $color-card;
+	box-shadow: $shadow-header;
+}
+
+.tab {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	gap: 6rpx;
+	padding: 22rpx 0 18rpx;
+	position: relative;
+
+	.tab-label {
+		font-size: 27rpx;
+		color: $color-text-muted;
+	}
+
+	.tab-sum {
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+
+	&.active {
+		.tab-label {
+			color: $color-primary;
+			font-weight: 600;
+		}
+
+		.tab-sum {
+			color: $color-primary-dark;
+		}
+
+		&::after {
+			content: '';
+			position: absolute;
+			bottom: 0;
+			left: 50%;
+			width: 60rpx;
+			height: 6rpx;
+			margin-left: -30rpx;
+			border-radius: 3rpx;
+			background: $color-primary;
+		}
+	}
+}
+
+.filter-bar {
+	padding: 20rpx $page-padding-x 8rpx;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.search-clear {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.chip-row {
+	display: flex;
+	gap: 14rpx;
+	margin-top: 18rpx;
+}
+
+.chip {
+	padding: 10rpx 22rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 23rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+	}
+}
+
+.date-row {
+	display: flex;
+	align-items: center;
+	gap: 14rpx;
+	margin-top: 16rpx;
+}
+
+.date-cell {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	height: 56rpx;
+	padding: 0 20rpx;
+	border-radius: $radius-md;
+	background: $color-card;
+	font-size: 23rpx;
+	color: $color-text-secondary;
+}
+
+.date-sep {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.date-clear {
+	font-size: 23rpx;
+	color: $color-primary;
+}
+
+.sum-bar {
+	display: flex;
+	justify-content: space-between;
+	margin: 6rpx $page-padding-x 16rpx;
+	padding: 0 8rpx;
+}
+
+.sum-item {
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.f-card {
+	@include card;
+	margin: 0 $page-padding-x 20rpx;
+	padding: 24rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.f-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 12rpx;
+}
+
+.f-partner {
+	flex: 1;
+	min-width: 0;
+	font-size: 29rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.f-sub {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.f-amounts {
+	display: flex;
+	gap: 12rpx;
+	margin-top: 18rpx;
+	padding-top: 16rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.f-cell {
+	flex: 1;
+	min-width: 0;
+
+	.cell-label {
+		display: block;
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 26rpx;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		&.open {
+			font-weight: 600;
+			color: $color-danger;
+		}
+	}
+}
+
+.f-foot {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-top: 14rpx;
+	font-size: 22rpx;
+}
+
+.foot-due {
+	color: $color-text-muted;
+}
+
+.foot-over {
+	color: $color-danger;
+	font-weight: 500;
+}
+
+.foot-ok {
+	color: #16a34a;
+}
+
+.load-done {
+	display: flex;
+	justify-content: center;
+	padding: 8rpx 0 24rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+
+.fab {
+	position: fixed;
+	left: 50%;
+	transform: translateX(-50%);
+	bottom: calc(48rpx + env(safe-area-inset-bottom));
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	height: 84rpx;
+	padding: 0 44rpx;
+	border-radius: $radius-full;
+	background: #2563eb;
+	color: #ffffff;
+	font-size: 27rpx;
+	font-weight: 500;
+	box-shadow: 0 8rpx 24rpx rgba(37, 99, 235, 0.4);
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+</style>
diff --git a/uniapp/pages/erp/finance/fund-edit.vue b/uniapp/pages/erp/finance/fund-edit.vue
new file mode 100644
index 0000000..3ad602c
--- /dev/null
+++ b/uniapp/pages/erp/finance/fund-edit.vue
@@ -0,0 +1,782 @@
+<template>
+	<view class="page">
+		<view v-if="fundNo" class="no-bar">
+			<text class="no-text">单号 {{ fundNo }}</text>
+			<u-tag :text="fundStatusLabel(status)" :type="fundStatusType(status)" size="mini" />
+		</view>
+
+		<!-- 单据信息 -->
+		<view class="form-card">
+			<view class="field">
+				<text class="field-label">款项类型 <text class="required">*</text></text>
+				<view v-if="editable" class="type-grid">
+					<view
+						v-for="ft in FUND_TYPES"
+						:key="ft.value"
+						class="type-cell"
+						:class="{ active: form.fundType === ft.value }"
+						@tap="onType(ft.value)"
+					>
+						<text>{{ ft.label }}</text>
+					</view>
+				</view>
+				<text v-else class="field-value">{{ typeLabel }}</text>
+			</view>
+
+			<view class="field">
+				<text class="field-label">业务日期 <text class="required">*</text></text>
+				<picker v-if="editable" mode="date" :value="form.bizDate" @change="onDate">
+					<view class="picker-value">
+						<text>{{ form.bizDate }}</text>
+						<FaIcon name="calendar-days" color="#909399" :size="16" />
+					</view>
+				</picker>
+				<text v-else class="field-value">{{ form.bizDate }}</text>
+			</view>
+
+			<view class="field">
+				<text class="field-label">
+					往来单位<text v-if="needPartner" class="required">*</text>
+				</text>
+				<view v-if="editable" class="picker-value" @tap="openPartner">
+					<text :class="{ placeholder: !form.partnerName }">{{ form.partnerName || chooseText }}</text>
+					<FaIcon name="chevron-right" color="#909399" :size="16" />
+				</view>
+				<text v-else class="field-value">{{ form.partnerName || '—' }}</text>
+			</view>
+
+			<view class="field">
+				<text class="field-label">金额 <text class="required">*</text></text>
+				<view class="amount-box">
+					<text class="amount-sign" :class="income ? 'sign-in' : 'sign-out'">{{ income ? '+' : '-' }}</text>
+					<input
+						v-if="editable"
+						v-model="form.amount"
+						class="amount-input"
+						type="digit"
+						placeholder="0.00"
+					/>
+					<text v-else class="field-value">¥{{ moneyText(form.amount) }}</text>
+				</view>
+			</view>
+
+			<view class="field">
+				<text class="field-label">结算方式</text>
+				<view v-if="editable" class="chip-line">
+					<view
+						v-for="m in FUND_METHODS"
+						:key="m.value"
+						class="mini-chip"
+						:class="{ active: form.payMethod === m.value }"
+						@tap="form.payMethod = m.value"
+					>
+						<text>{{ m.label }}</text>
+					</view>
+				</view>
+				<text v-else class="field-value">{{ fundMethodLabel(form.payMethod) }}</text>
+			</view>
+
+			<view v-if="editable || form.payAccount" class="field">
+				<text class="field-label">收付账户</text>
+				<u-input
+					v-if="editable"
+					v-model="form.payAccount"
+					placeholder="账号 / 商户主体（选填）"
+					:maxlength="100"
+					border="none"
+				/>
+				<text v-else class="field-value">{{ form.payAccount }}</text>
+			</view>
+
+			<view v-if="editable || form.remark" class="field">
+				<text class="field-label">备注</text>
+				<u-textarea
+					v-if="editable"
+					v-model="form.remark"
+					placeholder="付款事由、凭证号等（选填）"
+					:maxlength="200"
+					height="80"
+					border="none"
+				/>
+				<text v-else class="field-value">{{ form.remark }}</text>
+			</view>
+		</view>
+
+		<!-- 核销：收款/付款 + 已选往来单位时才出现 -->
+		<view v-if="showSettle" class="settle-card">
+			<view class="settle-head">
+				<text class="settle-title">核销往来账</text>
+				<text class="settle-sum">已选 ¥{{ moneyText(pickedSum) }} / {{ moneyText(form.amount) }}</text>
+			</view>
+			<text class="settle-tip">
+				{{ bills.length
+					? '不勾选则确认时按到期日从早到晚自动冲抵'
+					: needPartner && !form.partnerId
+						? '选择往来单位后显示其未结账单'
+						: '该往来单位没有未结账单，确认后只记资金流水' }}
+			</text>
+
+			<view v-if="billsLoading" class="settle-loading">
+				<text>正在拉取待核销账单...</text>
+			</view>
+			<view v-for="b in bills" :key="b.id" class="bill-row">
+				<view class="bill-check" :class="{ on: isPicked(b.id) }" @tap="toggleBill(b)">
+					<FaIcon v-if="isPicked(b.id)" name="check" color="#ffffff" :size="12" />
+				</view>
+				<view class="bill-main">
+					<text class="bill-no">{{ b.source_doc_no || `账单#${b.id}` }}</text>
+					<text class="bill-sub">
+						{{ dayText(b.bill_date) }}{{ b.due_date ? ` · 到期 ${dayText(b.due_date)}` : '' }} · 未结 ¥{{ moneyText(b.balance) }}
+					</text>
+				</view>
+				<input
+					v-if="isPicked(b.id)"
+					v-model="picked[b.id]"
+					class="bill-input"
+					type="digit"
+					:placeholder="String(b.balance)"
+				/>
+				<text v-else class="bill-balance">¥{{ moneyText(b.balance) }}</text>
+			</view>
+
+			<view v-if="bills.length" class="settle-foot">
+				<text class="foot-link" @tap="pickAll">全部冲抵</text>
+				<text v-if="pickedCount" class="foot-link" @tap="clearPicks">清空（{{ pickedCount }}）</text>
+			</view>
+		</view>
+
+		<view class="footer">
+			<template v-if="editable">
+				<view class="btn-line">
+					<u-button
+						type="primary"
+						color="#2563eb"
+						shape="circle"
+						:loading="saving"
+						loading-text="保存中..."
+						text="保存草稿"
+						@click="onSave(false)"
+					/>
+				</view>
+				<view class="btn-line gap">
+					<u-button
+						type="primary"
+						color="#16a34a"
+						shape="circle"
+						:loading="saving"
+						loading-text="确认中..."
+						:text="`确认${typeLabel}`"
+						@click="onSave(true)"
+					/>
+				</view>
+				<view v-if="fundId" class="del-line" @tap="onDelete">
+					<text>删除草稿</text>
+				</view>
+			</template>
+			<template v-else>
+				<view v-if="status === 1" class="btn-line">
+					<u-button type="error" plain shape="circle" text="作废此单" @click="onVoid" />
+				</view>
+				<view v-if="settles.length" class="view-settles">
+					<text class="vs-title">核销记录</text>
+					<view v-for="s in settles" :key="s.id" class="vs-row">
+						<text class="vs-no">{{ s.partner_bill_no || `账单#${s.partner_bill_id}` }}</text>
+						<text class="vs-amount">¥{{ moneyText(s.amount) }}</text>
+					</view>
+				</view>
+			</template>
+		</view>
+
+		<ErpPicker
+			:show="picker.show"
+			:title="partnerTitle"
+			placeholder="搜索客商"
+			:options="picker.options"
+			:model-value="form.partnerId"
+			remote
+			:loading="picker.loading"
+			:tip="picker.tip"
+			@update:show="picker.show = false"
+			@search="loadPartners"
+			@select="onPartner"
+		/>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 收付款开单 / 查看。
+ * 草稿只是登记，确认那一刻后端才写核销明细并回写往来账余额；
+ * 已确认的单不可改，只能作废（余额同步回滚），所以 view 模式复用同一张表单只读渲染。
+ */
+import { computed, reactive, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import ErpPicker from '@/components/erp/ErpPicker.vue'
+import {
+	FUND_METHODS,
+	FUND_TYPES,
+	confirmFund,
+	dayText,
+	deleteFund,
+	fetchOpenBills,
+	fetchPartners,
+	fundMethodLabel,
+	fundStatusLabel,
+	fundStatusType,
+	getFund,
+	moneyText,
+	saveFund,
+	voidFund
+} from '@/api/erp.js'
+
+function today() {
+	const d = new Date()
+	const p = (n) => String(n).padStart(2, '0')
+	return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`
+}
+
+const fundId = ref(0)
+const fundNo = ref('')
+const status = ref(0)
+const saving = ref(false)
+const bills = ref([])
+const billsLoading = ref(false)
+const settles = ref([])
+const picked = reactive({})
+
+const form = reactive({
+	fundType: 1,
+	bizDate: today(),
+	partnerId: 0,
+	partnerName: '',
+	amount: '',
+	payMethod: 'cash',
+	payAccount: '',
+	remark: ''
+})
+
+const picker = reactive({ show: false, options: [], loading: false, tip: '' })
+
+const editable = computed(() => !fundId.value || status.value === 0)
+const typeLabel = computed(() => (FUND_TYPES.find((t) => Number(t.value) === Number(form.fundType)) || {}).label || '收付款')
+const needPartner = computed(() => Number(form.fundType) === 1 || Number(form.fundType) === 2)
+const income = computed(() => Number(form.fundType) === 1 || Number(form.fundType) === 3)
+const showSettle = computed(() => editable.value && needPartner.value)
+const partnerTitle = computed(() => (Number(form.fundType) === 2 ? '选择供应商' : '选择客户'))
+const chooseText = computed(() => (Number(form.fundType) === 2 ? '选择供应商' : '选择客户'))
+
+const pickedCount = computed(() => Object.keys(picked).filter((k) => isPicked(k)).length)
+const pickedSum = computed(() =>
+	Object.keys(picked).reduce((sum, k) => (isPicked(k) ? sum + (Number(picked[k]) || 0) : sum), 0)
+)
+
+onLoad(async (query = {}) => {
+	if (query.fund_type) form.fundType = Number(query.fund_type)
+	if (query.biz_date) form.bizDate = String(query.biz_date)
+	if (query.partner_id) {
+		form.partnerId = Number(query.partner_id)
+		form.partnerName = decodeURIComponent(query.partner_name || '')
+	}
+	if (query.id) {
+		await loadFund(Number(query.id))
+	} else if (needPartner.value && form.partnerId) {
+		// 从账单详情跳过来时把这张账单预勾选，金额默认取未结额
+		await loadBills(Number(query.bill_id || 0))
+	}
+})
+
+async function loadFund(id) {
+	const data = await getFund(id)
+	if (!data || !data.fund) {
+		uni.showToast({ title: '收付款单不存在', icon: 'none' })
+		setTimeout(() => uni.navigateBack(), 600)
+		return
+	}
+	const f = data.fund
+	fundId.value = f.id
+	fundNo.value = f.fund_no
+	status.value = Number(f.status || 0)
+	form.fundType = Number(f.fund_type)
+	form.bizDate = f.biz_date || today()
+	form.partnerId = Number(f.partner_id || 0)
+	form.partnerName = f.partner_name || ''
+	form.amount = String(f.amount ?? '')
+	form.payMethod = f.pay_method || 'cash'
+	form.payAccount = f.pay_account || ''
+	form.remark = f.remark || ''
+	settles.value = data.settles || []
+	uni.setNavigationBarTitle({ title: fundStatusLabel(status.value) === '草稿' ? '编辑收付款' : '收付款详情' })
+}
+
+async function onType(value) {
+	if (Number(form.fundType) === Number(value)) return
+	form.fundType = Number(value)
+	// 收款只核客户应收、付款只核供应商应付，切换后原往来单位与勾选一并作废
+	form.partnerId = 0
+	form.partnerName = ''
+	clearPicks()
+	bills.value = []
+}
+
+function onDate(e) {
+	form.bizDate = e.detail.value
+}
+
+function openPartner() {
+	picker.show = true
+	loadPartners('')
+}
+
+async function loadPartners(keyword) {
+	picker.loading = true
+	try {
+		const partnerType = Number(form.fundType) === 2 ? 'supplier' : 'customer'
+		const { list, total } = await fetchPartners({ partnerType, keyword, onlyEnabled: true, pageSize: 50 })
+		picker.options = list.map((p) => ({
+			value: p.partner_id,
+			label: p.partner_name,
+			sub: [p.contact_person, p.contact_phone].filter(Boolean).join(' · '),
+			extra: Number(p.open_amount) > 0 ? `未结 ¥${moneyText(p.open_amount)}` : ''
+		}))
+		picker.tip = total > list.length ? `共 ${total} 家，输入关键字继续找` : ''
+	} finally {
+		picker.loading = false
+	}
+}
+
+async function onPartner(opt) {
+	picker.show = false
+	form.partnerId = Number(opt.value)
+	form.partnerName = opt.label
+	clearPicks()
+	await loadBills(0)
+}
+
+async function loadBills(presetBillId) {
+	if (!needPartner.value || !form.partnerId) return
+	billsLoading.value = true
+	try {
+		bills.value = await fetchOpenBills(form.fundType, form.partnerId)
+		if (presetBillId) {
+			const hit = bills.value.find((b) => Number(b.id) === Number(presetBillId))
+			if (hit) {
+				picked[hit.id] = String(hit.balance)
+				if (!Number(form.amount)) form.amount = String(hit.balance)
+			}
+		}
+	} finally {
+		billsLoading.value = false
+	}
+}
+
+function isPicked(id) {
+	return picked[id] !== undefined
+}
+
+function toggleBill(b) {
+	if (isPicked(b.id)) delete picked[b.id]
+	else picked[b.id] = String(b.balance)
+}
+
+function pickAll() {
+	bills.value.forEach((b) => {
+		picked[b.id] = String(b.balance)
+	})
+	const sum = bills.value.reduce((acc, b) => acc + Number(b.balance || 0), 0)
+	if (!Number(form.amount)) form.amount = String(Math.round(sum * 100) / 100)
+}
+
+function clearPicks() {
+	Object.keys(picked).forEach((k) => delete picked[k])
+}
+
+function checkForm() {
+	if (!(Number(form.amount) > 0)) return '金额必须大于 0'
+	if (needPartner.value && !form.partnerId) return `请选择${Number(form.fundType) === 2 ? '供应商' : '客户'}`
+	if (pickedSum.value > Number(form.amount) + 0.005) {
+		return `核销合计 ¥${moneyText(pickedSum.value)} 不能大于收付金额`
+	}
+	return ''
+}
+
+async function onSave(confirm) {
+	const msg = checkForm()
+	if (msg) {
+		uni.showToast({ title: msg, icon: 'none' })
+		return
+	}
+	saving.value = true
+	try {
+		const res = await saveFund({
+			id: fundId.value,
+			fundType: form.fundType,
+			bizDate: form.bizDate,
+			partnerId: form.partnerId,
+			amount: Number(form.amount),
+			payMethod: form.payMethod,
+			payAccount: form.payAccount,
+			remark: form.remark
+		})
+		const id = res.id || fundId.value
+		if (confirm) {
+			const lines = Object.keys(picked)
+				.filter((k) => isPicked(k) && Number(picked[k]) > 0)
+				.map((k) => ({ partnerBillId: Number(k), amount: Number(picked[k]) }))
+			await confirmFund(id, lines)
+			uni.showToast({ title: `已确认${typeLabel.value}`, icon: 'success' })
+		} else {
+			fundId.value = id
+			uni.showToast({ title: '草稿已保存', icon: 'success' })
+		}
+		setTimeout(() => back(), 600)
+	} finally {
+		saving.value = false
+	}
+}
+
+function onVoid() {
+	uni.showModal({
+		title: '作废收付款单',
+		content: '作废后已核销的往来账余额会同步回滚，确定继续？',
+		confirmColor: '#f56c6c',
+		success: async (res) => {
+			if (!res.confirm) return
+			await voidFund(fundId.value)
+			uni.showToast({ title: '已作废', icon: 'success' })
+			setTimeout(() => back(), 600)
+		}
+	})
+}
+
+async function onDelete() {
+	uni.showModal({
+		title: '删除草稿',
+		content: `确定删除「${fundNo.value || typeLabel.value}」这张草稿？`,
+		confirmColor: '#f56c6c',
+		success: async (res) => {
+			if (!res.confirm) return
+			await deleteFund(fundId.value)
+			uni.showToast({ title: '已删除', icon: 'success' })
+			setTimeout(() => back(), 600)
+		}
+	})
+}
+
+/** 列表页跳来的栈可能是账单详情，优先回到它的来源列表 */
+function back() {
+	const pages = getCurrentPages()
+	if (pages.length > 1) uni.navigateBack()
+	else uni.redirectTo({ url: '/pages/erp/finance/fund' })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding: 24rpx $page-padding-x 40rpx;
+}
+
+.no-bar {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 8rpx 20rpx;
+
+	.no-text {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.form-card {
+	@include card;
+	padding: 8rpx 28rpx;
+}
+
+.field {
+	padding: 24rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:last-child {
+		border-bottom: none;
+	}
+
+	.field-label {
+		display: block;
+		margin-bottom: 14rpx;
+		font-size: 26rpx;
+		color: $color-text-secondary;
+	}
+
+	.field-value {
+		display: block;
+		font-size: 28rpx;
+		color: $color-text;
+		line-height: 1.6;
+		word-break: break-all;
+	}
+}
+
+.required {
+	color: $color-danger;
+}
+
+.picker-value {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 12rpx;
+	font-size: 28rpx;
+	color: $color-text;
+
+	.placeholder {
+		color: $color-text-muted;
+	}
+}
+
+.type-grid {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 16rpx;
+}
+
+.type-cell {
+	flex: 1;
+	min-width: 140rpx;
+	height: 68rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: $radius-md;
+	background: #f1f5f9;
+	font-size: 25rpx;
+	color: $color-text-secondary;
+
+	&.active {
+		background: $color-primary-bg;
+		color: $color-primary-dark;
+		font-weight: 600;
+	}
+}
+
+.amount-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+}
+
+.amount-sign {
+	font-size: 34rpx;
+	font-weight: 600;
+
+	&.sign-in {
+		color: #16a34a;
+	}
+
+	&.sign-out {
+		color: $color-danger;
+	}
+}
+
+.amount-input {
+	flex: 1;
+	font-size: 40rpx;
+	font-weight: 600;
+	color: $color-text;
+}
+
+.chip-line {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 16rpx;
+}
+
+.mini-chip {
+	padding: 10rpx 26rpx;
+	border-radius: $radius-full;
+	background: #f1f5f9;
+	font-size: 24rpx;
+	color: $color-text-secondary;
+
+	&.active {
+		background: $color-primary-bg;
+		color: $color-primary-dark;
+		font-weight: 500;
+	}
+}
+
+.settle-card {
+	@include card;
+	margin-top: 24rpx;
+	padding: 26rpx 28rpx;
+}
+
+.settle-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 16rpx;
+}
+
+.settle-title {
+	@include section-title;
+}
+
+.settle-sum {
+	font-size: 23rpx;
+	color: $color-primary;
+}
+
+.settle-tip {
+	display: block;
+	margin-top: 10rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+	line-height: 1.5;
+}
+
+.settle-loading {
+	padding: 24rpx 0;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.bill-row {
+	display: flex;
+	align-items: center;
+	gap: 16rpx;
+	padding: 20rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+}
+
+.bill-check {
+	width: 40rpx;
+	height: 40rpx;
+	flex-shrink: 0;
+	border-radius: $radius-sm;
+	border: 2rpx solid #cbd5e1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	&.on {
+		background: $color-primary;
+		border-color: $color-primary;
+	}
+}
+
+.bill-main {
+	flex: 1;
+	min-width: 0;
+
+	.bill-no {
+		display: block;
+		font-size: 26rpx;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.bill-sub {
+		display: block;
+		margin-top: 4rpx;
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+}
+
+.bill-input {
+	width: 160rpx;
+	flex-shrink: 0;
+	height: 60rpx;
+	padding: 0 16rpx;
+	border-radius: $radius-sm;
+	background: #f1f5f9;
+	font-size: 25rpx;
+	color: $color-text;
+	text-align: right;
+}
+
+.bill-balance {
+	flex-shrink: 0;
+	font-size: 25rpx;
+	color: $color-text-secondary;
+}
+
+.settle-foot {
+	display: flex;
+	gap: 32rpx;
+	padding-top: 18rpx;
+}
+
+.foot-link {
+	font-size: 24rpx;
+	color: $color-primary;
+}
+
+.footer {
+	margin-top: 32rpx;
+}
+
+.btn-line {
+	&.gap {
+		margin-top: 20rpx;
+	}
+}
+
+.del-line {
+	display: flex;
+	justify-content: center;
+	padding: 26rpx 0 6rpx;
+	font-size: 24rpx;
+	color: $color-danger;
+}
+
+.view-settles {
+	margin-top: 32rpx;
+	@include card;
+	padding: 24rpx 28rpx;
+
+	.vs-title {
+		display: block;
+		margin-bottom: 8rpx;
+		font-size: 28rpx;
+		font-weight: 600;
+		color: $color-text;
+	}
+}
+
+.vs-row {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 16rpx;
+	padding: 16rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:last-child {
+		border-bottom: none;
+	}
+
+	.vs-no {
+		flex: 1;
+		min-width: 0;
+		font-size: 25rpx;
+		color: $color-text-secondary;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.vs-amount {
+		font-size: 26rpx;
+		font-weight: 600;
+		color: #16a34a;
+	}
+}
+</style>
diff --git a/uniapp/pages/erp/finance/fund.vue b/uniapp/pages/erp/finance/fund.vue
new file mode 100644
index 0000000..c5abeed
--- /dev/null
+++ b/uniapp/pages/erp/finance/fund.vue
@@ -0,0 +1,520 @@
+<template>
+	<view class="page">
+		<view class="tab-bar">
+			<scroll-view class="tab-scroll" scroll-x :show-scrollbar="false">
+				<view class="tab-list">
+					<view
+						v-for="ft in TYPE_TABS"
+						:key="ft.value || 'all'"
+						class="tab"
+						:class="{ active: fundType === ft.value }"
+						@tap="switchType(ft.value)"
+					>
+						<text>{{ ft.label }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="filter-bar">
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					placeholder="搜索单号 / 往来单位"
+					confirm-type="search"
+					@confirm="refresh"
+				/>
+				<text v-if="keyword" class="search-clear" @tap="clearKeyword">清空</text>
+			</view>
+			<view class="chip-row">
+				<view
+					v-for="opt in STATUS_OPTIONS"
+					:key="String(opt.value)"
+					class="chip"
+					:class="{ active: status === opt.value }"
+					@tap="onStatus(opt.value)"
+				>
+					<text>{{ opt.label }}</text>
+				</view>
+			</view>
+			<view class="date-row">
+				<picker mode="date" :value="dateFrom" @change="onDate('from', $event)">
+					<view class="date-cell">
+						<FaIcon name="calendar-days" color="#94a3b8" :size="14" />
+						<text>{{ dateFrom || '开始日期' }}</text>
+					</view>
+				</picker>
+				<text class="date-sep">至</text>
+				<picker mode="date" :value="dateTo" @change="onDate('to', $event)">
+					<view class="date-cell">
+						<FaIcon name="calendar-days" color="#94a3b8" :size="14" />
+						<text>{{ dateTo || '结束日期' }}</text>
+					</view>
+				</picker>
+				<text v-if="dateFrom || dateTo" class="date-clear" @tap="clearDates">重置</text>
+			</view>
+		</view>
+
+		<view class="sum-bar">
+			<text class="sum-item">共 {{ total }} 张单据</text>
+			<text class="sum-item">本页 {{ sumText }}</text>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="search" text="没有收付款单" />
+		</view>
+		<template v-else>
+			<view v-for="row in list" :key="row.id" class="d-card" @tap="openFund(row)">
+				<view class="d-icon" :class="incomeOf(row.fund_type) ? 'icon-in' : 'icon-out'">
+					<FaIcon
+						:name="incomeOf(row.fund_type) ? 'arrow-down-long' : 'arrow-up-long'"
+						:color="incomeOf(row.fund_type) ? '#16a34a' : '#ef4444'"
+						:size="15"
+					/>
+				</view>
+				<view class="d-main">
+					<view class="d-line">
+						<text class="d-partner">{{ row.partner_name || typeLabelOf(row.fund_type) }}</text>
+						<u-tag :text="fundStatusLabel(row.status)" :type="fundStatusType(row.status)" size="mini" />
+					</view>
+					<text class="d-sub">
+						{{ row.fund_no }} · {{ typeLabelOf(row.fund_type) }} · {{ fundMethodLabel(row.pay_method) }}
+					</text>
+					<text v-if="row.status === 0" class="d-draft">草稿未核销，确认后才冲抵往来账</text>
+				</view>
+				<view class="d-right">
+					<text class="d-amount" :class="incomeOf(row.fund_type) ? 'amt-in' : 'amt-out'">
+						{{ incomeOf(row.fund_type) ? '+' : '-' }}¥{{ moneyText(row.amount) }}
+					</text>
+					<text class="d-date">{{ row.biz_date }}</text>
+				</view>
+			</view>
+			<view v-if="finished" class="load-done">
+				<text>{{ list.length ? '没有更多了' : '' }}</text>
+			</view>
+		</template>
+
+		<view class="fab" @tap="createFund">
+			<FaIcon name="plus" color="#ffffff" :size="18" />
+			<text>登记收付款</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 收付款单列表。四类单据共用一页，靠 fund_type 分流。
+ * 草稿只登记不核销，确认后后端才写核销明细并回写往来账余额。
+ */
+import { computed, ref } from 'vue'
+import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import { FUND_STATUS_OPTIONS, FUND_TYPES, fetchFunds, fundMethodLabel, fundStatusLabel, fundStatusType, moneyText } from '@/api/erp.js'
+
+const PAGE_SIZE = 20
+
+const TYPE_TABS = [{ value: '', label: '全部' }, ...FUND_TYPES]
+const STATUS_OPTIONS = [{ value: '', label: '全部状态' }, ...FUND_STATUS_OPTIONS]
+
+const list = ref([])
+const total = ref(0)
+const page = ref(1)
+const loading = ref(false)
+const finished = ref(false)
+const fundType = ref('')
+const status = ref('')
+const keyword = ref('')
+const dateFrom = ref('')
+const dateTo = ref('')
+/** 从客商页带过来时只看这一家的收付款 */
+const partnerScope = ref('')
+
+const sumText = computed(() => {
+	const sum = list.value.reduce((acc, r) => acc + (Number(r.amount) || 0), 0)
+	return `合计 ¥${moneyText(sum)}`
+})
+
+onLoad((query = {}) => {
+	if (query.fund_type) fundType.value = String(query.fund_type)
+	if (query.status) status.value = String(query.status)
+	if (query.partner_id) partnerScope.value = String(query.partner_id)
+})
+
+onShow(() => refresh())
+
+onReachBottom(() => {
+	if (finished.value || loading.value) return
+	loadMore()
+})
+
+function incomeOf(type) {
+	return Number(type) === 1 || Number(type) === 3
+}
+
+function typeLabelOf(type) {
+	return (FUND_TYPES.find((t) => Number(t.value) === Number(type)) || {}).label || '收付款'
+}
+
+async function refresh() {
+	page.value = 1
+	finished.value = false
+	list.value = []
+	await loadPage()
+}
+
+async function loadMore() {
+	page.value += 1
+	await loadPage()
+}
+
+async function loadPage() {
+	loading.value = true
+	try {
+		const data = await fetchFunds({
+			page: page.value,
+			pageSize: PAGE_SIZE,
+			fundType: fundType.value,
+			status: status.value,
+			partnerId: partnerScope.value,
+			keyword: keyword.value.trim(),
+			dateFrom: dateFrom.value,
+			dateTo: dateTo.value
+		})
+		const rows = data.list || []
+		list.value = page.value === 1 ? rows : [...list.value, ...rows]
+		total.value = data.total || 0
+		finished.value = list.value.length >= total.value
+	} catch (e) {
+		if (page.value > 1) page.value -= 1
+	} finally {
+		loading.value = false
+	}
+}
+
+function switchType(value) {
+	if (fundType.value === value) return
+	fundType.value = value
+	refresh()
+}
+
+function onStatus(value) {
+	if (status.value === value) return
+	status.value = value
+	refresh()
+}
+
+function clearKeyword() {
+	keyword.value = ''
+	refresh()
+}
+
+function onDate(key, e) {
+	const val = e.detail.value
+	if (key === 'from') dateFrom.value = val
+	else dateTo.value = val
+	if (dateFrom.value && dateTo.value && dateFrom.value > dateTo.value) dateFrom.value = dateTo.value
+	refresh()
+}
+
+function clearDates() {
+	dateFrom.value = ''
+	dateTo.value = ''
+	refresh()
+}
+
+function openFund(row) {
+	uni.navigateTo({ url: `/pages/erp/finance/fund-edit?id=${row.id}` })
+}
+
+function createFund() {
+	uni.navigateTo({ url: `/pages/erp/finance/fund-edit${fundType.value ? `?fund_type=${fundType.value}` : ''}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 160rpx;
+}
+
+.tab-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	background: $color-card;
+	box-shadow: $shadow-header;
+}
+
+.tab-scroll {
+	white-space: nowrap;
+	box-sizing: border-box;
+}
+
+.tab-list {
+	display: inline-flex;
+	padding: 0 12rpx;
+}
+
+.tab {
+	padding: 26rpx 28rpx 22rpx;
+	position: relative;
+
+	text {
+		font-size: 26rpx;
+		color: $color-text-muted;
+	}
+
+	&.active {
+		text {
+			color: $color-primary;
+			font-weight: 600;
+		}
+
+		&::after {
+			content: '';
+			position: absolute;
+			bottom: 6rpx;
+			left: 50%;
+			width: 40rpx;
+			height: 6rpx;
+			margin-left: -20rpx;
+			border-radius: 3rpx;
+			background: $color-primary;
+		}
+	}
+}
+
+.filter-bar {
+	padding: 20rpx $page-padding-x 8rpx;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.search-clear {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.chip-row {
+	display: flex;
+	gap: 14rpx;
+	margin-top: 18rpx;
+	flex-wrap: wrap;
+}
+
+.chip {
+	padding: 10rpx 22rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 23rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+	}
+}
+
+.date-row {
+	display: flex;
+	align-items: center;
+	gap: 14rpx;
+	margin-top: 16rpx;
+}
+
+.date-cell {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	height: 56rpx;
+	padding: 0 20rpx;
+	border-radius: $radius-md;
+	background: $color-card;
+	font-size: 23rpx;
+	color: $color-text-secondary;
+}
+
+.date-sep {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.date-clear {
+	font-size: 23rpx;
+	color: $color-primary;
+}
+
+.sum-bar {
+	display: flex;
+	justify-content: space-between;
+	margin: 6rpx $page-padding-x 16rpx;
+	padding: 0 8rpx;
+}
+
+.sum-item {
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.d-card {
+	display: flex;
+	align-items: center;
+	gap: 18rpx;
+	@include card;
+	margin: 0 $page-padding-x 20rpx;
+	padding: 24rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.d-icon {
+	width: 64rpx;
+	height: 64rpx;
+	border-radius: $radius-md;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+
+	&.icon-in {
+		background: rgba(22, 163, 74, 0.1);
+	}
+
+	&.icon-out {
+		background: rgba(239, 68, 68, 0.1);
+	}
+}
+
+.d-main {
+	flex: 1;
+	min-width: 0;
+}
+
+.d-line {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+}
+
+.d-partner {
+	flex: 1;
+	min-width: 0;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.d-sub {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.d-draft {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 21rpx;
+	color: #f59e0b;
+}
+
+.d-right {
+	flex-shrink: 0;
+	text-align: right;
+}
+
+.d-amount {
+	display: block;
+	font-size: 30rpx;
+	font-weight: 600;
+
+	&.amt-in {
+		color: #16a34a;
+	}
+
+	&.amt-out {
+		color: $color-text;
+	}
+}
+
+.d-date {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 21rpx;
+	color: $color-text-muted;
+}
+
+.load-done {
+	display: flex;
+	justify-content: center;
+	padding: 8rpx 0 24rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+
+.fab {
+	position: fixed;
+	left: 50%;
+	transform: translateX(-50%);
+	bottom: calc(48rpx + env(safe-area-inset-bottom));
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	height: 84rpx;
+	padding: 0 44rpx;
+	border-radius: $radius-full;
+	background: #2563eb;
+	color: #ffffff;
+	font-size: 27rpx;
+	font-weight: 500;
+	box-shadow: 0 8rpx 24rpx rgba(37, 99, 235, 0.4);
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+</style>
diff --git a/uniapp/pages/erp/partner/detail.vue b/uniapp/pages/erp/partner/detail.vue
new file mode 100644
index 0000000..e6fa54c
--- /dev/null
+++ b/uniapp/pages/erp/partner/detail.vue
@@ -0,0 +1,408 @@
+<template>
+	<view class="page">
+		<view v-if="loading && !profile" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+
+		<block v-else-if="profile">
+			<view class="hero">
+				<view class="hero-top">
+					<text class="hero-name">{{ name }}</text>
+					<u-tag :text="partnerTypeLabel(partnerType)" type="primary" size="mini" />
+				</view>
+				<text class="hero-sub">{{ [profile.contact_person, profile.contact_phone].filter(Boolean).join(' · ') || '未填联系人' }}</text>
+				<view class="hero-grid">
+					<view class="hero-cell">
+						<text class="cell-label">{{ isSupplier ? '未付应付' : '未收应收' }}</text>
+						<text class="cell-value owe">¥{{ moneyText(openAmount) }}</text>
+					</view>
+					<view class="hero-cell">
+						<text class="cell-label">{{ isSupplier ? '累计应付' : '累计应收' }}</text>
+						<text class="cell-value">¥{{ moneyText(totalAmount) }}</text>
+					</view>
+					<view class="hero-cell">
+						<text class="cell-label">账期</text>
+						<text class="cell-value">{{ Number(profile.payment_days) > 0 ? profile.payment_days + ' 天' : '现结' }}</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="card">
+				<view class="block-head">
+					<text class="block-title">基础资料</text>
+				</view>
+				<view class="line">
+					<text class="line-label">等级 / 类型</text>
+					<text class="line-value">{{ join([profile.supplier_level || profile.customer_level, profile.supplier_type || profile.customer_type]) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">联系电话</text>
+					<text class="line-value link" @tap="callPhone">{{ dash(profile.contact_phone) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">邮箱</text>
+					<text class="line-value">{{ dash(profile.contact_email) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">地址</text>
+					<text class="line-value">{{ dash(profile.address) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">开票抬头</text>
+					<text class="line-value">{{ join([profile.invoice_title, profile.tax_number]) }}</text>
+				</view>
+				<view class="line">
+					<text class="line-label">收款账户</text>
+					<text class="line-value">{{ join([profile.bank_name, profile.bank_account]) }}</text>
+				</view>
+				<view v-if="Number(profile.credit_limit) > 0" class="line">
+					<text class="line-label">信用额度</text>
+					<text class="line-value">¥{{ moneyText(profile.credit_limit) }}</text>
+				</view>
+			</view>
+
+			<view class="card">
+				<view class="block-head">
+					<text class="block-title">未结账单（{{ bills.length }} 张）</text>
+					<text class="block-tip" @tap="goAllBills">全部 {{ billTotal }} 张</text>
+				</view>
+				<view v-if="!bills.length" class="empty-line">
+					<text>没有未结账单</text>
+				</view>
+				<view v-for="b in bills" :key="b.id" class="line tap" @tap="goBill(b)">
+					<view class="line-label grow">
+						<text>{{ b.source_doc_no || `账单#${b.id}` }}</text>
+						<text class="sub">{{ b.bill_date }}{{ b.due_date ? ' · 到期 ' + b.due_date : '' }}</text>
+					</view>
+					<view class="line-value right">
+						<text class="bal">¥{{ moneyText(b.balance) }}</text>
+						<text v-if="b.overdue_days > 0" class="over">逾期 {{ b.overdue_days }} 天</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="footer-space"></view>
+
+			<view class="actions">
+				<view class="act" @tap="goDocs">
+					<text>历史单据</text>
+				</view>
+				<view class="act primary" @tap="goFund">
+					<text>{{ isSupplier ? '去付款' : '去收款' }}</text>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 客商详情：档案 + 未结账单 + 一键收付款。
+ * 余额口径直接取往来账（bill）与对账汇总，和 Web 端「应收应付」页一致，
+ * 端上不另算一套，避免业务在手机上看到的欠款跟财务对不上。
+ */
+import { computed, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import {
+	fetchBills,
+	fetchPartnerSummary,
+	getPartner,
+	moneyText,
+	partnerTypeLabel
+} from '@/api/erp.js'
+
+const profile = ref(null)
+const bills = ref([])
+const billTotal = ref(0)
+const summary = ref({})
+const loading = ref(false)
+const partnerId = ref(0)
+const partnerType = ref('customer')
+
+const isSupplier = computed(() => partnerType.value === 'supplier')
+const name = computed(() => {
+	const p = profile.value || {}
+	return p.supplier_name || p.customer_name || p.name || '未命名客商'
+})
+const openAmount = computed(() => {
+	const s = summary.value || {}
+	return Number(isSupplier.value ? s.pay_open : s.recv_open) || 0
+})
+const totalAmount = computed(() => {
+	const s = summary.value || {}
+	return Number(isSupplier.value ? s.pay_total : s.recv_total) || 0
+})
+
+onLoad(async (query = {}) => {
+	partnerId.value = Number(query.id) || 0
+	partnerType.value = String(query.partner_type) === 'supplier' ? 'supplier' : 'customer'
+	uni.setNavigationBarTitle({ title: partnerTypeLabel(partnerType.value) })
+	await load()
+})
+
+async function load() {
+	if (!partnerId.value) {
+		uni.showToast({ title: '缺少客商 ID', icon: 'none' })
+		return
+	}
+	loading.value = true
+	try {
+		const [p, b, rows] = await Promise.all([
+			getPartner(partnerId.value, partnerType.value),
+			fetchBills({ partnerId: partnerId.value, partnerType: partnerType.value, settleState: 'open', pageSize: 10 }),
+			fetchPartnerSummary(partnerType.value)
+		])
+		profile.value = p
+		bills.value = b.list || []
+		billTotal.value = b.total || 0
+		// 对账汇总按 partner_type:id 归并，这里只取当前这一家
+		summary.value = rows.find((r) => Number(r.partner_id) === partnerId.value) || {}
+	} catch (e) {
+		uni.showToast({ title: '客商信息加载失败', icon: 'none' })
+	} finally {
+		loading.value = false
+	}
+}
+
+function goFund() {
+	const fundType = isSupplier.value ? 2 : 1
+	uni.navigateTo({
+		url: `/pages/erp/finance/fund-edit?fund_type=${fundType}&partner_id=${partnerId.value}&partner_name=${encodeURIComponent(name.value)}`
+	})
+}
+
+function goDocs() {
+	uni.navigateTo({ url: `/pages/erp/document/index?partner_id=${partnerId.value}` })
+}
+
+function goAllBills() {
+	const billType = isSupplier.value ? 2 : 1
+	uni.navigateTo({ url: `/pages/erp/finance/bill?bill_type=${billType}&partner_id=${partnerId.value}` })
+}
+
+function goBill(bill) {
+	uni.navigateTo({ url: `/pages/erp/finance/bill-detail?id=${bill.id}` })
+}
+
+function callPhone() {
+	const phone = String(profile.value?.contact_phone || '').trim()
+	if (!phone) return
+	uni.makePhoneCall({ phoneNumber: phone, fail: () => {} })
+}
+
+function dash(v) {
+	const s = String(v ?? '').trim()
+	return s || '—'
+}
+
+function join(arr) {
+	const s = (arr || []).filter(Boolean).join(' / ')
+	return s || '—'
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-top: 20rpx;
+}
+
+.hero {
+	margin: 0 $page-padding-x 24rpx;
+	padding: 32rpx;
+	border-radius: $radius-lg;
+	background: $hero-gradient;
+	color: #ffffff;
+	box-shadow: $shadow-float;
+}
+
+.hero-top {
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+	gap: 16rpx;
+}
+
+.hero-name {
+	flex: 1;
+	font-size: 36rpx;
+	font-weight: 600;
+	line-height: 1.4;
+}
+
+.hero-sub {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 24rpx;
+	opacity: 0.85;
+}
+
+.hero-grid {
+	display: flex;
+	margin-top: 28rpx;
+	padding-top: 22rpx;
+	border-top: 1rpx solid rgba(255, 255, 255, 0.22);
+}
+
+.hero-cell {
+	flex: 1;
+
+	.cell-label {
+		display: block;
+		font-size: 22rpx;
+		opacity: 0.8;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 28rpx;
+		font-weight: 500;
+
+		&.owe {
+			color: #fecaca;
+		}
+	}
+}
+
+.card {
+	@include card;
+	margin: 0 $page-padding-x 24rpx;
+	padding: 24rpx 28rpx;
+}
+
+.block-head {
+	@include block-head;
+}
+
+.block-title {
+	@include section-title;
+}
+
+.block-tip {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.line {
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+	gap: 20rpx;
+	padding: 16rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+	font-size: 26rpx;
+
+	&:last-child {
+		border-bottom: none;
+	}
+
+	&.tap:active {
+		opacity: 0.7;
+	}
+}
+
+.line-label {
+	color: $color-text-secondary;
+	flex-shrink: 0;
+
+	&.grow {
+		flex: 1;
+		min-width: 0;
+	}
+}
+
+.sub {
+	display: block;
+	margin-top: 4rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.line-value {
+	flex: 1;
+	text-align: right;
+	color: $color-text;
+	word-break: break-all;
+
+	&.link {
+		color: $color-primary;
+	}
+}
+
+.right {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+	gap: 4rpx;
+}
+
+.bal {
+	font-size: 27rpx;
+	font-weight: 500;
+	color: #dc2626;
+}
+
+.over {
+	font-size: 21rpx;
+	color: #f59e0b;
+}
+
+.empty-line {
+	padding: 40rpx 0;
+	text-align: center;
+	font-size: 25rpx;
+	color: $color-text-muted;
+}
+
+.footer-space {
+	height: calc(150rpx + env(safe-area-inset-bottom));
+}
+
+.actions {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	gap: 16rpx;
+	padding: 18rpx $page-padding-x calc(18rpx + env(safe-area-inset-bottom));
+	background: $color-card;
+	box-shadow: 0 -4rpx 16rpx rgba(15, 23, 42, 0.06);
+	@include dialog-responsive;
+}
+
+.act {
+	flex: 1;
+	height: 76rpx;
+	line-height: 76rpx;
+	text-align: center;
+	border-radius: $radius-full;
+	background: $color-bg-page;
+	font-size: 26rpx;
+	color: $color-text-secondary;
+
+	&.primary {
+		background: #2563eb;
+		color: #ffffff;
+	}
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.state-box {
+	display: flex;
+	justify-content: center;
+	padding: 140rpx 0;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/pages/erp/partner/index.vue b/uniapp/pages/erp/partner/index.vue
new file mode 100644
index 0000000..d908933
--- /dev/null
+++ b/uniapp/pages/erp/partner/index.vue
@@ -0,0 +1,320 @@
+<template>
+	<view class="page">
+		<view class="filter-bar">
+			<view class="type-row">
+				<view
+					v-for="t in PARTNER_TYPES"
+					:key="t.value"
+					class="type-item"
+					:class="{ active: partnerType === t.value }"
+					@tap="switchType(t.value)"
+				>
+					<text>{{ t.label }}</text>
+				</view>
+			</view>
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					:placeholder="`搜索${partnerTypeLabel(partnerType)}名称`"
+					confirm-type="search"
+					@confirm="refresh"
+				/>
+				<text v-if="keyword" class="search-clear" @tap="clearKeyword">清空</text>
+			</view>
+			<view class="sum-row">
+				<text class="sum-item">共 {{ total }} 家</text>
+				<text class="sum-item">未结合计 ¥{{ moneyText(openTotal) }}</text>
+			</view>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="search" :text="`没有匹配的${partnerTypeLabel(partnerType)}`" />
+			<text class="state-tip">客商建档请在 Web 后台 CRM / 进销存里完成</text>
+		</view>
+		<template v-else>
+			<view v-for="row in list" :key="row.partner_id" class="p-card" @tap="openDetail(row)">
+				<view class="p-top">
+					<text class="p-name">{{ row.partner_name }}</text>
+					<text class="p-open" :class="{ owe: Number(row.open_amount) > 0 }">
+						{{ Number(row.open_amount) > 0 ? `未结 ¥${moneyText(row.open_amount)}` : '已结清' }}
+					</text>
+				</view>
+				<view class="p-meta">
+					<text v-if="row.contact_person">{{ row.contact_person }} {{ row.contact_phone || '' }}</text>
+					<text v-if="row.level">等级 {{ row.level }}</text>
+					<text v-if="Number(row.payment_days) > 0">账期 {{ row.payment_days }} 天</text>
+					<text v-if="Number(row.credit_limit) > 0">信用额 ¥{{ moneyText(row.credit_limit) }}</text>
+				</view>
+			</view>
+			<view v-if="finished" class="load-done">
+				<text>{{ list.length ? '没有更多了' : '' }}</text>
+			</view>
+		</template>
+
+		<view class="fab" @tap="goBills">
+			<FaIcon name="receipt" color="#ffffff" :size="20" />
+			<text>{{ partnerType === 'supplier' ? '应付账单' : '应收账单' }}</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 客商列表（供应商 / 客户同一个页，靠 partner_type 分流）。
+ * 与后端 partner/list 一致：只列正式启用、有归属的对象，公海客户不参与开单也不在这里出现。
+ */
+import { computed, ref } from 'vue'
+import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import { PARTNER_TYPES, fetchPartners, moneyText, partnerTypeLabel } from '@/api/erp.js'
+
+const PAGE_SIZE = 20
+
+const list = ref([])
+const total = ref(0)
+const page = ref(1)
+const loading = ref(false)
+const finished = ref(false)
+const keyword = ref('')
+const partnerType = ref('customer')
+
+const openTotal = computed(() => list.value.reduce((sum, r) => sum + Number(r.open_amount || 0), 0))
+
+onLoad((query = {}) => {
+	if (query.partner_type) partnerType.value = String(query.partner_type) === 'supplier' ? 'supplier' : 'customer'
+})
+
+onShow(() => {
+	refresh()
+})
+
+onReachBottom(() => {
+	if (finished.value || loading.value) return
+	loadMore()
+})
+
+function switchType(value) {
+	if (partnerType.value === value) return
+	partnerType.value = value
+	list.value = []
+	refresh()
+	uni.setNavigationBarTitle({ title: partnerTypeLabel(value) })
+}
+
+async function refresh() {
+	page.value = 1
+	finished.value = false
+	list.value = []
+	await loadPage()
+}
+
+async function loadMore() {
+	page.value += 1
+	await loadPage()
+}
+
+async function loadPage() {
+	loading.value = true
+	try {
+		const data = await fetchPartners({
+			page: page.value,
+			pageSize: PAGE_SIZE,
+			partnerType: partnerType.value,
+			keyword: keyword.value.trim()
+		})
+		const rows = data.list || []
+		list.value = page.value === 1 ? rows : [...list.value, ...rows]
+		total.value = data.total || 0
+		finished.value = list.value.length >= total.value
+	} catch (e) {
+		if (page.value > 1) page.value -= 1
+	} finally {
+		loading.value = false
+	}
+}
+
+function clearKeyword() {
+	keyword.value = ''
+	refresh()
+}
+
+function openDetail(row) {
+	uni.navigateTo({
+		url: `/pages/erp/partner/detail?id=${row.partner_id}&partner_type=${partnerType.value}`
+	})
+}
+
+function goBills() {
+	uni.navigateTo({
+		url: `/pages/erp/finance/bill?bill_type=${partnerType.value === 'supplier' ? 2 : 1}`
+	})
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: calc(160rpx + env(safe-area-inset-bottom));
+}
+
+.filter-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	background: $color-bg-page;
+	padding: 20rpx $page-padding-x 8rpx;
+}
+
+.type-row {
+	display: flex;
+	gap: 16rpx;
+	margin-bottom: 18rpx;
+}
+
+.type-item {
+	padding: 10rpx 32rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 26rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+		font-weight: 500;
+	}
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.search-clear {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.sum-row {
+	display: flex;
+	justify-content: space-between;
+	padding: 16rpx 8rpx 4rpx;
+}
+
+.sum-item {
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.p-card {
+	@include card;
+	margin: 0 $page-padding-x 20rpx;
+	padding: 24rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.p-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 16rpx;
+}
+
+.p-name {
+	flex: 1;
+	font-size: 29rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.p-open {
+	flex-shrink: 0;
+	font-size: 25rpx;
+	color: $color-text-muted;
+
+	&.owe {
+		color: #dc2626;
+		font-weight: 500;
+	}
+}
+
+.p-meta {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 8rpx 24rpx;
+	margin-top: 10rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.load-done {
+	display: flex;
+	justify-content: center;
+	padding: 8rpx 0 24rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text,
+.state-tip {
+	font-size: 26rpx;
+	color: $color-text-muted;
+	margin-top: 16rpx;
+}
+
+.fab {
+	position: fixed;
+	left: 50%;
+	transform: translateX(-50%);
+	bottom: calc(48rpx + env(safe-area-inset-bottom));
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	height: 84rpx;
+	padding: 0 44rpx;
+	border-radius: $radius-full;
+	background: #2563eb;
+	color: #ffffff;
+	font-size: 27rpx;
+	font-weight: 500;
+	box-shadow: 0 8rpx 24rpx rgba(37, 99, 235, 0.4);
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+</style>
diff --git a/uniapp/pages/erp/report/index.vue b/uniapp/pages/erp/report/index.vue
new file mode 100644
index 0000000..df97bdf
--- /dev/null
+++ b/uniapp/pages/erp/report/index.vue
@@ -0,0 +1,1112 @@
+<template>
+	<view class="page">
+		<view class="tab-bar">
+			<scroll-view class="tab-scroll" scroll-x :show-scrollbar="false">
+				<view class="tab-list">
+					<view
+						v-for="t in TABS"
+						:key="t.key"
+						class="tab"
+						:class="{ active: tab === t.key }"
+						@tap="switchTab(t.key)"
+					>
+						<text>{{ t.label }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="filter-bar">
+			<view class="date-row">
+				<picker mode="date" :value="dateFrom" @change="onDate('from', $event)">
+					<view class="date-cell">
+						<FaIcon name="calendar-days" color="#94a3b8" :size="14" />
+						<text>{{ dateFrom || '开始日期' }}</text>
+					</view>
+				</picker>
+				<text class="date-sep">至</text>
+				<picker mode="date" :value="dateTo" @change="onDate('to', $event)">
+					<view class="date-cell">
+						<FaIcon name="calendar-days" color="#94a3b8" :size="14" />
+						<text>{{ dateTo || '结束日期' }}</text>
+					</view>
+				</picker>
+				<text class="quick" @tap="useQuick">近30天</text>
+			</view>
+
+			<!-- 购销汇总：方向 + 维度 -->
+			<view v-if="tab === 'summary'" class="chip-row">
+				<view
+					v-for="s in SIDES"
+					:key="s.value"
+					class="chip"
+					:class="{ active: side === s.value }"
+					@tap="onSide(s.value)"
+				>
+					<text>{{ s.label }}</text>
+				</view>
+				<view class="chip ghost" @tap="openDimension">
+					<text>{{ dimensionLabel }}</text>
+					<FaIcon name="chevron-down" color="#94a3b8" :size="11" />
+				</view>
+			</view>
+
+			<!-- 排行：榜单方向 + 条数 -->
+			<view v-else-if="tab === 'rank'" class="chip-row">
+				<view class="chip" :class="{ active: order === 'desc' }" @tap="onOrder('desc')">
+					<text>热销榜</text>
+				</view>
+				<view class="chip" :class="{ active: order === 'asc' }" @tap="onOrder('asc')">
+					<text>滞销榜</text>
+				</view>
+				<view class="chip ghost" @tap="openTop">
+					<text>Top {{ top }}</text>
+					<FaIcon name="chevron-down" color="#94a3b8" :size="11" />
+				</view>
+			</view>
+
+			<!-- 收发存：仓库 + 关键字 -->
+			<template v-else-if="tab === 'move'">
+				<view class="chip-row">
+					<view class="chip" :class="{ active: !!warehouseId }" @tap="openWarehouse">
+						<text>{{ warehouseName || '全部仓库' }}</text>
+					</view>
+				</view>
+				<view class="search-box">
+					<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+					<input
+						v-model="keyword"
+						class="search-input"
+						placeholder="搜索商品名称 / 编码"
+						confirm-type="search"
+						@confirm="run"
+					/>
+				</view>
+			</template>
+		</view>
+
+		<view v-if="loading" class="state-box">
+			<text class="state-text">统计中...</text>
+		</view>
+
+		<!-- 购销汇总 -->
+		<template v-else-if="tab === 'summary'">
+			<view class="kpi-row">
+				<view class="kpi">
+					<text class="kpi-label">{{ side === 'purchase' ? '采购总量' : '销售总量' }}</text>
+					<text class="kpi-value">{{ qtyText(sumSummary.summary.qty) }}</text>
+				</view>
+				<view class="kpi">
+					<text class="kpi-label">{{ side === 'purchase' ? '采购总额' : '销售总额' }}</text>
+					<text class="kpi-value strong">¥{{ moneyText(sumSummary.summary.amount) }}</text>
+				</view>
+			</view>
+			<view v-if="!sumSummary.list.length" class="state-box">
+				<u-empty mode="search" text="该区间没有已生效单据" />
+			</view>
+			<view v-for="(r, i) in sumSummary.list" :key="`${r.key}-${i}`" class="row-card">
+				<view class="row-main">
+					<text class="row-title">{{ r.label }}</text>
+					<text class="row-sub">{{ r.lines }} 行明细 · 数量 {{ qtyText(r.qty) }}</text>
+				</view>
+				<text class="row-amount" :class="r.amount < 0 ? 'negative' : ''">¥{{ moneyText(r.amount) }}</text>
+			</view>
+		</template>
+
+		<!-- 热销 / 滞销排行 -->
+		<template v-else-if="tab === 'rank'">
+			<view v-if="!rank.list.length" class="state-box">
+				<u-empty mode="search" text="暂无排行数据" />
+			</view>
+			<view v-for="(r, i) in rank.list" :key="r.product_id" class="row-card" @tap="openProduct(r)">
+				<view class="rk-no" :class="{ top: i < 3 }">{{ i + 1 }}</view>
+				<view class="row-main">
+					<text class="row-title">{{ r.product_name }}</text>
+					<text class="row-sub">{{ [r.product_code, r.spec].filter(Boolean).join(' · ') }} · {{ qtyText(r.qty) }} {{ r.unit || '' }}</text>
+				</view>
+				<text class="row-amount">¥{{ moneyText(r.amount) }}</text>
+			</view>
+		</template>
+
+		<!-- 收发存汇总 -->
+		<template v-else-if="tab === 'move'">
+			<view class="kpi-row">
+				<view class="kpi">
+					<text class="kpi-label">本期入</text>
+					<text class="kpi-value">¥{{ moneyText(move.summary.in_amount) }}</text>
+				</view>
+				<view class="kpi">
+					<text class="kpi-label">本期出</text>
+					<text class="kpi-value">¥{{ moneyText(move.summary.out_amount) }}</text>
+				</view>
+				<view class="kpi">
+					<text class="kpi-label">期末货值</text>
+					<text class="kpi-value strong">¥{{ moneyText(move.summary.end_amount) }}</text>
+				</view>
+			</view>
+			<view v-if="!move.list.length" class="state-box">
+				<u-empty mode="search" text="该区间没有收发存记录" />
+			</view>
+			<view v-for="(r, i) in move.list" :key="`${r.product_id}-${r.warehouse_id}-${i}`" class="mv-card" @tap="openLedger(r)">
+				<view class="mv-top">
+					<text class="row-title">{{ r.product_name }}</text>
+					<text class="mv-wh">{{ r.warehouse_name || '未分仓' }}</text>
+				</view>
+				<text class="row-sub">{{ [r.product_code, r.category_name].filter(Boolean).join(' · ') }}</text>
+				<view class="mv-grid">
+					<view class="mv-cell">
+						<text class="mv-label">期初</text>
+						<text class="mv-value">{{ qtyText(r.open_qty) }}</text>
+						<text class="mv-money">¥{{ moneyText(r.open_amount) }}</text>
+					</view>
+					<view class="mv-cell">
+						<text class="mv-label in">入</text>
+						<text class="mv-value">{{ qtyText(r.in_qty) }}</text>
+						<text class="mv-money">¥{{ moneyText(r.in_amount) }}</text>
+					</view>
+					<view class="mv-cell">
+						<text class="mv-label out">出</text>
+						<text class="mv-value">{{ qtyText(r.out_qty) }}</text>
+						<text class="mv-money">¥{{ moneyText(r.out_amount) }}</text>
+					</view>
+					<view class="mv-cell">
+						<text class="mv-label">期末</text>
+						<text class="mv-value strong">{{ qtyText(r.end_qty) }}</text>
+						<text class="mv-money">¥{{ moneyText(r.end_amount) }}</text>
+					</view>
+				</view>
+			</view>
+			<view v-if="move.list.length < move.total" class="more" @tap="loadMoreMove">
+				<text>加载更多（{{ move.list.length }}/{{ move.total }}）</text>
+			</view>
+		</template>
+
+		<!-- 毛利分析 -->
+		<template v-else-if="tab === 'profit'">
+			<view class="hero-card">
+				<view class="hero-line">
+					<text class="hero-label">毛利额</text>
+					<text class="hero-value">¥{{ moneyText(profit.summary.profit) }}</text>
+				</view>
+				<view class="hero-grid">
+					<view class="hero-cell">
+						<text class="hero-cell-label">收入</text>
+						<text class="hero-cell-value">¥{{ moneyText(profit.summary.revenue) }}</text>
+					</view>
+					<view class="hero-cell">
+						<text class="hero-cell-label">成本</text>
+						<text class="hero-cell-value">¥{{ moneyText(profit.summary.cost) }}</text>
+					</view>
+					<view class="hero-cell">
+						<text class="hero-cell-label">毛利率</text>
+						<text class="hero-cell-value">{{ Number(profit.summary.profit_rate || 0) }}%</text>
+					</view>
+				</view>
+			</view>
+			<view v-if="!profit.list.length" class="state-box">
+				<u-empty mode="search" text="该区间没有销售出库" />
+			</view>
+			<view v-for="r in profit.list" :key="r.product_id" class="pf-card" @tap="openProduct(r)">
+				<view class="mv-top">
+					<text class="row-title">{{ r.product_name }}</text>
+					<text class="pf-rate" :class="Number(r.profit_rate) < 0 ? 'negative' : ''">{{ Number(r.profit_rate) }}%</text>
+				</view>
+				<text class="row-sub">{{ qtyText(r.qty) }} {{ r.unit || '' }} · 收入 ¥{{ moneyText(r.revenue) }} · 成本 ¥{{ moneyText(r.cost) }}</text>
+				<view class="pf-bar">
+					<view class="pf-bar-fill" :style="{ width: barWidth(r, 'revenue') }"></view>
+				</view>
+			</view>
+		</template>
+
+		<!-- 账龄分析 -->
+		<template v-else-if="tab === 'aging'">
+			<view v-for="side in AGING_SIDES" :key="side.key" class="ag-block">
+				<view class="ag-head">
+					<text class="ag-title">{{ side.title }}</text>
+					<text class="ag-total">¥{{ moneyText(agingTotalOf(side.key)) }}</text>
+				</view>
+				<view class="ag-bar">
+					<view
+						v-for="(b, i) in aging.buckets"
+						:key="b.label"
+						class="ag-seg"
+						:style="{ width: segWidth(side.key, b.label), background: SEG_COLORS[i % SEG_COLORS.length] }"
+					></view>
+				</view>
+				<view class="ag-legend">
+					<view v-for="(b, i) in aging.buckets" :key="b.label" class="ag-legend-item">
+						<view class="dot" :style="{ background: SEG_COLORS[i % SEG_COLORS.length] }"></view>
+						<text class="lg-label">{{ b.label }}</text>
+						<text class="lg-amount">¥{{ moneyText(bucketAmount(side.key, b.label)) }}</text>
+					</view>
+				</view>
+				<view v-for="row in rowsOf(side.value)" :key="`${side.value}-${row.partner_id}`" class="ag-row" @tap="openBills(side, row)">
+					<view class="row-main">
+						<text class="row-title">{{ row.partner_name }}</text>
+						<text class="row-sub">{{ bucketText(row) }}</text>
+					</view>
+					<text class="row-amount">¥{{ moneyText(row.total) }}</text>
+				</view>
+				<view v-if="!rowsOf(side.value).length" class="ag-empty">
+					<text>无{{ side.title }}未结余额</text>
+				</view>
+			</view>
+		</template>
+
+		<!-- 资金流水 -->
+		<template v-else>
+			<view class="kpi-row">
+				<view class="kpi">
+					<text class="kpi-label">总收入</text>
+					<text class="kpi-value in">¥{{ moneyText(cash.totalIn) }}</text>
+				</view>
+				<view class="kpi">
+					<text class="kpi-label">总支出</text>
+					<text class="kpi-value">¥{{ moneyText(cash.totalOut) }}</text>
+				</view>
+				<view class="kpi">
+					<text class="kpi-label">净额</text>
+					<text class="kpi-value strong" :class="cash.net < 0 ? 'negative' : ''">
+						{{ cash.net < 0 ? '-' : '+' }}¥{{ moneyText(Math.abs(cash.net)) }}
+					</text>
+				</view>
+			</view>
+			<view v-if="!cash.list.length" class="state-box">
+				<u-empty mode="search" text="该区间没有已确认的收付款" />
+			</view>
+			<view v-for="d in cash.list" :key="d.date" class="row-card">
+				<view class="row-main">
+					<text class="row-title">{{ d.date }}</text>
+					<text class="row-sub">入 ¥{{ moneyText(d.in) }} · 出 ¥{{ moneyText(d.out) }}</text>
+				</view>
+				<text class="row-amount" :class="d.net < 0 ? 'negative' : 'positive'">
+					{{ d.net < 0 ? '-' : '+' }}¥{{ moneyText(Math.abs(d.net)) }}
+				</text>
+			</view>
+		</template>
+
+		<ErpPicker
+			:show="picker.show"
+			:title="picker.title"
+			placeholder="搜索"
+			:options="picker.options"
+			:model-value="picker.current"
+			@update:show="picker.show = false"
+			@select="onPick"
+		/>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 报表中心。所有口径都直接取后端结果，端上不再二次汇总：
+ * 购销汇总的退货冲减、毛利的实际出库成本、收发存的期初倒推，与 Web 端同一份 core。
+ */
+import { computed, ref } from 'vue'
+import { onLoad, onReachBottom } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import ErpPicker from '@/components/erp/ErpPicker.vue'
+import {
+	REPORT_DIMENSIONS,
+	fetchAging,
+	fetchCashFlow,
+	fetchProfit,
+	fetchPurchaseSummary,
+	fetchSalesRank,
+	fetchSalesSummary,
+	fetchStockMove,
+	fetchWarehouses,
+	moneyText,
+	qtyText
+} from '@/api/erp.js'
+
+const TABS = [
+	{ key: 'summary', label: '购销汇总' },
+	{ key: 'rank', label: '销售排行' },
+	{ key: 'move', label: '收发存' },
+	{ key: 'profit', label: '毛利分析' },
+	{ key: 'aging', label: '账龄' },
+	{ key: 'cash', label: '资金流水' }
+]
+
+const SIDES = [
+	{ value: 'purchase', label: '采购' },
+	{ value: 'sales', label: '销售' }
+]
+
+const AGING_SIDES = [
+	{ key: 'receivable', value: 1, title: '应收账龄' },
+	{ key: 'payable', value: 2, title: '应付账龄' }
+]
+
+const SEG_COLORS = ['#22c55e', '#f59e0b', '#f97316', '#ef4444', '#7c3aed']
+const TOP_OPTIONS = [10, 20, 50]
+
+const tab = ref('summary')
+const loading = ref(false)
+const dateFrom = ref('')
+const dateTo = ref('')
+
+const side = ref('sales')
+const dimension = ref('product')
+const order = ref('desc')
+const top = ref(10)
+const warehouseId = ref('')
+const warehouseName = ref('')
+const keyword = ref('')
+
+const sumSummary = ref({ list: [], summary: { qty: 0, amount: 0 } })
+const rank = ref({ list: [], order: 'desc' })
+const move = ref({ list: [], total: 0, summary: {}, page: 1 })
+const profit = ref({ list: [], summary: {} })
+const aging = ref({ list: [], summary: {}, buckets: [] })
+const cash = ref({ list: [], totalIn: 0, totalOut: 0, net: 0 })
+const warehouses = ref([])
+
+const picker = ref({ show: false, key: '', title: '', options: [], current: '' })
+
+const dimensionLabel = computed(() => {
+	return (REPORT_DIMENSIONS.find((d) => d.value === dimension.value) || {}).label || '按商品'
+})
+
+const dimensionOptions = computed(() => {
+	const allow = side.value === 'purchase' ? ['product', 'supplier', 'month'] : ['product', 'customer', 'month']
+	return REPORT_DIMENSIONS.filter((d) => allow.includes(d.value))
+})
+
+onLoad((query = {}) => {
+	if (query.tab && TABS.some((t) => t.key === query.tab)) tab.value = query.tab
+	if (query.dimension) dimension.value = String(query.dimension)
+	useQuick()
+	run()
+})
+
+onReachBottom(() => {
+	if (tab.value === 'move' && !loading.value) loadMoreMove()
+})
+
+function switchTab(key) {
+	if (tab.value === key) return
+	tab.value = key
+	if (key !== 'move') move.value.page = 1
+	run()
+}
+
+function onDate(key, e) {
+	const val = e.detail.value
+	if (key === 'from') dateFrom.value = val
+	else dateTo.value = val
+	if (dateFrom.value && dateTo.value && dateFrom.value > dateTo.value) dateFrom.value = dateTo.value
+	run()
+}
+
+/** 报表默认看最近一个周转周期，空区间会把「没数据」误读成「没配好」 */
+function useQuick() {
+	const to = new Date()
+	const from = new Date(to.getTime() - 29 * 86400000)
+	const p = (n) => String(n).padStart(2, '0')
+	const fmt = (d) => `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`
+	dateFrom.value = fmt(from)
+	dateTo.value = fmt(to)
+}
+
+function onSide(value) {
+	if (side.value === value) return
+	side.value = value
+	if (!dimensionOptions.value.some((d) => d.value === dimension.value)) dimension.value = 'product'
+	run()
+}
+
+function onOrder(value) {
+	if (order.value === value) return
+	order.value = value
+	run()
+}
+
+async function run() {
+	loading.value = true
+	try {
+		if (tab.value === 'summary') await loadSummary()
+		else if (tab.value === 'rank') await loadRank()
+		else if (tab.value === 'move') await loadMove(true)
+		else if (tab.value === 'profit') await loadProfit()
+		else if (tab.value === 'aging') await loadAging()
+		else await loadCash()
+	} catch (e) {
+		// 单个报表失败只清当前视图，不影响切到其他 tab 再看
+	} finally {
+		loading.value = false
+	}
+}
+
+async function loadSummary() {
+	const args = { dimension: dimension.value, dateFrom: dateFrom.value, dateTo: dateTo.value }
+	sumSummary.value = side.value === 'purchase' ? await fetchPurchaseSummary(args) : await fetchSalesSummary(args)
+}
+
+async function loadRank() {
+	rank.value = await fetchSalesRank({
+		order: order.value,
+		top: top.value,
+		dateFrom: dateFrom.value,
+		dateTo: dateTo.value
+	})
+}
+
+async function loadMove(reset) {
+	if (reset) move.value = { list: [], total: 0, summary: {}, page: 1 }
+	const data = await fetchStockMove({
+		page: move.value.page,
+		pageSize: 20,
+		warehouseId: warehouseId.value,
+		keyword: keyword.value.trim(),
+		dateFrom: dateFrom.value,
+		dateTo: dateTo.value
+	})
+	const rows = data.list || []
+	move.value = {
+		list: reset ? rows : [...move.value.list, ...rows],
+		total: data.total || 0,
+		summary: data.summary || {},
+		page: move.value.page
+	}
+}
+
+function loadMoreMove() {
+	if (move.value.list.length >= move.value.total) return
+	move.value.page += 1
+	loadMove(false)
+}
+
+async function loadProfit() {
+	profit.value = await fetchProfit({ dateFrom: dateFrom.value, dateTo: dateTo.value })
+}
+
+async function loadAging() {
+	aging.value = await fetchAging()
+}
+
+async function loadCash() {
+	cash.value = await fetchCashFlow({ dateFrom: dateFrom.value, dateTo: dateTo.value })
+}
+
+function barWidth(row, field) {
+	const max = profit.value.list.reduce((m, r) => Math.max(m, Number(r[field] || 0)), 0)
+	if (!max) return '0%'
+	return `${Math.max(2, Math.round((Number(row[field] || 0) / max) * 100))}%`
+}
+
+function agingTotalOf(key) {
+	return aging.value.list
+		.filter((r) => r.bill_type === (key === 'receivable' ? 1 : 2))
+		.reduce((sum, r) => sum + Number(r.total || 0), 0)
+}
+
+function bucketAmount(key, label) {
+	return Number(((aging.value.summary || {})[key] || {})[label] || 0)
+}
+
+function segWidth(key, label) {
+	const total = agingTotalOf(key)
+	if (!total) return '0%'
+	return `${Math.max(0, Math.round((bucketAmount(key, label) / total) * 100))}%`
+}
+
+function rowsOf(billType) {
+	return aging.value.list.filter((r) => Number(r.bill_type) === billType)
+}
+
+function bucketText(row) {
+	return (aging.value.buckets || [])
+		.map((b) => (Number((row.buckets || {})[b.label] || 0) > 0 ? `${b.label} ¥${moneyText(row.buckets[b.label])}` : ''))
+		.filter(Boolean)
+		.join(' · ') || '暂无分桶金额'
+}
+
+function openDimension() {
+	picker.value = {
+		show: true,
+		key: 'dimension',
+		title: '统计维度',
+		current: dimension.value,
+		options: dimensionOptions.value.map((d) => ({ value: d.value, label: d.label }))
+	}
+}
+
+function openTop() {
+	picker.value = {
+		show: true,
+		key: 'top',
+		title: '榜单条数',
+		current: top.value,
+		options: TOP_OPTIONS.map((n) => ({ value: n, label: `前 ${n} 名` }))
+	}
+}
+
+async function openWarehouse() {
+	if (!warehouses.value.length) {
+		warehouses.value = await fetchWarehouses({ onlyEnabled: true }).catch(() => [])
+	}
+	picker.value = {
+		show: true,
+		key: 'warehouse',
+		title: '选择仓库',
+		current: warehouseId.value,
+		options: [
+			{ value: '', label: '全部仓库' },
+			...warehouses.value.map((w) => ({ value: w.id, label: w.warehouse_name, sub: w.warehouse_code || '' }))
+		]
+	}
+}
+
+function onPick(opt) {
+	picker.value.show = false
+	if (picker.value.key === 'dimension') {
+		dimension.value = String(opt.value)
+		run()
+	} else if (picker.value.key === 'top') {
+		top.value = Number(opt.value)
+		run()
+	} else {
+		warehouseId.value = String(opt.value ?? '')
+		warehouseName.value = warehouseId.value ? opt.label : ''
+		run()
+	}
+}
+
+function openProduct(row) {
+	if (!row.product_id) return
+	uni.navigateTo({ url: `/pages/erp/basic/product-detail?id=${row.product_id}` })
+}
+
+function openLedger(row) {
+	uni.navigateTo({
+		url: `/pages/erp/stock/ledger?product_id=${row.product_id}&warehouse_id=${row.warehouse_id || ''}`
+	})
+}
+
+function openBills(sideRow, row) {
+	uni.navigateTo({
+		url: `/pages/erp/finance/bill?bill_type=${sideRow.value}&partner_id=${row.partner_id}&partner_name=${encodeURIComponent(
+			row.partner_name || ''
+		)}&settle_state=open`
+	})
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 40rpx;
+}
+
+.tab-bar {
+	position: sticky;
+	top: 0;
+	z-index: 12;
+	background: $color-card;
+	box-shadow: $shadow-header;
+}
+
+.tab-scroll {
+	white-space: nowrap;
+	box-sizing: border-box;
+}
+
+.tab-list {
+	display: inline-flex;
+	padding: 0 12rpx;
+}
+
+.tab {
+	padding: 26rpx 26rpx 22rpx;
+	position: relative;
+
+	text {
+		font-size: 26rpx;
+		color: $color-text-muted;
+	}
+
+	&.active {
+		text {
+			color: $color-primary;
+			font-weight: 600;
+		}
+
+		&::after {
+			content: '';
+			position: absolute;
+			bottom: 6rpx;
+			left: 50%;
+			width: 40rpx;
+			height: 6rpx;
+			margin-left: -20rpx;
+			border-radius: 3rpx;
+			background: $color-primary;
+		}
+	}
+}
+
+.filter-bar {
+	padding: 20rpx $page-padding-x 6rpx;
+}
+
+.date-row {
+	display: flex;
+	align-items: center;
+	gap: 14rpx;
+}
+
+.date-cell {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	height: 58rpx;
+	padding: 0 20rpx;
+	border-radius: $radius-md;
+	background: $color-card;
+	font-size: 23rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+}
+
+.date-sep {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.quick {
+	margin-left: auto;
+	padding: 8rpx 20rpx;
+	border-radius: $radius-full;
+	background: $color-primary-bg;
+	font-size: 22rpx;
+	color: $color-primary-dark;
+}
+
+.chip-row {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 14rpx;
+	margin-top: 16rpx;
+}
+
+.chip {
+	display: inline-flex;
+	align-items: center;
+	gap: 6rpx;
+	padding: 10rpx 22rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 23rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.ghost {
+		background: #f1f5f9;
+		box-shadow: none;
+	}
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+	}
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	margin-top: 16rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+}
+
+.kpi-row {
+	display: flex;
+	gap: 16rpx;
+	margin: 16rpx $page-padding-x 0;
+}
+
+.kpi {
+	flex: 1;
+	min-width: 0;
+	@include card;
+	padding: 20rpx 22rpx;
+
+	.kpi-label {
+		display: block;
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+
+	.kpi-value {
+		display: block;
+		margin-top: 8rpx;
+		font-size: 28rpx;
+		font-weight: 600;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		&.strong {
+			color: $color-primary-dark;
+		}
+
+		&.in {
+			color: #16a34a;
+		}
+	}
+}
+
+.row-card {
+	display: flex;
+	align-items: center;
+	gap: 16rpx;
+	@include card;
+	margin: 16rpx $page-padding-x 0;
+	padding: 22rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.row-main {
+	flex: 1;
+	min-width: 0;
+}
+
+.row-title {
+	display: block;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.row-sub {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.row-amount {
+	flex-shrink: 0;
+	font-size: 29rpx;
+	font-weight: 600;
+	color: $color-text;
+
+	&.negative {
+		color: $color-danger;
+	}
+
+	&.positive {
+		color: #16a34a;
+	}
+}
+
+.rk-no {
+	width: 44rpx;
+	height: 44rpx;
+	flex-shrink: 0;
+	border-radius: $radius-sm;
+	background: #f1f5f9;
+	color: $color-text-secondary;
+	font-size: 23rpx;
+	font-weight: 600;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	&.top {
+		background: linear-gradient(135deg, #fbbf24, #f59e0b);
+		color: #ffffff;
+	}
+}
+
+.mv-card {
+	@include card;
+	margin: 16rpx $page-padding-x 0;
+	padding: 22rpx 28rpx;
+}
+
+.mv-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 12rpx;
+}
+
+.mv-wh {
+	flex-shrink: 0;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.mv-grid {
+	display: flex;
+	gap: 10rpx;
+	margin-top: 16rpx;
+	padding-top: 14rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.mv-cell {
+	flex: 1;
+	min-width: 0;
+
+	.mv-label {
+		display: block;
+		font-size: 21rpx;
+		color: $color-text-muted;
+
+		&.in {
+			color: #16a34a;
+		}
+
+		&.out {
+			color: $color-danger;
+		}
+	}
+
+	.mv-value {
+		display: block;
+		margin-top: 4rpx;
+		font-size: 25rpx;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		&.strong {
+			font-weight: 600;
+			color: $color-primary-dark;
+		}
+	}
+
+	.mv-money {
+		display: block;
+		margin-top: 2rpx;
+		font-size: 20rpx;
+		color: $color-text-muted;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+}
+
+.hero-card {
+	margin: 16rpx $page-padding-x 0;
+	padding: 30rpx 32rpx;
+	border-radius: $radius-lg;
+	background: $hero-gradient;
+	color: #ffffff;
+	box-shadow: $shadow-card;
+}
+
+.hero-line {
+	display: flex;
+	align-items: baseline;
+	justify-content: space-between;
+	gap: 16rpx;
+
+	.hero-label {
+		font-size: 24rpx;
+		opacity: 0.9;
+	}
+
+	.hero-value {
+		font-size: 46rpx;
+		font-weight: 600;
+	}
+}
+
+.hero-grid {
+	display: flex;
+	margin-top: 22rpx;
+	padding-top: 18rpx;
+	border-top: 1rpx solid rgba(255, 255, 255, 0.25);
+}
+
+.hero-cell {
+	flex: 1;
+	min-width: 0;
+
+	.hero-cell-label {
+		display: block;
+		font-size: 21rpx;
+		opacity: 0.85;
+	}
+
+	.hero-cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 26rpx;
+		font-weight: 500;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+}
+
+.pf-card {
+	@include card;
+	margin: 16rpx $page-padding-x 0;
+	padding: 22rpx 28rpx;
+}
+
+.pf-rate {
+	flex-shrink: 0;
+	font-size: 27rpx;
+	font-weight: 600;
+	color: #16a34a;
+
+	&.negative {
+		color: $color-danger;
+	}
+}
+
+.pf-bar {
+	height: 8rpx;
+	margin-top: 14rpx;
+	border-radius: 4rpx;
+	background: #f1f5f9;
+	overflow: hidden;
+}
+
+.pf-bar-fill {
+	height: 100%;
+	border-radius: 4rpx;
+	background: linear-gradient(90deg, #60a5fa, #2563eb);
+}
+
+.ag-block {
+	@include card;
+	margin: 16rpx $page-padding-x 0;
+	padding: 24rpx 28rpx;
+}
+
+.ag-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 16rpx;
+}
+
+.ag-title {
+	@include section-title;
+}
+
+.ag-total {
+	font-size: 26rpx;
+	font-weight: 600;
+	color: $color-primary-dark;
+}
+
+.ag-bar {
+	display: flex;
+	height: 14rpx;
+	border-radius: 7rpx;
+	background: #f1f5f9;
+	overflow: hidden;
+}
+
+.ag-seg {
+	height: 100%;
+}
+
+.ag-legend {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 12rpx 22rpx;
+	margin-top: 16rpx;
+}
+
+.ag-legend-item {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+
+	.dot {
+		width: 14rpx;
+		height: 14rpx;
+		border-radius: 50%;
+	}
+
+	.lg-label {
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+
+	.lg-amount {
+		font-size: 21rpx;
+		color: $color-text-secondary;
+	}
+}
+
+.ag-row {
+	display: flex;
+	align-items: center;
+	gap: 16rpx;
+	padding: 18rpx 0;
+	border-bottom: 1rpx solid $color-divider;
+
+	&:last-child {
+		border-bottom: none;
+		padding-bottom: 4rpx;
+	}
+}
+
+.ag-empty {
+	padding: 20rpx 0 6rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.negative {
+	color: $color-danger;
+}
+
+.more {
+	display: flex;
+	justify-content: center;
+	margin: 20rpx $page-padding-x 0;
+	padding: 18rpx 0;
+	border-radius: $radius-md;
+	background: $color-card;
+	font-size: 24rpx;
+	color: $color-primary;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 100rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/pages/erp/stock/batch.vue b/uniapp/pages/erp/stock/batch.vue
new file mode 100644
index 0000000..3f70f83
--- /dev/null
+++ b/uniapp/pages/erp/stock/batch.vue
@@ -0,0 +1,447 @@
+<template>
+	<view class="page">
+		<view class="filter-bar">
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					placeholder="搜索商品名称 / 编码 / 批次"
+					confirm-type="search"
+					@confirm="refresh"
+				/>
+				<text v-if="keyword" class="search-clear" @tap="clearKeyword">清空</text>
+			</view>
+			<view class="chip-row">
+				<view class="chip" :class="{ active: warehouseId }" @tap="openWarehouse">
+					<text>{{ warehouseName || '全部仓库' }}</text>
+				</view>
+				<view class="chip" :class="{ active: onlyPositive }" @tap="toggleOnly">
+					<text>仅有库存</text>
+				</view>
+			</view>
+			<view class="chip-row">
+				<view
+					v-for="opt in EXPIRE_STATE_OPTIONS"
+					:key="opt.value || 'all'"
+					class="chip mini"
+					:class="{ active: expireState === opt.value }"
+					@tap="onState(opt.value)"
+				>
+					<text>{{ opt.label }}</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="sum-bar">
+			<text class="sum-item">共 {{ total }} 个批次</text>
+			<text class="sum-item">本页货值 ¥{{ moneyText(sumAmount) }}</text>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="search" text="没有符合条件的批次" />
+		</view>
+		<template v-else>
+			<view v-for="row in list" :key="batchKey(row)" class="b-card" @tap="openLedger(row)">
+				<view class="b-top">
+					<text class="b-name">{{ row.product_name }}</text>
+					<u-tag
+						v-if="expireLabel(row)"
+						:text="expireLabel(row)"
+						:type="row.expired ? 'error' : 'warning'"
+						size="mini"
+					/>
+				</view>
+				<view class="b-batch">
+					<FaIcon name="tags" color="#2563eb" :size="12" />
+					<text class="b-no">{{ row.batch_no }}</text>
+					<text class="b-wh">{{ row.warehouse_name || '未分仓' }}</text>
+				</view>
+				<text class="b-sub">{{ [row.product_code, row.spec].filter(Boolean).join(' · ') }}</text>
+				<view class="b-grid">
+					<view class="b-cell">
+						<text class="cell-label">数量</text>
+						<text class="cell-value strong">{{ qtyText(row.quantity) }} {{ row.unit || '' }}</text>
+					</view>
+					<view class="b-cell">
+						<text class="cell-label">成本</text>
+						<text class="cell-value">¥{{ moneyText(row.cost_price) }}</text>
+					</view>
+					<view class="b-cell">
+						<text class="cell-label">货值</text>
+						<text class="cell-value">¥{{ moneyText(row.amount) }}</text>
+					</view>
+					<view class="b-cell">
+						<text class="cell-label">到期</text>
+						<text class="cell-value">{{ row.expire_date || '—' }}</text>
+					</view>
+				</view>
+				<view class="b-hint">
+					<FaIcon name="clock-rotate-left" color="#94a3b8" :size="12" />
+					<text>看这个批次的收发流水</text>
+				</view>
+			</view>
+			<view v-if="finished" class="load-done">
+				<text>{{ list.length ? '没有更多了' : '' }}</text>
+			</view>
+		</template>
+
+		<ErpPicker
+			:show="picker.show"
+			title="选择仓库"
+			placeholder="搜索仓库"
+			:options="warehouseOptions"
+			:model-value="warehouseId"
+			@update:show="picker.show = false"
+			@select="onWarehouse"
+		/>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 批次与效期台账。批次只从入库流水回溯到期日，未登记效期的批次到期列留空不算异常。
+ * 点行跳到该商品+该批次的收发流水，做效期倒查不用再手动筛。
+ */
+import { computed, ref } from 'vue'
+import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import ErpPicker from '@/components/erp/ErpPicker.vue'
+import { EXPIRE_STATE_OPTIONS, fetchBatches, fetchWarehouses, moneyText, qtyText } from '@/api/erp.js'
+
+const PAGE_SIZE = 20
+
+const list = ref([])
+const total = ref(0)
+const page = ref(1)
+const loading = ref(false)
+const finished = ref(false)
+const keyword = ref('')
+const warehouseId = ref('')
+const warehouseName = ref('')
+const expireState = ref('')
+const onlyPositive = ref(true)
+const warehouses = ref([])
+const picker = ref({ show: false })
+
+const warehouseOptions = computed(() => [
+	{ value: '', label: '全部仓库' },
+	...warehouses.value.map((w) => ({
+		value: w.id,
+		label: w.warehouse_name,
+		sub: w.warehouse_code || ''
+	}))
+])
+
+onLoad((query = {}) => {
+	if (query.warehouse_id) {
+		warehouseId.value = String(query.warehouse_id)
+		warehouseName.value = decodeURIComponent(query.warehouse_name || '')
+	}
+	if (query.expire_state) expireState.value = String(query.expire_state)
+})
+
+onShow(() => {
+	refresh()
+	loadWarehouses()
+})
+
+onReachBottom(() => {
+	if (finished.value || loading.value) return
+	loadMore()
+})
+
+async function loadWarehouses() {
+	if (warehouses.value.length) return
+	try {
+		warehouses.value = await fetchWarehouses({ onlyEnabled: true })
+	} catch (e) {
+		// 仓库字典拉不到只是不能按仓筛
+	}
+}
+
+async function refresh() {
+	page.value = 1
+	finished.value = false
+	list.value = []
+	await loadPage()
+}
+
+async function loadMore() {
+	page.value += 1
+	await loadPage()
+}
+
+async function loadPage() {
+	loading.value = true
+	try {
+		const data = await fetchBatches({
+			page: page.value,
+			pageSize: PAGE_SIZE,
+			keyword: keyword.value.trim(),
+			warehouseId: warehouseId.value,
+			expireState: expireState.value,
+			onlyPositive: onlyPositive.value
+		})
+		const rows = data.list || []
+		list.value = page.value === 1 ? rows : [...list.value, ...rows]
+		total.value = data.total || 0
+		finished.value = list.value.length >= total.value
+	} catch (e) {
+		if (page.value > 1) page.value -= 1
+	} finally {
+		loading.value = false
+	}
+}
+
+const sumAmount = computed(() => list.value.reduce((sum, r) => sum + (Number(r.amount) || 0), 0))
+
+function clearKeyword() {
+	keyword.value = ''
+	refresh()
+}
+
+function toggleOnly() {
+	onlyPositive.value = !onlyPositive.value
+	refresh()
+}
+
+function onState(value) {
+	if (expireState.value === value) return
+	expireState.value = value
+	refresh()
+}
+
+function openWarehouse() {
+	picker.value.show = true
+}
+
+function onWarehouse(opt) {
+	warehouseId.value = String(opt.value ?? '')
+	warehouseName.value = warehouseId.value ? opt.label : ''
+	refresh()
+}
+
+function expireLabel(row) {
+	if (row.expired) return '已过期'
+	const d = row.expire_in_days
+	if (d === null || d === undefined || String(d) === '') return ''
+	return d <= 30 ? `${d} 天后到期` : ''
+}
+
+function batchKey(row) {
+	return `${row.product_id}-${row.warehouse_id}-${row.batch_no}`
+}
+
+function openLedger(row) {
+	const q = `product_id=${row.product_id}&warehouse_id=${row.warehouse_id || ''}&batch_no=${encodeURIComponent(
+		row.batch_no || ''
+	)}`
+	uni.navigateTo({ url: `/pages/erp/stock/ledger?${q}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 40rpx;
+}
+
+.filter-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	background: $color-bg-page;
+	padding: 20rpx $page-padding-x 8rpx;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.search-clear {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.chip-row {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 14rpx;
+	margin-top: 18rpx;
+}
+
+.chip {
+	display: inline-flex;
+	align-items: center;
+	gap: 6rpx;
+	padding: 10rpx 22rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 24rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.mini {
+		padding: 8rpx 18rpx;
+		font-size: 22rpx;
+		box-shadow: none;
+		background: #f1f5f9;
+	}
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+	}
+}
+
+.sum-bar {
+	display: flex;
+	justify-content: space-between;
+	margin: 6rpx $page-padding-x 16rpx;
+	padding: 0 8rpx;
+}
+
+.sum-item {
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.b-card {
+	@include card;
+	margin: 0 $page-padding-x 20rpx;
+	padding: 24rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.b-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 12rpx;
+}
+
+.b-name {
+	flex: 1;
+	min-width: 0;
+	font-size: 29rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.b-batch {
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	margin-top: 12rpx;
+}
+
+.b-no {
+	padding: 4rpx 14rpx;
+	border-radius: $radius-sm;
+	background: $color-primary-bg;
+	color: $color-primary-dark;
+	font-size: 23rpx;
+	font-weight: 500;
+}
+
+.b-wh {
+	font-size: 23rpx;
+	color: $color-text-secondary;
+}
+
+.b-sub {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.b-grid {
+	display: flex;
+	gap: 10rpx;
+	margin-top: 18rpx;
+	padding-top: 16rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.b-cell {
+	flex: 1;
+	min-width: 0;
+
+	.cell-label {
+		display: block;
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 24rpx;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		&.strong {
+			font-weight: 600;
+			color: $color-primary-dark;
+		}
+	}
+}
+
+.b-hint {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	margin-top: 16rpx;
+	font-size: 21rpx;
+	color: $color-text-muted;
+}
+
+.load-done {
+	display: flex;
+	justify-content: center;
+	padding: 8rpx 0 24rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/pages/erp/stock/index.vue b/uniapp/pages/erp/stock/index.vue
new file mode 100644
index 0000000..f7d3e7d
--- /dev/null
+++ b/uniapp/pages/erp/stock/index.vue
@@ -0,0 +1,454 @@
+<template>
+	<view class="page">
+		<view class="filter-bar">
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="keyword"
+					class="search-input"
+					placeholder="搜索商品名称 / 编码 / 批次"
+					confirm-type="search"
+					@confirm="refresh"
+				/>
+				<text v-if="keyword" class="search-clear" @tap="clearKeyword">清空</text>
+			</view>
+			<view class="chip-row">
+				<view class="chip" @tap="openPicker('warehouse')">
+					<text>{{ warehouseName || '全部仓库' }}</text>
+					<FaIcon name="chevron-right" color="#94a3b8" :size="12" />
+				</view>
+				<view class="chip" :class="{ active: groupByProduct }" @tap="toggleGroup">
+					<text>{{ groupByProduct ? '按商品汇总' : '分仓分批次' }}</text>
+				</view>
+				<view class="chip" :class="{ active: onlyStock }" @tap="toggleOnlyStock">
+					<text>有货</text>
+				</view>
+			</view>
+			<scroll-view class="state-scroll" scroll-x :show-scrollbar="false">
+				<view class="state-list">
+					<view
+						v-for="opt in SAFETY_STATE_OPTIONS"
+						:key="opt.value || 'all'"
+						class="state-item"
+						:class="{ active: safetyState === opt.value }"
+						@tap="onState(opt.value)"
+					>
+						<text>{{ opt.label }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="sum-bar">
+			<text class="sum-item">{{ total }} 条结存</text>
+			<text class="sum-item">库存货值 ¥{{ moneyText(sumAmount) }}</text>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="search" text="没有符合条件的库存" />
+		</view>
+		<template v-else>
+			<view v-for="(row, i) in list" :key="rowKey(row, i)" class="s-card" @tap="openProduct(row)">
+				<view class="s-top">
+					<text class="s-name">{{ row.product_name }}</text>
+					<u-tag
+						v-if="row.safety_state && row.safety_state !== 'normal'"
+						:text="safetyStateLabel(row.safety_state)"
+						:type="row.safety_state === 'low' ? 'warning' : 'primary'"
+						size="mini"
+					/>
+				</view>
+				<text class="s-sub">
+					{{ [row.warehouse_name, row.batch_no ? '批次 ' + row.batch_no : ''].filter(Boolean).join(' · ') || '未分仓' }}
+					<text v-if="row.category_name"> · {{ row.category_name }}</text>
+				</text>
+				<view class="s-grid">
+					<view class="s-cell">
+						<text class="cell-label">数量</text>
+						<text class="cell-value strong">{{ qtyText(row.quantity) }} {{ row.unit || '' }}</text>
+					</view>
+					<view class="s-cell">
+						<text class="cell-label">成本价</text>
+						<text class="cell-value">¥{{ moneyText(row.cost_price) }}</text>
+					</view>
+					<view class="s-cell">
+						<text class="cell-label">货值</text>
+						<text class="cell-value">¥{{ moneyText(row.amount) }}</text>
+					</view>
+				</view>
+				<view v-if="Number(row.safety_qty) > 0 || Number(row.max_qty) > 0" class="s-limit">
+					<text v-if="Number(row.safety_qty) > 0">安全 {{ qtyText(row.safety_qty) }}</text>
+					<text v-if="Number(row.max_qty) > 0">最高 {{ qtyText(row.max_qty) }}</text>
+				</view>
+			</view>
+			<view v-if="finished" class="load-done">
+				<text>{{ list.length ? '没有更多了' : '' }}</text>
+			</view>
+		</template>
+
+		<ErpPicker
+			:show="picker.show"
+			title="选择仓库"
+			placeholder="搜索仓库"
+			:options="warehouseOptions"
+			:model-value="warehouseId"
+			@update:show="picker.show = false"
+			@select="onWarehouse"
+		/>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 库存结存查询。
+ * 默认「分仓分批次」逐行看，切到「按商品汇总」看总量；
+ * 货值 = 数量 × 移动加权成本，与报表中心收发存汇总同源。
+ */
+import { computed, ref } from 'vue'
+import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import ErpPicker from '@/components/erp/ErpPicker.vue'
+import {
+	SAFETY_STATE_OPTIONS,
+	fetchStocks,
+	fetchWarehouses,
+	moneyText,
+	qtyText,
+	safetyStateLabel
+} from '@/api/erp.js'
+
+const PAGE_SIZE = 20
+
+const list = ref([])
+const total = ref(0)
+const sumAmount = ref(0)
+const page = ref(1)
+const loading = ref(false)
+const finished = ref(false)
+const keyword = ref('')
+const warehouseId = ref('')
+const warehouseName = ref('')
+const safetyState = ref('')
+const groupByProduct = ref(false)
+const onlyStock = ref(true)
+const warehouses = ref([])
+/** 从商品详情跳过来时锁定单个商品，端上把 id 存下来随查询一起下发 */
+const productId = ref('')
+
+const picker = ref({ show: false })
+
+const warehouseOptions = computed(() => [
+	{ value: '', label: '全部仓库' },
+	...warehouses.value.map((w) => ({
+		value: w.id,
+		label: w.warehouse_name,
+		sub: w.warehouse_code || '',
+		extra: `${w.stock_kinds || 0} 种`
+	}))
+])
+
+onLoad((query = {}) => {
+	if (query.warehouse_id) {
+		warehouseId.value = String(query.warehouse_id)
+		warehouseName.value = decodeURIComponent(query.warehouse_name || '')
+	}
+	if (query.product_id) productId.value = String(query.product_id)
+	if (query.group === 'product') groupByProduct.value = true
+})
+
+onShow(() => {
+	refresh()
+	loadWarehouses()
+})
+
+onReachBottom(() => {
+	if (finished.value || loading.value) return
+	loadMore()
+})
+
+async function loadWarehouses() {
+	if (warehouses.value.length) return
+	try {
+		warehouses.value = await fetchWarehouses({ onlyEnabled: true })
+	} catch (e) {
+		// 仓库列表拉不到不影响查询，只是不能按仓筛
+	}
+}
+
+async function refresh() {
+	page.value = 1
+	finished.value = false
+	list.value = []
+	await loadPage()
+}
+
+async function loadMore() {
+	page.value += 1
+	await loadPage()
+}
+
+async function loadPage() {
+	loading.value = true
+	try {
+		const data = await fetchStocks({
+			page: page.value,
+			pageSize: PAGE_SIZE,
+			keyword: keyword.value.trim(),
+			warehouseId: warehouseId.value,
+			productId: productId.value,
+			groupBy: groupByProduct.value ? 'product' : '',
+			safetyState: safetyState.value,
+			onlyStock: onlyStock.value
+		})
+		const rows = data.list || []
+		list.value = page.value === 1 ? rows : [...list.value, ...rows]
+		total.value = data.total || 0
+		sumAmount.value = data.sumAmount || 0
+		finished.value = list.value.length >= total.value
+	} catch (e) {
+		if (page.value > 1) page.value -= 1
+	} finally {
+		loading.value = false
+	}
+}
+
+function clearKeyword() {
+	keyword.value = ''
+	refresh()
+}
+
+function toggleGroup() {
+	groupByProduct.value = !groupByProduct.value
+	refresh()
+}
+
+function toggleOnlyStock() {
+	onlyStock.value = !onlyStock.value
+	refresh()
+}
+
+function onState(value) {
+	if (safetyState.value === value) return
+	safetyState.value = value
+	refresh()
+}
+
+function openPicker() {
+	picker.value.show = true
+}
+
+function onWarehouse(opt) {
+	warehouseId.value = String(opt.value ?? '')
+	warehouseName.value = warehouseId.value ? opt.label : ''
+	refresh()
+}
+
+function rowKey(row, i) {
+	return `${row.product_id}-${row.warehouse_id || 0}-${row.batch_no || ''}-${i}`
+}
+
+function openProduct(row) {
+	if (!row.product_id) return
+	uni.navigateTo({ url: `/pages/erp/basic/product-detail?id=${row.product_id}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 40rpx;
+}
+
+.filter-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	background: $color-bg-page;
+	padding: 20rpx $page-padding-x 8rpx;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.search-clear {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.chip-row {
+	display: flex;
+	gap: 16rpx;
+	margin-top: 18rpx;
+}
+
+.chip {
+	display: inline-flex;
+	align-items: center;
+	gap: 6rpx;
+	padding: 10rpx 22rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 24rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+	}
+}
+
+.state-scroll {
+	margin-top: 16rpx;
+	white-space: nowrap;
+	/* scroll-view 不设 border-box，左右内边距会把最后几个标签顶出屏幕 */
+	box-sizing: border-box;
+}
+
+.state-list {
+	display: inline-flex;
+	gap: 14rpx;
+	padding-bottom: 10rpx;
+}
+
+.state-item {
+	padding: 8rpx 20rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 23rpx;
+	color: $color-text-muted;
+
+	&.active {
+		background: $color-primary-bg;
+		color: $color-primary-dark;
+		font-weight: 500;
+	}
+}
+
+.sum-bar {
+	display: flex;
+	justify-content: space-between;
+	margin: 0 $page-padding-x 16rpx;
+	padding: 0 8rpx;
+}
+
+.sum-item {
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.s-card {
+	@include card;
+	margin: 0 $page-padding-x 20rpx;
+	padding: 24rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.s-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 12rpx;
+}
+
+.s-name {
+	flex: 1;
+	font-size: 29rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.s-sub {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.s-grid {
+	display: flex;
+	margin-top: 18rpx;
+	padding-top: 16rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.s-cell {
+	flex: 1;
+	min-width: 0;
+
+	.cell-label {
+		display: block;
+		font-size: 22rpx;
+		color: $color-text-muted;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 26rpx;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		&.strong {
+			font-weight: 600;
+			color: $color-primary-dark;
+		}
+	}
+}
+
+.s-limit {
+	display: flex;
+	gap: 24rpx;
+	margin-top: 12rpx;
+	font-size: 21rpx;
+	color: $color-text-muted;
+}
+
+.load-done {
+	display: flex;
+	justify-content: center;
+	padding: 8rpx 0 24rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/pages/erp/stock/ledger.vue b/uniapp/pages/erp/stock/ledger.vue
new file mode 100644
index 0000000..5853677
--- /dev/null
+++ b/uniapp/pages/erp/stock/ledger.vue
@@ -0,0 +1,595 @@
+<template>
+	<view class="page">
+		<view class="filter-bar">
+			<view class="search-box">
+				<FaIcon name="magnifying-glass" color="#94a3b8" :size="16" />
+				<input
+					v-model="docNo"
+					class="search-input"
+					placeholder="搜索单据号"
+					confirm-type="search"
+					@confirm="refresh"
+				/>
+				<text v-if="docNo" class="search-clear" @tap="clearDocNo">清空</text>
+			</view>
+			<view class="chip-row">
+				<view class="chip" :class="{ active: warehouseId }" @tap="openPicker('warehouse')">
+					<text>{{ warehouseName || '全部仓库' }}</text>
+				</view>
+				<view class="chip" :class="{ active: productId }" @tap="openPicker('product')">
+					<text>{{ productName || '全部商品' }}</text>
+				</view>
+				<view class="chip" :class="{ active: docType }" @tap="openPicker('docType')">
+					<text>{{ docType ? docTypeLabel(docType) : '全部类型' }}</text>
+				</view>
+			</view>
+			<view class="date-row">
+				<picker mode="date" :value="dateFrom" @change="onDate('from', $event)">
+					<view class="date-cell">
+						<FaIcon name="calendar-days" color="#94a3b8" :size="14" />
+						<text>{{ dateFrom || '开始日期' }}</text>
+					</view>
+				</picker>
+				<text class="date-sep">至</text>
+				<picker mode="date" :value="dateTo" @change="onDate('to', $event)">
+					<view class="date-cell">
+						<FaIcon name="calendar-days" color="#94a3b8" :size="14" />
+						<text>{{ dateTo || '结束日期' }}</text>
+					</view>
+				</picker>
+				<text v-if="dateFrom || dateTo" class="date-clear" @tap="clearDates">重置</text>
+			</view>
+		</view>
+
+		<view class="sum-bar">
+			<text class="sum-item">共 {{ total }} 条流水</text>
+			<text v-if="filterText" class="sum-item" @tap="clearFilter">已筛「{{ filterText }}」×</text>
+		</view>
+
+		<view v-if="loading && !list.length" class="state-box">
+			<text class="state-text">加载中...</text>
+		</view>
+		<view v-else-if="!list.length" class="state-box">
+			<u-empty mode="search" text="还没有收发存记录" />
+		</view>
+		<template v-else>
+			<view v-for="row in list" :key="row.id" class="l-card" @tap="openDoc(row)">
+				<view class="l-head">
+					<view class="l-dir" :class="row.direction > 0 ? 'dir-in' : 'dir-out'">
+						<FaIcon
+							:name="row.direction > 0 ? 'arrow-down-long' : 'arrow-up-long'"
+							:color="row.direction > 0 ? '#16a34a' : '#ef4444'"
+							:size="13"
+						/>
+						<text>{{ row.direction > 0 ? '入' : '出' }}</text>
+					</view>
+					<text class="l-name">{{ row.product_name || `商品#${row.product_id}` }}</text>
+					<text class="l-qty" :class="row.direction > 0 ? 'qty-in' : 'qty-out'">
+						{{ row.direction > 0 ? '+' : '-' }}{{ qtyText(row.quantity) }}
+					</text>
+				</view>
+				<text class="l-sub">
+					{{ [row.warehouse_name || '未分仓', row.spec, row.batch_no ? '批次 ' + row.batch_no : '']
+						.filter(Boolean).join(' · ') }}
+				</text>
+				<view class="l-flow">
+					<text class="flow-label">结存</text>
+					<text class="flow-qty">{{ qtyText(row.before_qty) }}</text>
+					<FaIcon name="arrow-right-long" color="#cbd5e1" :size="13" />
+					<text class="flow-qty after">{{ qtyText(row.after_qty) }}</text>
+					<text v-if="Number(row.unit_cost) > 0" class="flow-cost">
+						成本 ¥{{ moneyText(row.unit_cost) }}
+					</text>
+				</view>
+				<view class="l-foot">
+					<u-tag :text="docTypeLabel(row.doc_type)" type="info" size="mini" />
+					<text class="foot-doc">{{ row.doc_no }}</text>
+					<text class="foot-time">{{ row.create_time_text }}</text>
+				</view>
+				<text v-if="row.operator_name" class="l-op">操作人 {{ row.operator_name }}</text>
+			</view>
+			<view v-if="finished" class="load-done">
+				<text>{{ list.length ? '没有更多了' : '' }}</text>
+			</view>
+		</template>
+
+		<ErpPicker
+			:show="picker.show"
+			:title="pickerTitle"
+			placeholder="搜索"
+			:options="picker.options"
+			:model-value="picker.current"
+			:remote="picker.key === 'product'"
+			:loading="picker.loading"
+			:tip="picker.tip"
+			@update:show="closePicker"
+			@search="onProductSearch"
+			@select="onSelect"
+		/>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 收发存流水台账。每行是「某商品某仓库某批次」的一次变动，前滚后结存直接可核对。
+ * 商品维度可能上千，筛商品走服务端搜索；单据号点行可回到来源单据详情。
+ */
+import { computed, ref } from 'vue'
+import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import ErpPicker from '@/components/erp/ErpPicker.vue'
+import {
+	docTypeLabel,
+	fetchDocTypes,
+	fetchProducts,
+	fetchStockLedger,
+	fetchWarehouses,
+	moneyText,
+	qtyText
+} from '@/api/erp.js'
+
+const PAGE_SIZE = 20
+
+const list = ref([])
+const total = ref(0)
+const page = ref(1)
+const loading = ref(false)
+const finished = ref(false)
+
+const docNo = ref('')
+const warehouseId = ref('')
+const warehouseName = ref('')
+const productId = ref('')
+const productName = ref('')
+const docType = ref('')
+const batchNo = ref('')
+const dateFrom = ref('')
+const dateTo = ref('')
+
+const warehouses = ref([])
+const docTypes = ref([])
+
+const picker = ref({ key: '', show: false, options: [], current: '', loading: false, tip: '' })
+
+const pickerTitle = computed(() =>
+	({ warehouse: '选择仓库', product: '选择商品', docType: '选择单据类型' })[picker.value.key] || '请选择'
+)
+
+/** 从商品/批次页带条件跳进来时，把锁定条件显式画出来，免得用户对着半屏数据找原因 */
+const filterText = computed(() =>
+	[productName.value, batchNo.value ? `批次 ${batchNo.value}` : ''].filter(Boolean).join(' · ')
+)
+
+onLoad((query = {}) => {
+	if (query.product_id) {
+		productId.value = String(query.product_id)
+		productName.value = decodeURIComponent(query.product_name || '')
+	}
+	if (query.warehouse_id) {
+		warehouseId.value = String(query.warehouse_id)
+		warehouseName.value = decodeURIComponent(query.warehouse_name || '')
+	}
+	if (query.doc_type) docType.value = String(query.doc_type)
+	if (query.doc_no) docNo.value = String(query.doc_no)
+	if (query.batch_no) batchNo.value = String(query.batch_no)
+})
+
+onShow(() => {
+	refresh()
+	loadDicts()
+})
+
+onReachBottom(() => {
+	if (finished.value || loading.value) return
+	loadMore()
+})
+
+async function loadDicts() {
+	if (!warehouses.value.length) {
+		try {
+			warehouses.value = await fetchWarehouses({ onlyEnabled: true })
+		} catch (e) {
+			// 字典拉不到只是不能筛，流水本身仍可查看
+		}
+	}
+	if (!docTypes.value.length) {
+		try {
+			docTypes.value = await fetchDocTypes()
+		} catch (e) {
+			docTypes.value = []
+		}
+	}
+}
+
+async function refresh() {
+	page.value = 1
+	finished.value = false
+	list.value = []
+	await loadPage()
+}
+
+async function loadMore() {
+	page.value += 1
+	await loadPage()
+}
+
+async function loadPage() {
+	loading.value = true
+	try {
+		const data = await fetchStockLedger({
+			page: page.value,
+			pageSize: PAGE_SIZE,
+			productId: productId.value,
+			warehouseId: warehouseId.value,
+			docType: docType.value,
+			batchNo: batchNo.value,
+			docNo: docNo.value.trim(),
+			dateFrom: dateFrom.value,
+			dateTo: dateTo.value
+		})
+		const rows = data.list || []
+		list.value = page.value === 1 ? rows : [...list.value, ...rows]
+		total.value = data.total || 0
+		finished.value = list.value.length >= total.value
+	} catch (e) {
+		if (page.value > 1) page.value -= 1
+	} finally {
+		loading.value = false
+	}
+}
+
+function onDate(key, e) {
+	const val = e.detail.value
+	if (key === 'from') dateFrom.value = val
+	else dateTo.value = val
+	if (dateFrom.value && dateTo.value && dateFrom.value > dateTo.value) {
+		dateFrom.value = dateTo.value
+	}
+	refresh()
+}
+
+function clearDates() {
+	dateFrom.value = ''
+	dateTo.value = ''
+	refresh()
+}
+
+function clearDocNo() {
+	docNo.value = ''
+	refresh()
+}
+
+function clearFilter() {
+	productId.value = ''
+	productName.value = ''
+	batchNo.value = ''
+	refresh()
+}
+
+async function openPicker(key) {
+	picker.value.key = key
+	picker.value.show = true
+	picker.value.tip = ''
+	picker.value.loading = false
+	if (key === 'warehouse') {
+		picker.value.current = warehouseId.value
+		picker.value.options = [
+			{ value: '', label: '全部仓库' },
+			...warehouses.value.map((w) => ({
+				value: w.id,
+				label: w.warehouse_name,
+				sub: w.warehouse_code || ''
+			}))
+		]
+	} else if (key === 'docType') {
+		picker.value.current = docType.value
+		picker.value.options = [
+			{ value: '', label: '全部类型' },
+			...docTypes.value.map((t) => ({ value: t.value, label: t.label }))
+		]
+	} else {
+		picker.value.current = productId.value
+		await loadProducts('')
+	}
+}
+
+function closePicker() {
+	picker.value.show = false
+	picker.value.loading = false
+}
+
+async function loadProducts(keyword) {
+	picker.value.loading = true
+	try {
+		const { list: rows, total: sum } = await fetchProducts({ keyword, pageSize: 50 })
+		picker.value.options = rows.map((p) => ({
+			value: p.id,
+			label: p.product_name,
+			sub: [p.product_code, p.spec].filter(Boolean).join(' · '),
+			extra: `${qtyText(p.total_stock)} ${p.base_unit || ''}`
+		}))
+		picker.value.tip = sum > rows.length ? `共 ${sum} 个商品，输入关键字继续找` : ''
+	} finally {
+		picker.value.loading = false
+	}
+}
+
+function onProductSearch(keyword) {
+	loadProducts(keyword)
+}
+
+function onSelect(opt) {
+	const key = picker.value.key
+	if (key === 'warehouse') {
+		warehouseId.value = String(opt.value ?? '')
+		warehouseName.value = warehouseId.value ? opt.label : ''
+	} else if (key === 'docType') {
+		docType.value = String(opt.value ?? '')
+	} else {
+		productId.value = String(opt.value)
+		productName.value = opt.label
+	}
+	closePicker()
+	refresh()
+}
+
+function openDoc(row) {
+	if (!row.doc_id) return
+	uni.navigateTo({ url: `/pages/erp/document/detail?id=${row.doc_id}` })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 40rpx;
+}
+
+.filter-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	background: $color-bg-page;
+	padding: 20rpx $page-padding-x 8rpx;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	height: 72rpx;
+	padding: 0 24rpx;
+	background: $color-card;
+	border-radius: $radius-full;
+	box-shadow: $shadow-card;
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $color-text;
+	}
+
+	.search-clear {
+		font-size: 24rpx;
+		color: $color-text-muted;
+	}
+}
+
+.chip-row {
+	display: flex;
+	gap: 16rpx;
+	margin-top: 18rpx;
+}
+
+.chip {
+	display: inline-flex;
+	align-items: center;
+	gap: 6rpx;
+	padding: 10rpx 22rpx;
+	border-radius: $radius-full;
+	background: $color-card;
+	font-size: 24rpx;
+	color: $color-text-secondary;
+	box-shadow: $shadow-card;
+
+	&.active {
+		background: #2563eb;
+		color: #ffffff;
+	}
+}
+
+.date-row {
+	display: flex;
+	align-items: center;
+	gap: 14rpx;
+	margin-top: 16rpx;
+}
+
+.date-cell {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	height: 56rpx;
+	padding: 0 20rpx;
+	border-radius: $radius-md;
+	background: $color-card;
+	font-size: 23rpx;
+	color: $color-text-secondary;
+}
+
+.date-sep {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.date-clear {
+	font-size: 23rpx;
+	color: $color-primary;
+}
+
+.sum-bar {
+	display: flex;
+	justify-content: space-between;
+	margin: 0 $page-padding-x 16rpx;
+	padding: 0 8rpx;
+}
+
+.sum-item {
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.l-card {
+	@include card;
+	margin: 0 $page-padding-x 20rpx;
+	padding: 22rpx 28rpx;
+
+	&:active {
+		opacity: 0.85;
+	}
+}
+
+.l-head {
+	display: flex;
+	align-items: center;
+	gap: 14rpx;
+}
+
+.l-dir {
+	display: flex;
+	align-items: center;
+	gap: 6rpx;
+	width: 56rpx;
+	height: 44rpx;
+	border-radius: $radius-sm;
+	justify-content: center;
+	font-size: 22rpx;
+	font-weight: 600;
+	flex-shrink: 0;
+
+	&.dir-in {
+		background: rgba(22, 163, 74, 0.1);
+		color: #16a34a;
+	}
+
+	&.dir-out {
+		background: rgba(239, 68, 68, 0.1);
+		color: #ef4444;
+	}
+}
+
+.l-name {
+	flex: 1;
+	min-width: 0;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.l-qty {
+	flex-shrink: 0;
+	font-size: 30rpx;
+	font-weight: 600;
+
+	&.qty-in {
+		color: #16a34a;
+	}
+
+	&.qty-out {
+		color: $color-text;
+	}
+}
+
+.l-sub {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.l-flow {
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	margin-top: 16rpx;
+	padding-top: 14rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.flow-label {
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.flow-qty {
+	font-size: 24rpx;
+	color: $color-text-secondary;
+
+	&.after {
+		font-weight: 600;
+		color: $color-primary-dark;
+	}
+}
+
+.flow-cost {
+	margin-left: auto;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.l-foot {
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+	margin-top: 14rpx;
+}
+
+.foot-doc {
+	flex: 1;
+	min-width: 0;
+	font-size: 23rpx;
+	color: $color-primary;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.foot-time {
+	flex-shrink: 0;
+	font-size: 21rpx;
+	color: $color-text-muted;
+}
+
+.l-op {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 21rpx;
+	color: $color-text-muted;
+}
+
+.load-done {
+	display: flex;
+	justify-content: center;
+	padding: 8rpx 0 24rpx;
+	font-size: 24rpx;
+	color: $color-text-muted;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/pages/erp/stock/warning.vue b/uniapp/pages/erp/stock/warning.vue
new file mode 100644
index 0000000..dc6775a
--- /dev/null
+++ b/uniapp/pages/erp/stock/warning.vue
@@ -0,0 +1,458 @@
+<template>
+	<view class="page">
+		<view class="tab-bar">
+			<view
+				v-for="tab in TABS"
+				:key="tab.key"
+				class="tab"
+				:class="{ active: tabKey === tab.key }"
+				@tap="switchTab(tab.key)"
+			>
+				<text class="tab-label">{{ tab.label }}</text>
+				<text v-if="countOf(tab.key)" class="tab-count">{{ countOf(tab.key) }}</text>
+			</view>
+		</view>
+
+		<view v-if="loading" class="state-box">
+			<text class="state-text">正在盘点预警...</text>
+		</view>
+		<template v-else>
+			<view class="head-line">
+				<text class="head-text">{{ headText }}</text>
+				<text v-if="!isReplenish" class="head-tip">点商品看档案</text>
+			</view>
+
+			<view v-if="!rows.length" class="state-box">
+				<u-empty :text="emptyText" mode="list" />
+			</view>
+
+			<template v-else-if="isReplenish">
+				<view v-for="row in rows" :key="row.product_id" class="w-card">
+					<view class="w-top">
+						<text class="w-name" @tap="openProduct(row)">{{ row.product_name }}</text>
+						<u-tag text="建议补货" type="primary" size="mini" />
+					</view>
+					<text class="w-sub">{{ [row.product_code, row.spec].filter(Boolean).join(' · ') }}</text>
+					<view class="w-grid">
+						<view class="w-cell">
+							<text class="cell-label">现库存</text>
+							<text class="cell-value">{{ qtyText(row.quantity) }} {{ row.unit || '' }}</text>
+						</view>
+						<view class="w-cell">
+							<text class="cell-label">在途</text>
+							<text class="cell-value">{{ qtyText(row.in_transit) }}</text>
+						</view>
+						<view class="w-cell">
+							<text class="cell-label">近30天销量</text>
+							<text class="cell-value">{{ qtyText(row.sold_30) }}</text>
+						</view>
+					</view>
+					<view class="w-sug">
+						<view class="sug-left">
+							<text class="sug-label">建议采购</text>
+							<text class="sug-qty">{{ qtyText(row.suggest_qty) }} {{ row.unit || '' }}</text>
+						</view>
+						<view class="sug-right">
+							<text class="sug-amount">约 ¥{{ moneyText(row.amount) }}</text>
+							<view class="go-btn" @tap="toPurchase(row)">
+								<FaIcon name="cart-plus" color="#ffffff" :size="13" />
+								<text>去开采购单</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</template>
+
+			<template v-else>
+				<view v-for="(row, i) in rows" :key="`${row.product_id}-${row.batch_no || ''}-${i}`" class="w-card">
+					<view class="w-top">
+						<text class="w-name" @tap="openProduct(row)">{{ row.product_name }}</text>
+						<u-tag :text="row.type_label || tabLabel" :type="tagType" size="mini" />
+					</view>
+					<text class="w-sub">
+						{{ [row.category_name, row.warehouse_name, row.batch_no ? '批次 ' + row.batch_no : '']
+							.filter(Boolean).join(' · ') }}
+					</text>
+					<view class="w-grid">
+						<view class="w-cell">
+							<text class="cell-label">库存</text>
+							<text class="cell-value strong">{{ qtyText(row.quantity) }} {{ row.unit || '' }}</text>
+						</view>
+						<view v-if="tabKey !== 'expiring'" class="w-cell">
+							<text class="cell-label">安全库存</text>
+							<text class="cell-value">{{ qtyText(row.safety_qty) }}</text>
+						</view>
+						<view v-if="tabKey === 'over'" class="w-cell">
+							<text class="cell-label">最高库存</text>
+							<text class="cell-value">{{ qtyText(row.max_qty) }}</text>
+						</view>
+						<view v-if="tabKey === 'low'" class="w-cell">
+							<text class="cell-label">在途</text>
+							<text class="cell-value">{{ qtyText(row.in_transit) }}</text>
+						</view>
+						<view v-if="tabKey === 'expiring'" class="w-cell">
+							<text class="cell-label">到期日</text>
+							<text class="cell-value">{{ row.expire_date || '未登记' }}</text>
+						</view>
+					</view>
+					<view class="w-foot">
+						<text v-if="tabKey === 'expiring'" class="foot-warn">
+							{{ expireText(row) }}
+						</text>
+						<text v-else-if="Number(row.suggest_qty) > 0" class="foot-sug">
+							建议{{ row.type === 'over' ? '清仓' : '补货' }} {{ qtyText(row.suggest_qty) }} {{ row.unit || '' }}
+						</text>
+						<view v-if="row.type === 'low' || row.type === 'out'" class="go-mini" @tap="toPurchase(row)">
+							<text>去开采购单</text>
+						</view>
+					</view>
+				</view>
+			</template>
+		</template>
+	</view>
+</template>
+
+<script setup>
+/**
+ * 库存预警与智能补货。
+ * 四类预警一次取回（同源同一份结存快照），切 tab 只换视图不重复打接口；
+ * 补货建议口径更重（含近30天销量与在途），单独按需拉。
+ */
+import { computed, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import FaIcon from '@/components/FaIcon.vue'
+import { fetchReplenish, fetchStockWarning, moneyText, qtyText } from '@/api/erp.js'
+
+const TABS = [
+	{ key: 'low', label: '低库存' },
+	{ key: 'out', label: '缺货' },
+	{ key: 'over', label: '积压' },
+	{ key: 'expiring', label: '效期' },
+	{ key: 'replenish', label: '补货' }
+]
+
+const HEADS = {
+	low: '低于安全库存，按 1.5 倍安全量给出补货建议',
+	out: '库存已清零，销售出库会被拦截',
+	over: '超出最高库存，占资金且易过期',
+	expiring: '30 天内到期的批次，先出先用',
+	replenish: '综合现库存、在途与近 30 天销量的采购建议'
+}
+
+const tabKey = ref('low')
+const warning = ref({ low: [], out: [], over: [], expiring: [], counts: {} })
+const replenish = ref([])
+const loading = ref(true)
+const replenishLoaded = ref(false)
+
+const tabLabel = computed(() => (TABS.find((t) => t.key === tabKey.value) || {}).label || '预警')
+const isReplenish = computed(() => tabKey.value === 'replenish')
+const rows = computed(() => (isReplenish.value ? replenish.value : warning.value[tabKey.value] || []))
+const headText = computed(() => HEADS[tabKey.value] || '')
+const emptyText = computed(() => (isReplenish.value ? '库存充足，暂无补货建议' : '这一类没有预警，库存健康'))
+const tagType = computed(
+	() => ({ low: 'warning', out: 'error', over: 'primary', expiring: 'warning' })[tabKey.value] || 'warning'
+)
+
+onLoad((query = {}) => {
+	if (query.tab && TABS.some((t) => t.key === query.tab)) tabKey.value = query.tab
+	loadWarning()
+})
+
+async function loadWarning() {
+	loading.value = true
+	try {
+		warning.value = await fetchStockWarning()
+	} finally {
+		loading.value = false
+	}
+	if (tabKey.value === 'replenish') loadReplenish()
+}
+
+async function loadReplenish() {
+	if (replenishLoaded.value) return
+	replenishLoaded.value = true
+	try {
+		replenish.value = (await fetchReplenish()).list || []
+	} catch (e) {
+		replenishLoaded.value = false
+	}
+}
+
+function switchTab(key) {
+	if (tabKey.value === key) return
+	tabKey.value = key
+	if (key === 'replenish') loadReplenish()
+}
+
+function countOf(key) {
+	if (key === 'replenish') return replenish.value.length
+	return (warning.value.counts || {})[key] || 0
+}
+
+function expireText(row) {
+	const d = Number(row.expire_in_days)
+	if (!row.expire_date) return '未登记效期'
+	if (d < 0) return `已过期 ${Math.abs(d)} 天，禁止出库`
+	return `还有 ${d} 天到期`
+}
+
+function openProduct(row) {
+	if (!row.product_id) return
+	uni.navigateTo({ url: `/pages/erp/basic/product-detail?id=${row.product_id}` })
+}
+
+function toPurchase(row) {
+	const qty = Number(row.suggest_qty) > 0 ? row.suggest_qty : ''
+	uni.navigateTo({
+		url: `/pages/erp/document/edit?doc_type=purchase_order&product_id=${row.product_id}&quantity=${qty}`
+	})
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/src/styles/page-common.scss';
+
+.page {
+	min-height: 100vh;
+	background: $color-bg-page;
+	padding-bottom: 40rpx;
+}
+
+.tab-bar {
+	position: sticky;
+	top: 0;
+	z-index: 10;
+	display: flex;
+	background: $color-card;
+	box-shadow: $shadow-header;
+	padding: 0 8rpx;
+}
+
+.tab {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 8rpx;
+	padding: 24rpx 0 20rpx;
+	position: relative;
+
+	.tab-label {
+		font-size: 26rpx;
+		color: $color-text-muted;
+	}
+
+	.tab-count {
+		min-width: 32rpx;
+		height: 32rpx;
+		padding: 0 8rpx;
+		border-radius: $radius-full;
+		background: #f1f5f9;
+		color: $color-text-secondary;
+		font-size: 20rpx;
+		line-height: 32rpx;
+		text-align: center;
+	}
+
+	&.active {
+		.tab-label {
+			color: $color-primary;
+			font-weight: 600;
+		}
+
+		.tab-count {
+			background: $color-primary;
+			color: #ffffff;
+		}
+
+		&::after {
+			content: '';
+			position: absolute;
+			bottom: 0;
+			left: 50%;
+			width: 48rpx;
+			height: 6rpx;
+			margin-left: -24rpx;
+			border-radius: 3rpx;
+			background: $color-primary;
+		}
+	}
+}
+
+.head-line {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 16rpx;
+	padding: 22rpx $page-padding-x 6rpx;
+}
+
+.head-text {
+	flex: 1;
+	min-width: 0;
+	font-size: 23rpx;
+	color: $color-text-muted;
+	line-height: 1.5;
+}
+
+.head-tip {
+	flex-shrink: 0;
+	font-size: 22rpx;
+	color: $color-text-muted;
+}
+
+.w-card {
+	@include card;
+	margin: 20rpx $page-padding-x 0;
+	padding: 24rpx 28rpx;
+}
+
+.w-top {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 12rpx;
+}
+
+.w-name {
+	flex: 1;
+	min-width: 0;
+	font-size: 29rpx;
+	font-weight: 500;
+	color: $color-text;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.w-sub {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 23rpx;
+	color: $color-text-muted;
+}
+
+.w-grid {
+	display: flex;
+	gap: 12rpx;
+	margin-top: 18rpx;
+	padding-top: 16rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.w-cell {
+	flex: 1;
+	min-width: 0;
+
+	.cell-label {
+		display: block;
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+
+	.cell-value {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 25rpx;
+		color: $color-text;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+
+		&.strong {
+			font-weight: 600;
+			color: $color-primary-dark;
+		}
+	}
+}
+
+.w-foot {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 16rpx;
+	margin-top: 16rpx;
+}
+
+.foot-sug {
+	font-size: 23rpx;
+	color: $color-primary;
+}
+
+.foot-warn {
+	font-size: 23rpx;
+	color: $color-danger;
+}
+
+.go-mini {
+	flex-shrink: 0;
+	padding: 8rpx 20rpx;
+	border-radius: $radius-full;
+	background: $color-primary-bg;
+	font-size: 22rpx;
+	color: $color-primary-dark;
+}
+
+.w-sug {
+	display: flex;
+	align-items: flex-end;
+	justify-content: space-between;
+	gap: 20rpx;
+	margin-top: 20rpx;
+	padding-top: 18rpx;
+	border-top: 1rpx solid $color-divider;
+}
+
+.sug-left {
+	.sug-label {
+		display: block;
+		font-size: 21rpx;
+		color: $color-text-muted;
+	}
+
+	.sug-qty {
+		display: block;
+		margin-top: 6rpx;
+		font-size: 34rpx;
+		font-weight: 600;
+		color: $color-primary;
+	}
+}
+
+.sug-right {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+	gap: 12rpx;
+
+	.sug-amount {
+		font-size: 23rpx;
+		color: $color-text-secondary;
+	}
+}
+
+.go-btn {
+	display: inline-flex;
+	align-items: center;
+	gap: 8rpx;
+	height: 56rpx;
+	padding: 0 24rpx;
+	border-radius: $radius-full;
+	background: linear-gradient(135deg, #60a5fa, #2563eb);
+	color: #ffffff;
+	font-size: 23rpx;
+}
+
+.state-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 120rpx 40rpx;
+}
+
+.state-text {
+	font-size: 28rpx;
+	color: $color-text-muted;
+}
+</style>
diff --git a/uniapp/utils/nav.js b/uniapp/utils/nav.js
index 8166684..9f94b0b 100644
--- a/uniapp/utils/nav.js
+++ b/uniapp/utils/nav.js
@@ -12,6 +12,28 @@ import { createAppTicket } from '@/api/auth.js'
 
 /** 移动端已有原生页面的功能。匹配顺序即优先级。 */
 const NATIVE_RULES = [
+	// 进销存（移动端原生）：按菜单 path 精确分流，列表所需的 doc_type / bill_type 直接挂在路由 query 上
+	{ pattern: /\/apps\/erp\/(dashboard|workbench)/i, route: '/pages/erp/dashboard/index' },
+	{ pattern: /\/apps\/erp\/basic\/warehouse/i, route: '/pages/erp/basic/warehouse' },
+	{ pattern: /\/apps\/erp\/basic\/product/i, route: '/pages/erp/basic/product' },
+	{ pattern: /\/apps\/erp\/suppliers/i, route: '/pages/erp/partner/index?partner_type=supplier' },
+	{ pattern: /\/apps\/erp\/customers/i, route: '/pages/erp/partner/index?partner_type=customer' },
+	{ pattern: /\/apps\/erp\/purchase\/order/i, route: '/pages/erp/document/index?doc_type=purchase_order' },
+	{ pattern: /\/apps\/erp\/purchase\/inbound/i, route: '/pages/erp/document/index?doc_type=purchase_in' },
+	{ pattern: /\/apps\/erp\/purchase\/return/i, route: '/pages/erp/document/index?doc_type=purchase_return' },
+	{ pattern: /\/apps\/erp\/sales\/order/i, route: '/pages/erp/document/index?doc_type=sales_order' },
+	{ pattern: /\/apps\/erp\/sales\/outbound/i, route: '/pages/erp/document/index?doc_type=sales_out' },
+	{ pattern: /\/apps\/erp\/sales\/return/i, route: '/pages/erp/document/index?doc_type=sales_return' },
+	{ pattern: /\/apps\/erp\/stock\/transfer/i, route: '/pages/erp/document/index?doc_type=transfer' },
+	{ pattern: /\/apps\/erp\/stock\/taking/i, route: '/pages/erp/document/index?doc_type=stock_take' },
+	{ pattern: /\/apps\/erp\/stock\/inbound/i, route: '/pages/erp/document/index?doc_type=other_in' },
+	{ pattern: /\/apps\/erp\/stock\/outbound/i, route: '/pages/erp/document/index?doc_type=other_out' },
+	{ pattern: /\/apps\/erp\/stock\/query/i, route: '/pages/erp/stock/index' },
+	{ pattern: /\/apps\/erp\/stock\/warning/i, route: '/pages/erp/stock/warning' },
+	{ pattern: /\/apps\/erp\/finance\/receivable/i, route: '/pages/erp/finance/bill?bill_type=1' },
+	{ pattern: /\/apps\/erp\/finance\/payable/i, route: '/pages/erp/finance/bill?bill_type=2' },
+	{ pattern: /\/apps\/erp\/finance\/payment/i, route: '/pages/erp/finance/fund' },
+	{ pattern: /\/apps\/erp\/report/i, route: '/pages/erp/report/index' },
 	{ pattern: /记事本|笔记|便签|notebook/i, route: '/pages/tools/notepad/index' },
 	// 「日程提醒」与「工作日程」是两个独立功能：提醒在前，命中"提醒"后即不再落到日历页
 	{ pattern: /提醒|reminder/i, route: '/pages/tools/schedule/reminder' },