Compare commits
27 Commits
4c0207c6e6
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1ff4d5f6c | ||
|
|
4c6d871c35 | ||
|
|
9a84cd0d31 | ||
|
|
e043fd86d1 | ||
|
|
a0c44ff538 | ||
|
|
15122e225a | ||
|
|
127fdb560b | ||
|
|
5e15127a89 | ||
|
|
d7c2c146fe | ||
|
|
d5fd8ac564 | ||
|
|
7d3352038a | ||
|
|
8faa2ea2ef | ||
|
|
8de4339505 | ||
|
|
68aa03b538 | ||
|
|
fbfdd01eec | ||
|
|
5079f97326 | ||
|
|
830476d49d | ||
|
|
47a2d88c9d | ||
|
|
6febc66eca | ||
|
|
45d255cabf | ||
|
|
eddfd157ad | ||
| 09225dd8bc | |||
| 563804f67f | |||
|
|
e95dc8e4f5 | ||
|
|
ca338dd345 | ||
|
|
fac05db39a | ||
|
|
2c8524485b |
@@ -3,7 +3,7 @@ name: 构建并部署前端到测试环境
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- develop
|
||||||
- dev
|
- dev
|
||||||
- test
|
- test
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ jobs:
|
|||||||
- name: 设置镜像标签
|
- name: 设置镜像标签
|
||||||
id: tag
|
id: tag
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
|
if [ "${{ github.ref }}" = "refs/heads/develop" ]; then
|
||||||
echo "tag=latest" >> $GITHUB_OUTPUT
|
echo "tag=latest" >> $GITHUB_OUTPUT
|
||||||
elif [ "${{ github.ref }}" = "refs/heads/dev" ]; then
|
elif [ "${{ github.ref }}" = "refs/heads/dev" ]; then
|
||||||
echo "tag=dev" >> $GITHUB_OUTPUT
|
echo "tag=dev" >> $GITHUB_OUTPUT
|
||||||
@@ -51,8 +51,8 @@ jobs:
|
|||||||
docker push ${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.tag }}
|
docker push ${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.tag }}
|
||||||
docker push ${{ env.IMAGE_NAME }}:${{ github.sha }}
|
docker push ${{ env.IMAGE_NAME }}:${{ github.sha }}
|
||||||
|
|
||||||
- name: 部署到本地(仅 main 分支)
|
- name: 部署到本地(仅 develop 分支)
|
||||||
if: github.ref == 'refs/heads/main'
|
if: github.ref == 'refs/heads/develop'
|
||||||
run: |
|
run: |
|
||||||
# 确保部署目录存在
|
# 确保部署目录存在
|
||||||
mkdir -p ${{ env.DEPLOY_DIR }}
|
mkdir -p ${{ env.DEPLOY_DIR }}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ RUN pnpm run nd
|
|||||||
# ================================
|
# ================================
|
||||||
# 阶段 2: 运行阶段
|
# 阶段 2: 运行阶段
|
||||||
# ================================
|
# ================================
|
||||||
FROM --platform=linux/amd64 nginx:alpine
|
FROM --platform=linux/amd64 nginx:1.31.2-alpine
|
||||||
|
|
||||||
# 使用阿里云镜像源加速
|
# 使用阿里云镜像源加速
|
||||||
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
version: '3.8'
|
version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: registry.boss160.cn/junhong/cmp-admin-web:latest
|
image: registry.boss160.cn/junhong/cmp-admin-web:latest
|
||||||
@@ -9,12 +8,19 @@ services:
|
|||||||
- '3001:80'
|
- '3001:80'
|
||||||
networks:
|
networks:
|
||||||
- junhong-network
|
- junhong-network
|
||||||
|
|
||||||
|
# === 以下是新增的修复内容 ===
|
||||||
|
tmpfs:
|
||||||
|
- /run:rw
|
||||||
|
- /tmp:rw
|
||||||
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ['CMD', 'wget', '--no-verbose', '--tries=1', '--spider', 'http://127.0.0.1:80/health']
|
test: ['CMD', 'wget', '--no-verbose', '--tries=1', '--spider', 'http://127.0.0.1:80/health']
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 5s
|
start_period: 5s
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
driver: 'json-file'
|
driver: 'json-file'
|
||||||
options:
|
options:
|
||||||
|
|||||||
33
openspec/changes/add-asset-batch-realname-policy/proposal.md
Normal file
33
openspec/changes/add-asset-batch-realname-policy/proposal.md
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
# Change: 新增资产批量实名认证策略配置
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
运营需要一次性为多个卡或设备配置实名认证顺序。现有后台仅支持单资产设置实名认证策略,无法满足列表多选后的批量配置需求。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在后台卡列表和设备列表分别增加“批量修改实名顺序”入口,基于当前勾选资产执行配置。
|
||||||
|
- 批量配置弹框展示已选资产数量,并提供“无需实名”“先实名后购买”“先购买后实名”三种互斥策略。
|
||||||
|
- 卡列表调用 `POST /api/admin/iot-cards/batch-update-realname-policy`;设备列表调用 `POST /api/admin/devices/batch-update-realname-policy`。
|
||||||
|
- 批量请求传递 `asset_ids` 和 `realname_policy`;前端限制单次提交至多 500 条,并在超限时阻止提交并明确提示。
|
||||||
|
- 设备批量配置弹框提示“实际H5流程由设备策略决定”。
|
||||||
|
- 后端批量接口按全成全败处理;前端在失败时展示明确的后端业务错误,成功后刷新当前列表。
|
||||||
|
- 前端不根据资产类型、卡类型或其他字段自行覆盖或推导实名认证策略。
|
||||||
|
- 本提案不包含任何 H5 初始化、购买流程或 `effective_realname_policy` 的处理。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `iot-card-management`
|
||||||
|
- `device-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/api/modules/asset.ts` 或对应卡、设备 API 模块
|
||||||
|
- `src/types/api/asset.ts` 或对应卡、设备 API 类型
|
||||||
|
- `src/views/asset-management/iot-card-management/index.vue`
|
||||||
|
- `src/views/asset-management/device-list/index.vue`
|
||||||
|
- API contracts:
|
||||||
|
- `POST /api/admin/iot-cards/batch-update-realname-policy`
|
||||||
|
- `POST /api/admin/devices/batch-update-realname-policy`
|
||||||
|
- Out of scope:
|
||||||
|
- H5 初始化返回字段和购买流程
|
||||||
|
- 单资产实名认证策略设置接口 `PATCH /api/admin/assets/{identifier}/realname-mode`
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Device Batch Realname Policy Configuration
|
||||||
|
|
||||||
|
The device management list SHALL provide a `批量修改实名顺序` action for selected devices. The action SHALL submit the selected device IDs and exactly one realname policy to `POST /api/admin/devices/batch-update-realname-policy`.
|
||||||
|
|
||||||
|
#### Scenario: Open batch realname policy dialog for selected devices
|
||||||
|
|
||||||
|
- **GIVEN** 用户在设备列表勾选了一台或多台设备
|
||||||
|
- **WHEN** 用户点击“批量修改实名顺序”
|
||||||
|
- **THEN** 页面 MUST open a dialog that displays the selected device count
|
||||||
|
- **AND** 页面 MUST provide mutually exclusive options `无需实名`、`先实名后购买` 和 `先购买后实名`
|
||||||
|
- **AND** 页面 MUST display `实际H5流程由设备策略决定` 提示
|
||||||
|
|
||||||
|
#### Scenario: Submit selected device policy
|
||||||
|
|
||||||
|
- **GIVEN** 用户已选择一项实名认证策略
|
||||||
|
- **WHEN** 用户确认批量修改
|
||||||
|
- **THEN** 系统 MUST call `POST /api/admin/devices/batch-update-realname-policy`
|
||||||
|
- **AND** 请求 MUST contain the selected device IDs as `asset_ids`
|
||||||
|
- **AND** 请求 MUST contain the selected `realname_policy` as `none`、`before_order` 或 `after_order`
|
||||||
|
|
||||||
|
#### Scenario: Refresh devices after all-or-nothing success
|
||||||
|
|
||||||
|
- **WHEN** 设备批量实名认证策略接口成功返回
|
||||||
|
- **THEN** 页面 MUST close the dialog
|
||||||
|
- **AND** 页面 MUST refresh the current device list
|
||||||
|
|
||||||
|
#### Scenario: Show failed batch update reason
|
||||||
|
|
||||||
|
- **WHEN** 设备批量实名认证策略接口返回业务失败或请求失败
|
||||||
|
- **THEN** 页面 MUST display the backend business reason when provided
|
||||||
|
- **AND** 页面 MUST NOT refresh the list as a partial-success result
|
||||||
|
|
||||||
|
### Requirement: Device Batch Realname Policy Limit
|
||||||
|
|
||||||
|
The device management list MUST limit each realname policy batch submission to 500 selected devices.
|
||||||
|
|
||||||
|
#### Scenario: Prevent device batch submission over the limit
|
||||||
|
|
||||||
|
- **GIVEN** 用户在设备列表选择超过 500 台设备
|
||||||
|
- **WHEN** 用户尝试确认批量修改实名认证策略
|
||||||
|
- **THEN** 页面 MUST prevent the request from being sent
|
||||||
|
- **AND** 页面 MUST display an explicit maximum-500-items error
|
||||||
|
|
||||||
|
### Requirement: Device Batch Policy Is User Selected
|
||||||
|
|
||||||
|
The device management list MUST submit the policy explicitly selected by the user and MUST NOT infer, override, or transform it from asset type, card type, or other asset fields.
|
||||||
|
|
||||||
|
#### Scenario: Preserve selected device policy value
|
||||||
|
|
||||||
|
- **GIVEN** 用户在批量配置弹框选择任一实名认证策略
|
||||||
|
- **WHEN** 用户确认提交
|
||||||
|
- **THEN** 请求中的 `realname_policy` MUST equal the selected option
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: IoT Card Batch Realname Policy Configuration
|
||||||
|
|
||||||
|
The IoT card management list SHALL provide a `批量修改实名顺序` action for selected cards. The action SHALL submit the selected card IDs and exactly one realname policy to `POST /api/admin/iot-cards/batch-update-realname-policy`.
|
||||||
|
|
||||||
|
#### Scenario: Open batch realname policy dialog for selected cards
|
||||||
|
|
||||||
|
- **GIVEN** 用户在卡列表勾选了一张或多张卡
|
||||||
|
- **WHEN** 用户点击“批量修改实名顺序”
|
||||||
|
- **THEN** 页面 MUST open a dialog that displays the selected card count
|
||||||
|
- **AND** 页面 MUST provide mutually exclusive options `无需实名`、`先实名后购买` 和 `先购买后实名`
|
||||||
|
|
||||||
|
#### Scenario: Submit selected card policy
|
||||||
|
|
||||||
|
- **GIVEN** 用户已选择一项实名认证策略
|
||||||
|
- **WHEN** 用户确认批量修改
|
||||||
|
- **THEN** 系统 MUST call `POST /api/admin/iot-cards/batch-update-realname-policy`
|
||||||
|
- **AND** 请求 MUST contain the selected card IDs as `asset_ids`
|
||||||
|
- **AND** 请求 MUST contain the selected `realname_policy` as `none`、`before_order` 或 `after_order`
|
||||||
|
|
||||||
|
#### Scenario: Refresh cards after all-or-nothing success
|
||||||
|
|
||||||
|
- **WHEN** 卡批量实名认证策略接口成功返回
|
||||||
|
- **THEN** 页面 MUST close the dialog
|
||||||
|
- **AND** 页面 MUST refresh the current card list
|
||||||
|
|
||||||
|
#### Scenario: Show failed batch update reason
|
||||||
|
|
||||||
|
- **WHEN** 卡批量实名认证策略接口返回业务失败或请求失败
|
||||||
|
- **THEN** 页面 MUST display the backend business reason when provided
|
||||||
|
- **AND** 页面 MUST NOT refresh the list as a partial-success result
|
||||||
|
|
||||||
|
### Requirement: IoT Card Batch Realname Policy Limit
|
||||||
|
|
||||||
|
The IoT card management list MUST limit each realname policy batch submission to 500 selected cards.
|
||||||
|
|
||||||
|
#### Scenario: Prevent card batch submission over the limit
|
||||||
|
|
||||||
|
- **GIVEN** 用户在卡列表选择超过 500 张卡
|
||||||
|
- **WHEN** 用户尝试确认批量修改实名认证策略
|
||||||
|
- **THEN** 页面 MUST prevent the request from being sent
|
||||||
|
- **AND** 页面 MUST display an explicit maximum-500-items error
|
||||||
|
|
||||||
|
### Requirement: IoT Card Batch Policy Is User Selected
|
||||||
|
|
||||||
|
The IoT card management list MUST submit the policy explicitly selected by the user and MUST NOT infer, override, or transform it from asset type, card type, or other asset fields.
|
||||||
|
|
||||||
|
#### Scenario: Preserve selected card policy value
|
||||||
|
|
||||||
|
- **GIVEN** 用户在批量配置弹框选择任一实名认证策略
|
||||||
|
- **WHEN** 用户确认提交
|
||||||
|
- **THEN** 请求中的 `realname_policy` MUST equal the selected option
|
||||||
28
openspec/changes/add-asset-batch-realname-policy/tasks.md
Normal file
28
openspec/changes/add-asset-batch-realname-policy/tasks.md
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
## 1. API Contract
|
||||||
|
|
||||||
|
- [x] 1.1 定义批量实名认证策略请求类型,包含 `asset_ids:int64[]` 与 `realname_policy:none|before_order|after_order`。
|
||||||
|
- [x] 1.2 接入卡批量更新接口 `POST /api/admin/iot-cards/batch-update-realname-policy`。
|
||||||
|
- [x] 1.3 接入设备批量更新接口 `POST /api/admin/devices/batch-update-realname-policy`。
|
||||||
|
|
||||||
|
## 2. IoT Card Batch Configuration
|
||||||
|
|
||||||
|
- [x] 2.1 在卡列表多选操作区增加“批量修改实名顺序”入口。
|
||||||
|
- [x] 2.2 弹框展示已选卡数量并提供三种互斥实名认证策略。
|
||||||
|
- [x] 2.3 超过 500 张卡时阻止提交并显示明确提示。
|
||||||
|
- [x] 2.4 成功后关闭弹框并刷新卡列表;失败时保留选择并展示后端业务原因。
|
||||||
|
|
||||||
|
## 3. Device Batch Configuration
|
||||||
|
|
||||||
|
- [x] 3.1 在设备列表多选操作区增加“批量修改实名顺序”入口。
|
||||||
|
- [x] 3.2 弹框展示已选设备数量并提供三种互斥实名认证策略。
|
||||||
|
- [x] 3.3 展示“实际H5流程由设备策略决定”提示。
|
||||||
|
- [x] 3.4 超过 500 台设备时阻止提交并显示明确提示。
|
||||||
|
- [x] 3.5 成功后关闭弹框并刷新设备列表;失败时保留选择并展示后端业务原因。
|
||||||
|
|
||||||
|
## 4. Policy Integrity and Verification
|
||||||
|
|
||||||
|
- [x] 4.1 前端不根据资产类型、卡类型或其他字段覆盖或推导提交策略。
|
||||||
|
- [ ] 4.2 验证卡和设备三种策略均按所选值提交,且单次 500 条以内成功。
|
||||||
|
- [ ] 4.3 验证超过 500 条、后端全成全败失败和网络失败均显示明确错误且不部分刷新列表。
|
||||||
|
- [ ] 4.4 验证设备弹框显示 H5 流程归属提示。
|
||||||
|
- [x] 4.5 运行相关前端校验,并执行 `openspec validate add-asset-batch-realname-policy --strict`。
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
## Context
|
||||||
|
|
||||||
|
运营需要在资产层查看当前主套餐及所有排队主套餐顺序接续后的预计最终到期时间。该结果依赖后端套餐队列、激活条件与计时规则,前端只负责展示接口结果。
|
||||||
|
|
||||||
|
## Goals / Non-Goals
|
||||||
|
|
||||||
|
- Goals:
|
||||||
|
- 在资产详情、IoT 卡列表和设备列表统一展示“预计套餐到期时间”。
|
||||||
|
- 区分可精确预计与待激活后才可计算的状态。
|
||||||
|
- 对临期资产提供基于后端剩余天数的视觉提示。
|
||||||
|
- Non-Goals:
|
||||||
|
- 不修改单个套餐明细的“到期时间”展示或套餐队列顺序。
|
||||||
|
- 不新增预计到期时间筛选、排序或前端日期计算。
|
||||||
|
- 不改变套餐续费、激活或到期规则。
|
||||||
|
|
||||||
|
## Decisions
|
||||||
|
|
||||||
|
- Decision: 统一使用以下五个后台响应字段:`estimated_final_expires_at`、`days_until_final_expiry`、`expiry_estimate_status`、`expiry_estimate_status_name`、`is_expiring`,不调用额外计算接口。
|
||||||
|
- Decision: `expiry_estimate_status` 仅使用 `exact`、`waiting_activation`、`none`、`invalid_data`。除 `exact` 外,`estimated_final_expires_at` 和 `days_until_final_expiry` 必须为 `null`;已过期的 `exact` 资产允许返回负数剩余天数。
|
||||||
|
- Decision: 仅当 `expiry_estimate_status=exact` 且存在 `estimated_final_expires_at` 时格式化展示日期;不可预计状态展示“待激活后起算”。
|
||||||
|
- Decision: `is_expiring=true` 是临期样式的唯一触发条件,`days_until_final_expiry` 只作为剩余天数展示或样式辅助信息,前端不自行判定临期阈值。
|
||||||
|
- Decision: 普通卡和设备列表保持既有服务端返回顺序与前端排序行为,不因临期字段重排。
|
||||||
|
- Alternatives considered: 前端根据当前套餐到期时间、排队套餐时长和计时基准计算最终日期。未采用,因为等待激活和后端队列规则会导致结果不准确。
|
||||||
|
|
||||||
|
## Risks / Trade-offs
|
||||||
|
|
||||||
|
- 后端缺少预计字段时无法显示最终日期 -> 对空值显示稳定占位,不以当前套餐日期替代。
|
||||||
|
- 未知 `expiry_estimate_status` 可能导致错误日期展示 -> 仅 `exact` 可显示日期,其他状态显示稳定占位或后端约定的不可预计提示。
|
||||||
|
- 列表增加时间列会占用宽度 -> 作为可配置动态列,沿用现有横向滚动与列选择能力。
|
||||||
|
|
||||||
|
## Migration Plan
|
||||||
|
|
||||||
|
1. 扩展资产详情及卡、设备列表类型以保留预计最终到期字段。
|
||||||
|
2. 将资产详情响应字段映射到页面状态,并在基础信息区域展示。
|
||||||
|
3. 在卡和设备列表增加预计套餐到期时间列及临期样式。
|
||||||
|
4. 验证无套餐、仅当前套餐、多个排队套餐和待激活后起算四类响应。
|
||||||
|
5. 如需回滚,移除新增展示字段和列表列;不涉及数据迁移。
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- 后端若返回未约定的状态值,前端不得按 `estimated_final_expires_at` 是否为空展示日期,应按不可预计状态处理。
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# Change: 新增资产预计套餐到期时间展示
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
当前页面只能在套餐明细中查看单个套餐的到期时间,运营无法快速了解当前主套餐与全部排队主套餐接续后的资产最终到期时间。前端也不能可靠地自行叠加套餐时长,尤其当套餐需要激活后才开始计时时。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在资产详情、IoT 卡列表和设备列表增加统一的 `预计套餐到期时间` 展示。
|
||||||
|
- 资产详情接口和资产列表响应支持统一的 5 个字段:`estimated_final_expires_at`、`days_until_final_expiry`、`expiry_estimate_status`、`expiry_estimate_status_name` 和 `is_expiring`。
|
||||||
|
- `expiry_estimate_status` 使用 `exact`、`waiting_activation`、`none`、`invalid_data` 四种状态;非 `exact` 状态下日期和剩余天数字段必须为 `null`。
|
||||||
|
- 当 `expiry_estimate_status=exact` 时,展示后端返回的 `estimated_final_expires_at`。
|
||||||
|
- 当套餐尚待激活等无法预计最终日期时,展示“待激活后起算”,不得伪造日期。
|
||||||
|
- 当 `is_expiring=true` 时,按后端返回的剩余天数使用临期颜色提示;普通资产列表不得因临期状态改变既有排序。
|
||||||
|
- 当前套餐自身的到期时间继续仅在套餐明细中展示;前端不得叠加套餐时长计算预计最终到期时间。
|
||||||
|
- 本次仅覆盖后台资产详情、IoT 卡列表和设备列表,不处理 C 端资产信息接口或页面。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `asset-information`
|
||||||
|
- `iot-card-management`
|
||||||
|
- `device-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/types/api/asset.ts`
|
||||||
|
- `src/types/api/card.ts`
|
||||||
|
- `src/types/api/device.ts`
|
||||||
|
- `src/views/asset-management/asset-information/types.ts`
|
||||||
|
- `src/views/asset-management/asset-information/composables/useAssetInfo.ts`
|
||||||
|
- `src/views/asset-management/asset-information/components/BasicInfoCard.vue`
|
||||||
|
- `src/views/asset-management/iot-card-management/index.vue`
|
||||||
|
- `src/views/asset-management/device-list/index.vue`
|
||||||
|
- API contracts:
|
||||||
|
- `GET /api/admin/assets/resolve/{identifier}`
|
||||||
|
- `GET /api/admin/iot-cards/standalone`
|
||||||
|
- `GET /api/admin/devices`
|
||||||
|
- Dependencies:
|
||||||
|
- 后端在资产详情与资产列表响应中返回预计最终到期字段。
|
||||||
|
- Out of scope:
|
||||||
|
- `GET /api/c/v1/asset/info` 及 C 端资产信息页面
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Asset Estimated Final Expiry Contract
|
||||||
|
|
||||||
|
The admin asset information integration SHALL preserve the five backend fields `estimated_final_expires_at`, `days_until_final_expiry`, `expiry_estimate_status`, `expiry_estimate_status_name`, and `is_expiring` returned by `GET /api/admin/assets/resolve/{identifier}`. `estimated_final_expires_at` SHALL be an RFC3339 string or `null`, `days_until_final_expiry` SHALL be an integer or `null`, and `expiry_estimate_status` SHALL be one of `exact`, `waiting_activation`, `none`, or `invalid_data`. This requirement applies only to the admin frontend and excludes C-end asset information.
|
||||||
|
|
||||||
|
#### Scenario: Preserve an exact final expiry estimate
|
||||||
|
|
||||||
|
- **GIVEN** 用户查询后台资产详情
|
||||||
|
- **WHEN** `GET /api/admin/assets/resolve/{identifier}` returns `expiry_estimate_status=exact`
|
||||||
|
- **THEN** 前端状态 MUST preserve `estimated_final_expires_at` as `string | null`
|
||||||
|
- **AND** 前端状态 MUST preserve `days_until_final_expiry` as `number | null`
|
||||||
|
- **AND** 前端状态 MUST preserve `is_expiring` as a boolean
|
||||||
|
- **AND** 前端状态 MUST preserve `expiry_estimate_status_name` as the backend-provided status name
|
||||||
|
|
||||||
|
#### Scenario: Preserve null fields for non-exact estimates
|
||||||
|
|
||||||
|
- **GIVEN** 用户查询后台资产详情
|
||||||
|
- **WHEN** `expiry_estimate_status` is `waiting_activation`, `none`, or `invalid_data`
|
||||||
|
- **THEN** `estimated_final_expires_at` MUST be preserved as `null`
|
||||||
|
- **AND** `days_until_final_expiry` MUST be preserved as `null`
|
||||||
|
- **AND** 前端 MUST NOT calculate either field
|
||||||
|
|
||||||
|
#### Scenario: Preserve an unavailable final expiry estimate
|
||||||
|
|
||||||
|
- **GIVEN** 用户查询后台资产详情
|
||||||
|
- **WHEN** 接口返回待激活或其他不可预计的 `expiry_estimate_status`
|
||||||
|
- **THEN** 前端状态 MUST preserve `expiry_estimate_status`
|
||||||
|
- **AND** 前端 MUST NOT derive `estimated_final_expires_at` from current-package or package-detail fields
|
||||||
|
- **AND** 前端 MUST NOT use `expiry_estimate_status_name` as a substitute for the status enum when choosing the display rule
|
||||||
|
|
||||||
|
### Requirement: Asset Estimated Final Expiry Display
|
||||||
|
|
||||||
|
The admin asset information view SHALL display one asset-level field labeled `预计套餐到期时间` for the current primary package and all queued primary packages, without replacing individual package expiry dates in package details.
|
||||||
|
|
||||||
|
#### Scenario: Display an exact final expiry date
|
||||||
|
|
||||||
|
- **GIVEN** 资产详情返回 `expiry_estimate_status=exact`
|
||||||
|
- **AND** `estimated_final_expires_at` has a value
|
||||||
|
- **WHEN** 页面渲染卡资产或设备资产基础信息
|
||||||
|
- **THEN** 页面 MUST display `预计套餐到期时间`
|
||||||
|
- **AND** 页面 MUST format and display `estimated_final_expires_at`
|
||||||
|
|
||||||
|
#### Scenario: Display activation-pending final expiry
|
||||||
|
|
||||||
|
- **GIVEN** 资产详情返回 `expiry_estimate_status=waiting_activation`
|
||||||
|
- **WHEN** 页面渲染卡资产或设备资产基础信息
|
||||||
|
- **THEN** `预计套餐到期时间` MUST display `待激活后起算`
|
||||||
|
- **AND** 页面 MUST NOT display a fabricated date
|
||||||
|
|
||||||
|
#### Scenario: Handle an unknown estimate status safely
|
||||||
|
|
||||||
|
- **GIVEN** 资产详情返回未约定的 `expiry_estimate_status`
|
||||||
|
- **WHEN** 页面渲染资产基础信息
|
||||||
|
- **THEN** 页面 MUST treat the estimate as unavailable
|
||||||
|
- **AND** 页面 MUST NOT display `estimated_final_expires_at` as a date
|
||||||
|
|
||||||
|
#### Scenario: Display no-package placeholder
|
||||||
|
|
||||||
|
- **GIVEN** 资产没有当前或排队主套餐
|
||||||
|
- **AND** `estimated_final_expires_at` is null or absent
|
||||||
|
- **WHEN** 页面渲染资产基础信息
|
||||||
|
- **THEN** `预计套餐到期时间` MUST display a stable placeholder
|
||||||
|
- **AND** 页面 MUST NOT substitute the current package detail expiry date
|
||||||
|
|
||||||
|
#### Scenario: Highlight backend-designated expiring asset
|
||||||
|
|
||||||
|
- **GIVEN** 资产详情返回 `is_expiring=true`
|
||||||
|
- **WHEN** 页面渲染 `预计套餐到期时间`
|
||||||
|
- **THEN** 页面 MUST apply the expiring visual treatment using `days_until_final_expiry`
|
||||||
|
- **AND** 页面 MUST NOT derive whether the asset is expiring from a locally calculated date difference
|
||||||
|
|
||||||
|
#### Scenario: Preserve package detail expiry semantics
|
||||||
|
|
||||||
|
- **GIVEN** 用户查看资产详情中的套餐明细
|
||||||
|
- **WHEN** 页面渲染单个套餐的到期时间
|
||||||
|
- **THEN** 页面 MUST continue to display that package's own expiry field in the package detail context
|
||||||
|
- **AND** 页面 MUST NOT replace it with `estimated_final_expires_at`
|
||||||
|
|
||||||
|
#### Scenario: Display no-package and invalid-data statuses
|
||||||
|
|
||||||
|
- **GIVEN** 资产详情返回 `expiry_estimate_status=none` 或 `expiry_estimate_status=invalid_data`
|
||||||
|
- **WHEN** 页面渲染资产基础信息
|
||||||
|
- **THEN** `none` MUST display a stable empty placeholder
|
||||||
|
- **AND** `invalid_data` MUST display `数据异常`
|
||||||
|
- **AND** 页面 MUST NOT display a fabricated date
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Device Estimated Final Expiry Display
|
||||||
|
|
||||||
|
The device management list integration SHALL preserve and display the five backend device-level estimated final package expiry fields `estimated_final_expires_at`, `days_until_final_expiry`, `expiry_estimate_status`, `expiry_estimate_status_name`, and `is_expiring` returned in `data.items[]` by `GET /api/admin/devices`. The status SHALL be one of `exact`, `waiting_activation`, `none`, or `invalid_data`; non-`exact` records SHALL have `estimated_final_expires_at=null` and `days_until_final_expiry=null`. The frontend SHALL NOT traverse bound cards or calculate package continuation dates. This requirement applies only to the admin device list.
|
||||||
|
|
||||||
|
#### Scenario: Display exact device final expiry estimate
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表接口返回 `expiry_estimate_status=exact` and `estimated_final_expires_at`
|
||||||
|
- **WHEN** 页面渲染设备列表行
|
||||||
|
- **THEN** 页面 MUST display a column labeled `预计套餐到期时间`
|
||||||
|
- **AND** 该列 MUST format and display `estimated_final_expires_at`
|
||||||
|
|
||||||
|
#### Scenario: Display activation-pending device final expiry
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表接口返回 `expiry_estimate_status=waiting_activation`
|
||||||
|
- **WHEN** 页面渲染设备列表行
|
||||||
|
- **THEN** `预计套餐到期时间` MUST display `待激活后起算`
|
||||||
|
- **AND** 页面 MUST NOT traverse bound cards or display a fabricated date
|
||||||
|
|
||||||
|
#### Scenario: Display device estimate status names for non-exact states
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表接口返回 `expiry_estimate_status=none` 或 `expiry_estimate_status=invalid_data`
|
||||||
|
- **WHEN** 页面渲染设备列表行
|
||||||
|
- **THEN** `none` MUST display a stable empty placeholder
|
||||||
|
- **AND** `invalid_data` MUST display `数据异常`
|
||||||
|
- **AND** 页面 MUST use the status enum to choose the display rule
|
||||||
|
|
||||||
|
#### Scenario: Preserve null fields for non-exact device estimates
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表接口返回 `expiry_estimate_status=none` 或 `expiry_estimate_status=invalid_data`
|
||||||
|
- **THEN** `estimated_final_expires_at` MUST be `null`
|
||||||
|
- **AND** `days_until_final_expiry` MUST be `null`
|
||||||
|
- **AND** 页面 MUST NOT derive either field from绑定卡或套餐数据
|
||||||
|
|
||||||
|
#### Scenario: Highlight expiring device without reordering
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表接口返回 `is_expiring=true` and `days_until_final_expiry`
|
||||||
|
- **WHEN** 页面渲染该设备的预计套餐到期时间
|
||||||
|
- **THEN** 页面 MUST apply the expiring visual treatment based on the backend fields
|
||||||
|
- **AND** 页面 MUST NOT change the ordinary device list sort order because of `is_expiring`
|
||||||
|
|
||||||
|
#### Scenario: Display no-package device placeholder
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表记录没有可预计的最终到期时间
|
||||||
|
- **WHEN** 页面渲染预计套餐到期时间列
|
||||||
|
- **THEN** 页面 MUST display a stable placeholder
|
||||||
|
- **AND** 页面 MUST NOT use an individual package expiry as a substitute
|
||||||
|
|
||||||
|
#### Scenario: Preserve device status name without using it for business calculation
|
||||||
|
|
||||||
|
- **WHEN** 设备列表接口返回 `expiry_estimate_status_name`
|
||||||
|
- **THEN** 前端类型 MUST preserve the field
|
||||||
|
- **AND** 页面 MUST NOT calculate or replace the backend status name
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: IoT Card Estimated Final Expiry Display
|
||||||
|
|
||||||
|
The IoT card management list integration SHALL preserve and display the five backend asset-level estimated final package expiry fields `estimated_final_expires_at`, `days_until_final_expiry`, `expiry_estimate_status`, `expiry_estimate_status_name`, and `is_expiring` returned in `data.items[]` by `GET /api/admin/iot-cards/standalone`. The status SHALL be one of `exact`, `waiting_activation`, `none`, or `invalid_data`; non-`exact` records SHALL have `estimated_final_expires_at=null` and `days_until_final_expiry=null`. The frontend SHALL NOT calculate package continuation dates. This requirement applies only to the admin IoT card list.
|
||||||
|
|
||||||
|
#### Scenario: Display exact card final expiry estimate
|
||||||
|
|
||||||
|
- **GIVEN** 卡列表接口返回 `expiry_estimate_status=exact` and `estimated_final_expires_at`
|
||||||
|
- **WHEN** 页面渲染卡列表行
|
||||||
|
- **THEN** 页面 MUST display a column labeled `预计套餐到期时间`
|
||||||
|
- **AND** 该列 MUST format and display `estimated_final_expires_at`
|
||||||
|
|
||||||
|
#### Scenario: Display activation-pending card final expiry
|
||||||
|
|
||||||
|
- **GIVEN** 卡列表接口返回 `expiry_estimate_status=waiting_activation`
|
||||||
|
- **WHEN** 页面渲染卡列表行
|
||||||
|
- **THEN** `预计套餐到期时间` MUST display `待激活后起算`
|
||||||
|
- **AND** 页面 MUST NOT calculate or display a fabricated date
|
||||||
|
|
||||||
|
#### Scenario: Display card estimate status names for non-exact states
|
||||||
|
|
||||||
|
- **GIVEN** 卡列表接口返回 `expiry_estimate_status=none` 或 `expiry_estimate_status=invalid_data`
|
||||||
|
- **WHEN** 页面渲染卡列表行
|
||||||
|
- **THEN** `none` MUST display a stable empty placeholder
|
||||||
|
- **AND** `invalid_data` MUST display `数据异常`
|
||||||
|
- **AND** 页面 MUST use the status enum to choose the display rule
|
||||||
|
|
||||||
|
#### Scenario: Preserve null fields for non-exact card estimates
|
||||||
|
|
||||||
|
- **GIVEN** 卡列表接口返回 `expiry_estimate_status=none` 或 `expiry_estimate_status=invalid_data`
|
||||||
|
- **THEN** `estimated_final_expires_at` MUST be `null`
|
||||||
|
- **AND** `days_until_final_expiry` MUST be `null`
|
||||||
|
- **AND** 页面 MUST NOT derive either field from套餐数据
|
||||||
|
|
||||||
|
#### Scenario: Highlight expiring card without reordering
|
||||||
|
|
||||||
|
- **GIVEN** 卡列表接口返回 `is_expiring=true` and `days_until_final_expiry`
|
||||||
|
- **WHEN** 页面渲染该卡的预计套餐到期时间
|
||||||
|
- **THEN** 页面 MUST apply the expiring visual treatment based on the backend fields
|
||||||
|
- **AND** 页面 MUST NOT change the ordinary card list sort order because of `is_expiring`
|
||||||
|
|
||||||
|
#### Scenario: Display no-package card placeholder
|
||||||
|
|
||||||
|
- **GIVEN** 卡列表记录没有可预计的最终到期时间
|
||||||
|
- **WHEN** 页面渲染预计套餐到期时间列
|
||||||
|
- **THEN** 页面 MUST display a stable placeholder
|
||||||
|
- **AND** 页面 MUST NOT use an individual package expiry as a substitute
|
||||||
|
|
||||||
|
#### Scenario: Preserve card status name without using it for business calculation
|
||||||
|
|
||||||
|
- **WHEN** 卡列表接口返回 `expiry_estimate_status_name`
|
||||||
|
- **THEN** 前端类型 MUST preserve the field
|
||||||
|
- **AND** 页面 MUST NOT calculate or replace the backend status name
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
## 1. API Contracts And Types
|
||||||
|
|
||||||
|
- [x] 1.1 扩展资产详情响应和资产信息页面状态,支持 5 个预计最终到期字段:`estimated_final_expires_at`、`days_until_final_expiry`、`expiry_estimate_status`、`expiry_estimate_status_name`、`is_expiring`。
|
||||||
|
- [x] 1.2 扩展 IoT 卡和设备列表项类型,支持 5 个预计最终到期字段;不处理 C 端字段。
|
||||||
|
- [x] 1.3 校验四种状态及字段约束:`exact` 可返回日期和剩余天数,其他状态的 `estimated_final_expires_at` 与 `days_until_final_expiry` 必须为 `null`。
|
||||||
|
|
||||||
|
## 2. Asset Information
|
||||||
|
|
||||||
|
- [x] 2.1 将资产解析接口返回的预计最终到期字段映射到资产详情页面状态。
|
||||||
|
- [x] 2.2 在资产详情卡和设备基础信息中展示“预计套餐到期时间”。
|
||||||
|
- [x] 2.3 按 `expiry_estimate_status` 展示:`exact` 显示日期,`waiting_activation` 显示“待激活后起算”,`none` 显示占位,`invalid_data` 显示“数据异常”。
|
||||||
|
- [x] 2.4 `is_expiring=true` 时按 `days_until_final_expiry` 应用临期样式,不根据日期或天数自行推导临期状态。
|
||||||
|
|
||||||
|
## 3. Asset Lists
|
||||||
|
|
||||||
|
- [x] 3.1 在 IoT 卡列表新增“预计套餐到期时间”可配置列,显示接口返回的预计日期或“待激活后起算”。
|
||||||
|
- [x] 3.2 在设备列表新增“预计套餐到期时间”可配置列,显示接口返回的预计日期或“待激活后起算”。
|
||||||
|
- [x] 3.3 在两个列表对 `is_expiring=true` 的预计到期时间使用临期样式,且不改变现有列表排序。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [x] 4.1 验证无套餐时不伪造预计日期并显示稳定占位内容。
|
||||||
|
- [x] 4.2 验证仅当前套餐和存在多个排队主套餐时,资产详情和两个列表均显示后端 `estimated_final_expires_at`。
|
||||||
|
- [x] 4.3 验证等待激活等不可预计状态显示“待激活后起算”,不显示计算出的日期。
|
||||||
|
- [x] 4.4 验证 `is_expiring=true` 时使用临期样式,且卡、设备列表顺序不变。
|
||||||
|
- [x] 4.5 运行相关类型检查、lint 或构建验证。
|
||||||
37
openspec/changes/add-asset-realname-status-filter/design.md
Normal file
37
openspec/changes/add-asset-realname-status-filter/design.md
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
## Context
|
||||||
|
|
||||||
|
卡和设备列表需要新增统一的实名状态筛选与展示能力。设备的实名状态由设备列表接口直接返回,不能通过关联卡在前端二次计算,以避免多卡设备或卡绑定关系变化时出现不一致。
|
||||||
|
|
||||||
|
## Goals / Non-Goals
|
||||||
|
|
||||||
|
- Goals:
|
||||||
|
- 支持按“全部”“已实名”“未实名”筛选卡和设备。
|
||||||
|
- 直接展示后端返回的实名状态名称。
|
||||||
|
- 在搜索、刷新、分页和导出查询中保留当前筛选条件。
|
||||||
|
- Non-Goals:
|
||||||
|
- 不新增或修改实名认证流程、策略配置或状态更新操作。
|
||||||
|
- 不在前端推导设备实名状态。
|
||||||
|
- 不变更其他资产详情页的实名状态取值规则。
|
||||||
|
|
||||||
|
## Decisions
|
||||||
|
|
||||||
|
- Decision: 使用可选数值查询参数 `real_name_status`,其中 `0` 表示未实名、`1` 表示已实名;“全部”对应不传该参数。
|
||||||
|
- Decision: 列表展示优先使用每条记录的 `real_name_status_name`,而非根据 `real_name_status` 写死文案。
|
||||||
|
- Decision: 设备列表把接口响应中的 `real_name_status` 与 `real_name_status_name` 作为唯一状态来源,不读取或遍历绑定卡数据。
|
||||||
|
- Alternatives considered: 前端将 `0` 和 `1` 映射为固定文案。未采用,因为后端已提供标准显示名称,直接使用可避免展示口径分叉。
|
||||||
|
|
||||||
|
## Risks / Trade-offs
|
||||||
|
|
||||||
|
- 后端未返回 `real_name_status_name` 时无法满足状态名称展示契约 -> 联调时校验列表响应字段,并将该字段设为必需的列表类型字段。
|
||||||
|
- 卡列表实名认证筛选依赖单卡列表接口 -> 实施时确保筛选参数发往 `GET /api/admin/iot-cards/standalone`。
|
||||||
|
|
||||||
|
## Migration Plan
|
||||||
|
|
||||||
|
1. 扩展卡与设备列表 API 类型和查询参数。
|
||||||
|
2. 接入筛选控件、查询参数及状态列。
|
||||||
|
3. 验证全部、已实名、未实名筛选以及分页和重置行为。
|
||||||
|
4. 如需回滚,移除前端筛选控件、查询参数和状态列;不涉及数据迁移。
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- 无。
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# Change: 新增卡和设备实名状态筛选
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
运营人员需要在卡列表和设备列表中快速识别并筛选已实名或未实名的资产。当前页面未完整接入实名状态筛选和后端返回的实名状态名称,设备列表尤其不能依赖前端遍历绑定卡来推导状态。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 卡列表和设备列表的筛选区新增“实名状态”,提供“全部”“已实名”“未实名”选项。
|
||||||
|
- 卡列表查询使用 `GET /api/admin/iot-cards/standalone`,设备列表查询使用 `GET /api/admin/devices`;选择状态后分别传递 `real_name_status=0|1`,未选择时不传该参数。
|
||||||
|
- 卡和设备列表项的类型契约支持 `real_name_status: int` 与 `real_name_status_name: string`。
|
||||||
|
- 两个列表表格新增“实名状态”列,直接展示接口返回的 `real_name_status_name`。
|
||||||
|
- 设备列表直接使用设备列表接口的实名状态字段,不遍历或关联绑定卡计算设备实名状态。
|
||||||
|
- 搜索、刷新和分页切换必须保留当前实名状态筛选;重置搜索时清空该筛选。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `iot-card-management`
|
||||||
|
- `device-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/api/modules/card.ts`
|
||||||
|
- `src/api/modules/device.ts`
|
||||||
|
- `src/types/api/card.ts`
|
||||||
|
- `src/types/api/device.ts`
|
||||||
|
- `src/views/asset-management/iot-card-management/index.vue`
|
||||||
|
- `src/views/asset-management/device-list/index.vue`
|
||||||
|
- API contracts:
|
||||||
|
- `GET /api/admin/iot-cards/standalone?real_name_status=0|1`
|
||||||
|
- `GET /api/admin/devices?real_name_status=0|1`
|
||||||
|
- List items return `real_name_status: int` and `real_name_status_name: string`
|
||||||
|
- Dependencies:
|
||||||
|
- 后端列表接口必须支持实名状态查询并返回实名状态名称。
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Device Realname Status Query Contract
|
||||||
|
|
||||||
|
The device management list integration SHALL support an optional numeric `real_name_status` parameter on `GET /api/admin/devices`. The list-item contract SHALL include `real_name_status` and `real_name_status_name` returned by the device list API.
|
||||||
|
|
||||||
|
#### Scenario: Query devices by realname status
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在后台设备列表使用实名状态筛选
|
||||||
|
- **WHEN** 用户选择“已实名”并执行搜索
|
||||||
|
- **THEN** 系统 MUST call `GET /api/admin/devices` with `real_name_status=1`
|
||||||
|
|
||||||
|
#### Scenario: Query unverified devices
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在后台设备列表使用实名状态筛选
|
||||||
|
- **WHEN** 用户选择“未实名”并执行搜索
|
||||||
|
- **THEN** 系统 MUST call `GET /api/admin/devices` with `real_name_status=0`
|
||||||
|
- **AND** 前端 MUST NOT 因为该值为 `0` 而省略此参数
|
||||||
|
|
||||||
|
#### Scenario: Query all devices without status restriction
|
||||||
|
|
||||||
|
- **GIVEN** 用户未选择实名状态或选择“全部”
|
||||||
|
- **WHEN** 用户查询、刷新或切换设备列表分页
|
||||||
|
- **THEN** 请求 MUST NOT 携带 `real_name_status`
|
||||||
|
|
||||||
|
#### Scenario: Receive device realname status fields
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表接口返回设备记录
|
||||||
|
- **WHEN** 前端解析列表响应
|
||||||
|
- **THEN** 列表项类型 MUST 支持 `real_name_status: int`
|
||||||
|
- **AND** 列表项类型 MUST 支持 `real_name_status_name: string`
|
||||||
|
|
||||||
|
### Requirement: Device Realname Status Filter And Display
|
||||||
|
|
||||||
|
The device management page SHALL provide a `实名状态` filter with `全部`、`已实名`、`未实名` options and display the backend device realname status name in the device table.
|
||||||
|
|
||||||
|
#### Scenario: Display device realname status filter
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开后台设备列表
|
||||||
|
- **WHEN** 页面渲染筛选区
|
||||||
|
- **THEN** 页面 MUST display a `实名状态` filter
|
||||||
|
- **AND** 筛选项 MUST provide `全部`、`已实名`、`未实名` options
|
||||||
|
|
||||||
|
#### Scenario: Display backend device realname status name
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表接口返回某条记录的 `real_name_status_name`
|
||||||
|
- **WHEN** 页面渲染该设备的表格行
|
||||||
|
- **THEN** 页面 MUST 在“实名状态”列显示该字段值
|
||||||
|
|
||||||
|
#### Scenario: Use the device API as the status source
|
||||||
|
|
||||||
|
- **GIVEN** 设备列表接口返回设备的实名状态字段
|
||||||
|
- **WHEN** 页面渲染设备实名状态
|
||||||
|
- **THEN** 页面 MUST directly use the record's `real_name_status` and `real_name_status_name`
|
||||||
|
- **AND** 页面 MUST NOT 遍历、绑定或计算关联卡的实名状态
|
||||||
|
|
||||||
|
#### Scenario: Preserve device realname status while paginating
|
||||||
|
|
||||||
|
- **GIVEN** 用户已选择“已实名”或“未实名”并获得筛选结果
|
||||||
|
- **WHEN** 用户切换设备列表页码或每页条数
|
||||||
|
- **THEN** 后续列表请求 MUST 保留当前的 `real_name_status` 参数
|
||||||
|
|
||||||
|
#### Scenario: Reset device realname status filter
|
||||||
|
|
||||||
|
- **GIVEN** 用户已选择实名状态
|
||||||
|
- **WHEN** 用户重置设备列表搜索条件
|
||||||
|
- **THEN** 页面 MUST 清空实名状态筛选
|
||||||
|
- **AND** 后续列表请求 MUST NOT 携带 `real_name_status`
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: IoT Card Realname Status Query Contract
|
||||||
|
|
||||||
|
The IoT card management list integration SHALL query `GET /api/admin/iot-cards/standalone` and support an optional numeric `real_name_status` parameter. The list-item contract SHALL include `real_name_status` and `real_name_status_name`.
|
||||||
|
|
||||||
|
#### Scenario: Query cards by realname status
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在后台卡列表使用实名状态筛选
|
||||||
|
- **WHEN** 用户选择“已实名”并执行搜索
|
||||||
|
- **THEN** 系统 MUST call `GET /api/admin/iot-cards/standalone` with `real_name_status=1`
|
||||||
|
|
||||||
|
#### Scenario: Query unverified cards
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在后台卡列表使用实名状态筛选
|
||||||
|
- **WHEN** 用户选择“未实名”并执行搜索
|
||||||
|
- **THEN** 系统 MUST call `GET /api/admin/iot-cards/standalone` with `real_name_status=0`
|
||||||
|
- **AND** 前端 MUST NOT 因为该值为 `0` 而省略此参数
|
||||||
|
|
||||||
|
#### Scenario: Query all cards without status restriction
|
||||||
|
|
||||||
|
- **GIVEN** 用户未选择实名状态或选择“全部”
|
||||||
|
- **WHEN** 用户查询、刷新或切换卡列表分页
|
||||||
|
- **THEN** 请求 MUST NOT 携带 `real_name_status`
|
||||||
|
|
||||||
|
#### Scenario: Receive card realname status fields
|
||||||
|
|
||||||
|
- **GIVEN** 卡列表接口返回资产记录
|
||||||
|
- **WHEN** 前端解析列表响应
|
||||||
|
- **THEN** 列表项类型 MUST 支持 `real_name_status: int`
|
||||||
|
- **AND** 列表项类型 MUST 支持 `real_name_status_name: string`
|
||||||
|
|
||||||
|
### Requirement: IoT Card Realname Status Filter And Display
|
||||||
|
|
||||||
|
The IoT card management page SHALL provide a `实名状态` filter with `全部`、`已实名`、`未实名` options and display the backend realname status name in the card table.
|
||||||
|
|
||||||
|
#### Scenario: Display card realname status filter
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开后台卡列表
|
||||||
|
- **WHEN** 页面渲染筛选区
|
||||||
|
- **THEN** 页面 MUST display a `实名状态` filter
|
||||||
|
- **AND** 筛选项 MUST provide `全部`、`已实名`、`未实名` options
|
||||||
|
|
||||||
|
#### Scenario: Display backend card realname status name
|
||||||
|
|
||||||
|
- **GIVEN** 卡列表接口返回某条记录的 `real_name_status_name`
|
||||||
|
- **WHEN** 页面渲染该卡的表格行
|
||||||
|
- **THEN** 页面 MUST 在“实名状态”列显示该字段值
|
||||||
|
|
||||||
|
#### Scenario: Preserve card realname status while paginating
|
||||||
|
|
||||||
|
- **GIVEN** 用户已选择“已实名”或“未实名”并获得筛选结果
|
||||||
|
- **WHEN** 用户切换卡列表页码或每页条数
|
||||||
|
- **THEN** 后续列表请求 MUST 保留当前的 `real_name_status` 参数
|
||||||
|
|
||||||
|
#### Scenario: Reset card realname status filter
|
||||||
|
|
||||||
|
- **GIVEN** 用户已选择实名状态
|
||||||
|
- **WHEN** 用户重置卡列表搜索条件
|
||||||
|
- **THEN** 页面 MUST 清空实名状态筛选
|
||||||
|
- **AND** 后续列表请求 MUST NOT 携带 `real_name_status`
|
||||||
26
openspec/changes/add-asset-realname-status-filter/tasks.md
Normal file
26
openspec/changes/add-asset-realname-status-filter/tasks.md
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
## 1. API Contracts And Types
|
||||||
|
|
||||||
|
- [ ] 1.1 扩展卡列表查询参数和列表项类型,支持可选 `real_name_status` 以及必需的 `real_name_status_name`。
|
||||||
|
- [ ] 1.2 扩展设备列表查询参数和列表项类型,支持可选 `real_name_status` 以及必需的 `real_name_status_name`。
|
||||||
|
- [ ] 1.3 将卡列表查询接入 `GET /api/admin/iot-cards/standalone` 并传递实名状态筛选参数。
|
||||||
|
|
||||||
|
## 2. Card List
|
||||||
|
|
||||||
|
- [ ] 2.1 在卡列表筛选区新增“实名状态”的全部、已实名、未实名选项。
|
||||||
|
- [ ] 2.2 将选中的实名状态传递给卡列表查询,并在搜索、刷新、分页、导出中保留该条件。
|
||||||
|
- [ ] 2.3 在卡列表表格新增“实名状态”列,展示接口返回的 `real_name_status_name`。
|
||||||
|
- [ ] 2.4 重置卡列表搜索时清空实名状态筛选。
|
||||||
|
|
||||||
|
## 3. Device List
|
||||||
|
|
||||||
|
- [ ] 3.1 在设备列表筛选区新增“实名状态”的全部、已实名、未实名选项。
|
||||||
|
- [ ] 3.2 将选中的实名状态传递给 `GET /api/admin/devices`,并在搜索、刷新、分页、导出中保留该条件。
|
||||||
|
- [ ] 3.3 在设备列表表格新增“实名状态”列,直接展示接口返回的 `real_name_status_name`,不遍历绑定卡计算状态。
|
||||||
|
- [ ] 3.4 重置设备列表搜索时清空实名状态筛选。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [ ] 4.1 验证卡列表“全部”“已实名”“未实名”分别不传、传 `1`、传 `0`,且状态列显示接口名称。
|
||||||
|
- [ ] 4.2 验证设备列表“全部”“已实名”“未实名”分别不传、传 `1`、传 `0`,且状态列直接显示设备接口名称。
|
||||||
|
- [ ] 4.3 验证两个列表在分页切换、刷新和导出时保留实名状态筛选,重置后清空该条件。
|
||||||
|
- [ ] 4.4 运行相关类型检查、lint 或构建验证。
|
||||||
65
openspec/changes/add-bulk-purchase-upload-task/design.md
Normal file
65
openspec/changes/add-bulk-purchase-upload-task/design.md
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
## Context
|
||||||
|
|
||||||
|
批量订购包含文件上传、异步任务处理、任务恢复和逐行失败查看四个阶段。任务创建需要绑定一个代理商和一种支付方式,线下支付还需要上传整批凭证;任务处理过程中可能出现部分成功和钱包余额不足,前端必须展示后端结果而不能把整批操作当成原子事务。
|
||||||
|
|
||||||
|
## Goals / Non-Goals
|
||||||
|
|
||||||
|
- Goals: 提供批量订单 Excel 上传、支付方式选择、任务进度展示、任务恢复和逐行失败明细。
|
||||||
|
- Goals: 使用 `request_id` 防止重复提交,并按任务 ID 查询服务端真实状态。
|
||||||
|
- Goals: 复用公共异步任务的五态语义和终态规则。
|
||||||
|
- Non-Goals: 不在前端解析 Excel 业务行、不执行订单创建、不计算订单金额、不回滚已成功订单。
|
||||||
|
- Non-Goals: 不改造现有单笔订单创建和单笔支付凭证上传流程。
|
||||||
|
- Non-Goals: 不新增后端模板下载接口。
|
||||||
|
|
||||||
|
## Decisions
|
||||||
|
|
||||||
|
- Decision: 批量订购页面使用独立任务视图,订单列表只提供入口,不把逐行结果嵌入订单列表表格。
|
||||||
|
- Rationale: 批量任务有独立生命周期和大量逐行结果,独立页面更适合恢复、轮询和分页查看。
|
||||||
|
|
||||||
|
- Decision: `payment_method` 在创建表单中为单选值,并在请求中对整批固定;线下支付时才允许提交 `voucher_file`。
|
||||||
|
- Rationale: 产品明确一个批次不能混合支付方式,前端应避免生成含混请求。
|
||||||
|
|
||||||
|
- Decision: 使用前端静态 Excel 模板资源。
|
||||||
|
- Rationale: 产品明确模板下载不依赖后端动态生成,减少接口依赖。
|
||||||
|
|
||||||
|
- Decision: 使用 `request_id` 作为客户端幂等键,并在创建前生成一次、提交重试时复用同一值。
|
||||||
|
- Rationale: 防止网络重试或重复点击创建多个相同批次。
|
||||||
|
|
||||||
|
- Decision: 部分成功、钱包余额不足和逐行业务失败均由后端任务结果表达;前端只展示计数和失败明细,不自行推断或回滚。
|
||||||
|
- Rationale: 钱包扣款和订单事务边界属于后端职责,前端不能可靠重建。
|
||||||
|
|
||||||
|
## Data Model
|
||||||
|
|
||||||
|
- Create request: `shop_id`、`payment_method`、`file`、可选 `voucher_file`、`request_id`。
|
||||||
|
- Task identity: `task_id`、`task_no`。
|
||||||
|
- Task status: `1=待处理`、`2=处理中`、`3=已完成`、`4=已失败`、`5=已取消`;部分成功仍属于已完成终态。
|
||||||
|
- Task summary: status, total count, success count, failed count, amount summary, timestamps and safe error summary when returned.
|
||||||
|
- Item result: row number, asset identifier, package code, row status and safe error reason.
|
||||||
|
- Item query: task ID, page, size and optional row status filter.
|
||||||
|
|
||||||
|
## Risks / Trade-offs
|
||||||
|
|
||||||
|
- Risk: 后端金额字段名称或单位未在产品文档中明确。
|
||||||
|
- Mitigation: API 类型和页面以接口实际返回字段为准,统一标注金额单位;实施前补齐字段契约,前端不自行计算汇总。
|
||||||
|
|
||||||
|
- Risk: 文件或凭证上传成功但任务创建请求失败,可能留下孤立对象。
|
||||||
|
- Mitigation: 创建失败时保留用户选择和错误提示;对象清理策略由后端存储生命周期或接口约定处理。
|
||||||
|
|
||||||
|
- Risk: 任务详情恢复时任务已过期、删除或用户失去权限。
|
||||||
|
- Mitigation: 按页面权限和接口错误处理展示对应状态,不重复创建原任务。
|
||||||
|
|
||||||
|
## Migration Plan
|
||||||
|
|
||||||
|
1. 确认批量订购任务摘要、金额和逐行结果字段契约。
|
||||||
|
2. 新增 API、类型、权限和静态模板资源。
|
||||||
|
3. 实现批量订购入口、文件上传、线下凭证上传和幂等提交。
|
||||||
|
4. 实现任务详情、公共状态展示、轮询和 `task_id` 恢复。
|
||||||
|
5. 实现逐行结果分页、状态筛选和失败明细展示。
|
||||||
|
6. 验证钱包余额不足、部分成功、重复提交、刷新恢复和权限组合。
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- 批量订购任务摘要中的金额字段名称、金额单位和金额分类需要以后端接口文档确认。
|
||||||
|
- 失败明细中的资产字段是统一 `asset_identifier`,还是按资产类型返回 `iccid` / `virtual_no`,需要以后端确认。
|
||||||
|
- `voucher_file` 是单文件、文件数组还是已上传对象存储 key,需要与 multipart 接口契约确认。
|
||||||
|
- 批量订购入口的最终路由、菜单名称和权限编码需要产品/后端确认。
|
||||||
38
openspec/changes/add-bulk-purchase-upload-task/proposal.md
Normal file
38
openspec/changes/add-bulk-purchase-upload-task/proposal.md
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
# Change: 新增批量订购任务与逐行结果
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
运营需要为同一个代理商批量导入套餐订单,并统一指定整批支付方式。当前订单页面只支持单笔创建,无法上传批量订单文件、跟踪处理进度或定位逐行失败原因,批量操作也无法安全处理线下支付凭证和钱包余额不足场景。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 新增批量订购套餐入口,支持选择代理商、整批支付方式和上传 Excel 文件。
|
||||||
|
- 支持线下支付时上传整批支付凭证;一个批次禁止混合支付方式。
|
||||||
|
- 模板下载使用前端静态文件,不依赖后端模板接口。
|
||||||
|
- 新增批量订购任务 API,提交 multipart 字段 `shop_id`、`payment_method`、`file`、`voucher_file` 和 `request_id`。
|
||||||
|
- 创建成功后展示任务号、任务状态、总数、成功数、失败数和金额汇总。
|
||||||
|
- 支持按 `task_id` 恢复任务详情,并轮询进行中的任务。
|
||||||
|
- 新增逐行结果查询,支持分页和状态筛选。
|
||||||
|
- 失败明细展示行号、资产、套餐编码和错误原因。
|
||||||
|
- 部分成功作为任务终态;钱包余额不足只影响对应行或后续行,不回滚已经成功的订单。
|
||||||
|
- 接入现有 RBAC 权限体系,批量订购创建、任务详情、逐行结果和模板下载权限独立控制。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `bulk-purchase-task`
|
||||||
|
- `order-management`
|
||||||
|
- `async-task-interaction`(复用现有公共异步任务状态与恢复规则)
|
||||||
|
- Affected code:
|
||||||
|
- `src/api/modules/bulkPurchase.ts`
|
||||||
|
- `src/types/api/bulkPurchase.ts`
|
||||||
|
- `src/views/order-management/bulk-purchase/index.vue`
|
||||||
|
- `src/components/business/BulkPurchaseCreateDialog.vue`(如采用独立弹窗)
|
||||||
|
- `src/views/order-management/order-list/index.vue`(批量入口)
|
||||||
|
- 静态 Excel 模板资源、路由、菜单、权限和国际化配置
|
||||||
|
- Dependencies:
|
||||||
|
- 后端提供三个批量订购接口及 multipart 鉴权契约。
|
||||||
|
- 对象存储上传能力支持批量订单文件和线下支付凭证上传。
|
||||||
|
- 需要确认批量订购任务的完整响应字段和并发轮询策略与公共异步任务规范一致。
|
||||||
|
- Breaking changes:
|
||||||
|
- 无。新增 API、页面、权限和任务能力,不修改单笔订单创建接口。
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Bulk Purchase Creation Form
|
||||||
|
|
||||||
|
The admin frontend SHALL provide a bulk purchase form that binds one uploaded batch to one shop and one payment method.
|
||||||
|
|
||||||
|
#### Scenario: Select batch purchase inputs
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开批量订购入口
|
||||||
|
- **WHEN** 用户填写批量订购表单
|
||||||
|
- **THEN** 页面 MUST require a target shop, one payment method, and an Excel file
|
||||||
|
- **AND** 页面 MUST NOT provide a way to mix payment methods within the same batch
|
||||||
|
|
||||||
|
#### Scenario: Show voucher upload for offline payment
|
||||||
|
|
||||||
|
- **GIVEN** 用户选择线下支付
|
||||||
|
- **WHEN** 页面渲染批量订购表单
|
||||||
|
- **THEN** 页面 MUST show the batch voucher upload control
|
||||||
|
- **AND** 页面 MUST require a completed voucher upload before task creation
|
||||||
|
|
||||||
|
#### Scenario: Hide voucher upload for wallet payment
|
||||||
|
|
||||||
|
- **GIVEN** 用户选择代理钱包支付
|
||||||
|
- **WHEN** 页面渲染或提交批量订购表单
|
||||||
|
- **THEN** 页面 MUST NOT submit a voucher file
|
||||||
|
- **AND** 页面 MUST clear or ignore a voucher selected before switching to wallet payment
|
||||||
|
|
||||||
|
### Requirement: Bulk Purchase File Upload And Creation
|
||||||
|
|
||||||
|
The admin frontend SHALL create a bulk purchase task through `POST /api/admin/bulk-purchases` using multipart form data.
|
||||||
|
|
||||||
|
#### Scenario: Create bulk purchase task
|
||||||
|
|
||||||
|
- **GIVEN** 用户已选择代理商、支付方式并完成文件上传
|
||||||
|
- **WHEN** 用户确认创建批量订购任务
|
||||||
|
- **THEN** 系统 MUST submit multipart fields `shop_id`, `payment_method`, `file`, and `request_id`
|
||||||
|
- **AND** 系统 MUST submit `voucher_file` when the payment method is offline
|
||||||
|
- **AND** 系统 MUST save the returned `task_id` and `task_no`
|
||||||
|
|
||||||
|
#### Scenario: Prevent creation during upload
|
||||||
|
|
||||||
|
- **GIVEN** Excel 文件或线下支付凭证仍在上传
|
||||||
|
- **WHEN** 用户点击创建任务
|
||||||
|
- **THEN** 页面 MUST prevent task creation
|
||||||
|
- **AND** 页面 MUST show the upload-in-progress state until all required uploads finish
|
||||||
|
|
||||||
|
#### Scenario: Download static template
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开批量订购表单
|
||||||
|
- **WHEN** 用户点击模板下载
|
||||||
|
- **THEN** 页面 MUST download the packaged frontend static Excel template
|
||||||
|
- **AND** 页面 MUST NOT require a template-generation API request
|
||||||
|
|
||||||
|
### Requirement: Bulk Purchase Task Summary And Status
|
||||||
|
|
||||||
|
The admin frontend SHALL display the server-provided bulk purchase task summary and use the shared five-state async task semantics.
|
||||||
|
|
||||||
|
#### Scenario: Display task summary
|
||||||
|
|
||||||
|
- **GIVEN** 批量订购任务创建成功或详情接口返回任务
|
||||||
|
- **WHEN** 页面展示任务详情
|
||||||
|
- **THEN** 页面 MUST display task ID or task number, status, total count, success count, failed count, and returned amount summaries
|
||||||
|
- **AND** 页面 MUST use server-provided values without recalculating amounts or counts from the uploaded file
|
||||||
|
|
||||||
|
#### Scenario: Treat partial success as terminal completion
|
||||||
|
|
||||||
|
- **GIVEN** 任务已处理完成且同时存在成功行和失败行
|
||||||
|
- **WHEN** 页面展示任务状态
|
||||||
|
- **THEN** 页面 MUST display the task as a completed terminal task
|
||||||
|
- **AND** 页面 MUST display success and failed counts separately
|
||||||
|
- **AND** 页面 MUST NOT introduce a separate partial-success status
|
||||||
|
|
||||||
|
#### Scenario: Handle wallet insufficiency without rollback
|
||||||
|
|
||||||
|
- **GIVEN** 代理钱包余额不足导致部分或后续行无法创建订单
|
||||||
|
- **WHEN** 页面展示任务结果
|
||||||
|
- **THEN** 页面 MUST show the affected rows as failed with their returned reasons
|
||||||
|
- **AND** 页面 MUST preserve and display rows that were already successful
|
||||||
|
- **AND** 页面 MUST NOT attempt a frontend rollback
|
||||||
|
|
||||||
|
### Requirement: Bulk Purchase Task Recovery And Polling
|
||||||
|
|
||||||
|
The admin frontend SHALL recover a bulk purchase task by `task_id` and poll its summary while it is active.
|
||||||
|
|
||||||
|
#### Scenario: Query task summary
|
||||||
|
|
||||||
|
- **GIVEN** 用户需要加载批量订购任务
|
||||||
|
- **WHEN** 页面查询任务摘要
|
||||||
|
- **THEN** 系统 MUST call `GET /api/admin/bulk-purchases/{task_id}`
|
||||||
|
- **AND** 页面 MUST update the task summary from the response
|
||||||
|
|
||||||
|
#### Scenario: Recover task after refresh
|
||||||
|
|
||||||
|
- **GIVEN** 页面存在已保存的 active `task_id`
|
||||||
|
- **WHEN** 用户刷新页面或重新进入批量订购任务页
|
||||||
|
- **THEN** 页面 MUST query the existing task by `task_id`
|
||||||
|
- **AND** 页面 MUST NOT create another bulk purchase task
|
||||||
|
|
||||||
|
#### Scenario: Stop polling at terminal state
|
||||||
|
|
||||||
|
- **GIVEN** 批量订购任务状态为已完成、已失败或已取消
|
||||||
|
- **WHEN** 页面收到任务摘要
|
||||||
|
- **THEN** 页面 MUST stop automatic polling
|
||||||
|
- **AND** 页面 MUST retain the terminal summary and failure counts for viewing
|
||||||
|
|
||||||
|
### Requirement: Bulk Purchase Item Results
|
||||||
|
|
||||||
|
The admin frontend SHALL provide paginated and status-filterable row results for a bulk purchase task.
|
||||||
|
|
||||||
|
#### Scenario: Query item results
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开批量订购任务结果
|
||||||
|
- **WHEN** 页面加载逐行结果
|
||||||
|
- **THEN** 系统 MUST call `GET /api/admin/bulk-purchases/{task_id}/items`
|
||||||
|
- **AND** 系统 MUST support `page`, `size`, and optional `status` query parameters
|
||||||
|
|
||||||
|
#### Scenario: Display failed item details
|
||||||
|
|
||||||
|
- **GIVEN** 逐行结果接口返回失败行
|
||||||
|
- **WHEN** 页面渲染结果表格
|
||||||
|
- **THEN** 页面 MUST display row number, asset identifier, package code, and safe error reason
|
||||||
|
- **AND** 页面 MUST NOT expose raw backend stack traces or technical error details
|
||||||
|
|
||||||
|
### Requirement: Bulk Purchase Permissions
|
||||||
|
|
||||||
|
The admin frontend SHALL gate bulk purchase creation, task viewing, item-result viewing, and template download with explicit permissions.
|
||||||
|
|
||||||
|
#### Scenario: Hide unauthorized bulk purchase operations
|
||||||
|
|
||||||
|
- **GIVEN** 当前用户缺少某项批量订购权限
|
||||||
|
- **WHEN** 页面渲染对应入口或操作
|
||||||
|
- **THEN** 页面 MUST NOT display or enable that operation
|
||||||
|
- **AND** direct API failure MUST NOT be treated as permission to continue
|
||||||
46
openspec/changes/add-bulk-purchase-upload-task/tasks.md
Normal file
46
openspec/changes/add-bulk-purchase-upload-task/tasks.md
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
## 1. Contract And Types
|
||||||
|
|
||||||
|
- [ ] 1.1 确认 `POST /api/admin/bulk-purchases` 的 multipart 字段类型、文件字段格式和响应结构。
|
||||||
|
- [ ] 1.2 确认 `GET /api/admin/bulk-purchases/{task_id}` 的任务摘要字段、状态值、金额字段和错误字段。
|
||||||
|
- [ ] 1.3 确认 `GET /api/admin/bulk-purchases/{task_id}/items` 的逐行字段、分页结构和状态筛选参数。
|
||||||
|
- [x] 1.4 新增批量订购 API service、请求类型、任务摘要类型和逐行结果类型。
|
||||||
|
- [x] 1.5 明确 `request_id` 的生成、保存和重复提交响应处理规则。
|
||||||
|
|
||||||
|
## 2. Upload And Create
|
||||||
|
|
||||||
|
- [x] 2.1 新增批量订购入口和表单,支持选择代理商、支付方式和 Excel 文件。
|
||||||
|
- [x] 2.2 提供前端静态 Excel 模板下载,并限制上传文件类型和必要的文件状态。
|
||||||
|
- [x] 2.3 线下支付时显示整批支付凭证上传,钱包支付时隐藏或清理凭证字段。
|
||||||
|
- [x] 2.4 复用订单列表已有 `VoucherUpload` 组件展示凭证上传进度,上传未完成时禁止创建任务。
|
||||||
|
- [x] 2.5 创建请求携带 `shop_id`、`payment_method`、`file`、必要的 `voucher_file` 和 `request_id`。
|
||||||
|
- [x] 2.6 防止重复点击和重复提交,创建成功后保存 `task_id` 并进入任务详情。
|
||||||
|
|
||||||
|
## 3. Task Progress And Recovery
|
||||||
|
|
||||||
|
- [x] 3.1 展示任务号、状态、总数、成功数、失败数、金额汇总和安全错误摘要。
|
||||||
|
- [x] 3.2 按公共异步任务规则轮询待处理和处理中的任务,并在终态停止。
|
||||||
|
- [x] 3.3 页面刷新或通过任务 ID 重新进入时恢复任务详情,不重复创建批次。
|
||||||
|
- [x] 3.4 将部分成功展示为已完成终态,并同时展示成功数和失败数。
|
||||||
|
- [x] 3.5 展示钱包余额不足导致的逐行或后续行失败,不回滚已成功订单。
|
||||||
|
|
||||||
|
## 4. Item Results
|
||||||
|
|
||||||
|
- [x] 4.1 新增逐行结果表格,展示行号、资产、套餐编码、状态和错误原因。
|
||||||
|
- [x] 4.2 支持按逐行状态筛选和分页查询。
|
||||||
|
- [x] 4.3 失败原因优先展示后端安全错误文案,不直接展示底层技术错误。
|
||||||
|
- [x] 4.4 任务详情和逐行结果保持当前任务 ID、筛选条件和分页状态。
|
||||||
|
|
||||||
|
## 5. Permissions And Verification
|
||||||
|
|
||||||
|
- [x] 5.1 为批量订购创建、任务详情、逐行结果和模板下载配置独立权限。
|
||||||
|
- [ ] 5.2 验证一个批次只能提交一种支付方式,线下支付缺少凭证时不能提交。
|
||||||
|
- [ ] 5.3 验证重复提交复用 `request_id`,不会创建重复任务。
|
||||||
|
- [ ] 5.4 验证空文件、上传失败、任务失败、部分成功和钱包余额不足场景。
|
||||||
|
- [ ] 5.5 验证页面刷新恢复、任务终态停止轮询和逐行失败筛选。
|
||||||
|
- [x] 5.6 运行 `openspec validate add-bulk-purchase-upload-task --strict`、类型检查、lint 和构建。
|
||||||
|
|
||||||
|
## Implementation Notes
|
||||||
|
|
||||||
|
- 后端接口文档未随仓库提供,1.1、1.2、1.3 仍需联调确认精确金额字段、逐行字段和 multipart 文件格式;当前类型使用可选兼容字段。
|
||||||
|
- 5.2 至 5.5 需要接入真实后端后进行手工回归,当前已完成前端校验、权限、幂等键、恢复、轮询和筛选逻辑。
|
||||||
|
- 支付凭证复用 `src/components/business/VoucherUpload.vue`,提交 `voucher_file` 时使用该组件上传后返回的文件 key。
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
## Context
|
||||||
|
|
||||||
|
三个后台业务列表都需要展示相同的审批摘要,但各自保留既有退款、充值或换货操作。审批来源和业务处理状态均由后端列表接口返回,前端不请求单条审批详情来填充表格。
|
||||||
|
|
||||||
|
## Goals / Non-Goals
|
||||||
|
|
||||||
|
- Goals:
|
||||||
|
- 统一展示提交人、审批状态、当前审批人摘要和业务处理状态。
|
||||||
|
- 正确区分无审批、历史本地审批和企微审批。
|
||||||
|
- 在不增加逐行请求的前提下支持长摘要完整查看。
|
||||||
|
- Non-Goals:
|
||||||
|
- 不创建、修改或撤回审批流程。
|
||||||
|
- 不增加历史本地审批操作按钮。
|
||||||
|
- 不以 `approval_status` 推断 `processing_status`,或反向推断。
|
||||||
|
|
||||||
|
## Decisions
|
||||||
|
|
||||||
|
- Decision: 三个列表项模型复用相同名称和语义的审批摘要字段,字段由各自的列表接口直接返回。
|
||||||
|
- Decision: `approval_source=none` 时审批状态与当前审批人摘要均显示 `-`;`legacy` 时审批状态固定显示“历史审批”,当前审批人摘要显示 `-`;`wecom` 时直接展示 `approval_status_name` 和 `current_approver_summary`。
|
||||||
|
- Decision: 审批人摘要仅负责展示,使用表格溢出省略与 tooltip 呈现完整文本。
|
||||||
|
- Decision: 业务处理状态单独读取 `processing_status_name`,不与审批状态混合或映射。
|
||||||
|
- Decision: 列表分页和刷新仅调用现有列表 API,禁止为每条记录请求审批详情。
|
||||||
|
- Alternatives considered: 从单条详情或企微审批 API 批量补齐摘要。未采用,因为会引入 N+1 请求并与列表响应已提供的摘要字段重复。
|
||||||
|
|
||||||
|
## Risks / Trade-offs
|
||||||
|
|
||||||
|
- 后端遗漏摘要字段时信息不可用 -> 统一显示稳定占位,不影响原有列表和业务操作。
|
||||||
|
- 审批状态名称可能为空 -> 企微来源显示稳定占位,不自行翻译状态码。
|
||||||
|
- 审批人摘要长度不受控 -> 表格列使用溢出省略和 hover 完整文本。
|
||||||
|
|
||||||
|
## Migration Plan
|
||||||
|
|
||||||
|
1. 扩展三个列表项类型以保留审批摘要字段。
|
||||||
|
2. 在三个列表中添加四个展示列并遵循审批来源规则。
|
||||||
|
3. 验证 `none`、`legacy`、`wecom` 和处理状态为空的响应。
|
||||||
|
4. 验证刷新、分页未出现逐行审批详情请求。
|
||||||
|
5. 如需回滚,移除列表列与附加类型字段;不涉及数据迁移。
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- 无。
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# Change: 新增业务列表提交人与审批摘要
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
退款、代理充值和换货列表当前无法直接显示提交人、企微审批进度及业务处理进度。运营人员需要进入详情或依赖额外沟通才能判断记录由谁发起、审批进行到哪一步以及后续业务是否完成。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在退款列表、代理充值列表和换货列表增加“提交人”“审批状态”“当前审批人摘要”“业务处理状态”四列。
|
||||||
|
- 三个列表接口项统一支持 `submitter_name`、`approval_source`、`approval_status`、`approval_status_name`、`current_approver_summary`、`processing_status`、`processing_status_name`。
|
||||||
|
- `approval_source=none` 时审批状态和当前审批人摘要显示 `-`。
|
||||||
|
- `approval_source=legacy` 时审批状态显示“历史审批”,作为只读历史信息,不新增审批操作按钮。
|
||||||
|
- `approval_source=wecom` 时显示后端返回的企微审批状态及当前审批人摘要;超长审批人摘要使用省略显示并在悬浮时展示完整文本。
|
||||||
|
- 业务处理状态直接展示后端 `processing_status_name`,与审批状态分列展示。
|
||||||
|
- 列表仅使用列表响应中的审批摘要字段,翻页和刷新时不得为每行额外请求审批详情。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `order-management`
|
||||||
|
- `agent-recharge`
|
||||||
|
- `exchange-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/types/api/refund.ts`
|
||||||
|
- `src/types/api/agentRecharge.ts`
|
||||||
|
- `src/api/modules/exchange.ts`
|
||||||
|
- `src/views/finance/refund/index.vue`
|
||||||
|
- `src/views/finance/agent-recharge/index.vue`
|
||||||
|
- `src/views/asset-management/exchange-management/index.vue`
|
||||||
|
- API contracts:
|
||||||
|
- `GET /api/admin/refunds`
|
||||||
|
- `GET /api/admin/agent-recharges`
|
||||||
|
- `GET /api/admin/exchanges`
|
||||||
|
- Out of scope:
|
||||||
|
- 审批发起、撤回、审批操作或企微审批详情页。
|
||||||
|
- 前端根据业务状态或审批步骤推导审批结果和业务处理状态。
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Agent Recharge List Approval Summary Contract
|
||||||
|
|
||||||
|
The `GET /api/admin/agent-recharges` list-item contract SHALL support `submitter_name`, `approval_source`, `approval_status`, `approval_status_name`, `current_approver_summary`, `processing_status`, and `processing_status_name`.
|
||||||
|
|
||||||
|
#### Scenario: Receive agent recharge approval summary fields
|
||||||
|
|
||||||
|
- **GIVEN** 后台代理充值列表接口返回充值记录
|
||||||
|
- **WHEN** 前端解析列表响应
|
||||||
|
- **THEN** 代理充值列表项类型 MUST preserve all approval and processing summary fields
|
||||||
|
- **AND** 页面 MUST NOT request an individual approval-detail API to populate the row
|
||||||
|
|
||||||
|
### Requirement: Agent Recharge List Approval And Processing Display
|
||||||
|
|
||||||
|
The agent recharge list SHALL display `提交人`, `审批状态`, `当前审批人摘要`, and `业务处理状态` as distinct columns based on backend summary fields.
|
||||||
|
|
||||||
|
#### Scenario: Display recharge with no approval source
|
||||||
|
|
||||||
|
- **GIVEN** 代理充值记录的 `approval_source=none`
|
||||||
|
- **WHEN** 页面渲染代理充值列表行
|
||||||
|
- **THEN** `审批状态` MUST display `-`
|
||||||
|
- **AND** `当前审批人摘要` MUST display `-`
|
||||||
|
|
||||||
|
#### Scenario: Display legacy recharge approval read-only
|
||||||
|
|
||||||
|
- **GIVEN** 代理充值记录的 `approval_source=legacy`
|
||||||
|
- **WHEN** 页面渲染代理充值列表行
|
||||||
|
- **THEN** `审批状态` MUST display `历史审批`
|
||||||
|
- **AND** 页面 MUST NOT add an approval operation button for that historical approval
|
||||||
|
|
||||||
|
#### Scenario: Display WeCom recharge approval summary
|
||||||
|
|
||||||
|
- **GIVEN** 代理充值记录的 `approval_source=wecom`
|
||||||
|
- **WHEN** 页面渲染代理充值列表行
|
||||||
|
- **THEN** `审批状态` MUST display backend `approval_status_name`
|
||||||
|
- **AND** `当前审批人摘要` MUST display backend `current_approver_summary`
|
||||||
|
- **AND** `业务处理状态` MUST independently display backend `processing_status_name`
|
||||||
|
|
||||||
|
#### Scenario: View long recharge approver summary
|
||||||
|
|
||||||
|
- **GIVEN** 代理充值记录的 `current_approver_summary` exceeds its table cell width
|
||||||
|
- **WHEN** 页面渲染当前审批人摘要列
|
||||||
|
- **THEN** 摘要 MUST be visually truncated in the cell
|
||||||
|
- **AND** 用户 MUST be able to view the complete backend text on hover
|
||||||
|
|
||||||
|
#### Scenario: Paginate recharges without per-row approval requests
|
||||||
|
|
||||||
|
- **WHEN** 用户切换代理充值列表页码或刷新列表
|
||||||
|
- **THEN** 页面 MUST use the agent recharge list API response for approval summaries
|
||||||
|
- **AND** 页面 MUST NOT issue approval-detail requests per recharge row
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Exchange List Approval Summary Contract
|
||||||
|
|
||||||
|
The `GET /api/admin/exchanges` list-item contract SHALL support `submitter_name`, `approval_source`, `approval_status`, `approval_status_name`, `current_approver_summary`, `processing_status`, and `processing_status_name`.
|
||||||
|
|
||||||
|
#### Scenario: Receive exchange approval summary fields
|
||||||
|
|
||||||
|
- **GIVEN** 后台换货列表接口返回换货记录
|
||||||
|
- **WHEN** 前端解析列表响应
|
||||||
|
- **THEN** 换货列表项类型 MUST preserve all approval and processing summary fields
|
||||||
|
- **AND** 页面 MUST NOT request an individual approval-detail API to populate the row
|
||||||
|
|
||||||
|
### Requirement: Exchange List Approval And Processing Display
|
||||||
|
|
||||||
|
The exchange management list SHALL display `提交人`, `审批状态`, `当前审批人摘要`, and `业务处理状态` as distinct columns based on backend summary fields.
|
||||||
|
|
||||||
|
#### Scenario: Display exchange with no approval source
|
||||||
|
|
||||||
|
- **GIVEN** 换货记录的 `approval_source=none`
|
||||||
|
- **WHEN** 页面渲染换货列表行
|
||||||
|
- **THEN** `审批状态` MUST display `-`
|
||||||
|
- **AND** `当前审批人摘要` MUST display `-`
|
||||||
|
|
||||||
|
#### Scenario: Display legacy exchange approval read-only
|
||||||
|
|
||||||
|
- **GIVEN** 换货记录的 `approval_source=legacy`
|
||||||
|
- **WHEN** 页面渲染换货列表行
|
||||||
|
- **THEN** `审批状态` MUST display `历史审批`
|
||||||
|
- **AND** 页面 MUST NOT add an approval operation button for that historical approval
|
||||||
|
|
||||||
|
#### Scenario: Display WeCom exchange approval summary
|
||||||
|
|
||||||
|
- **GIVEN** 换货记录的 `approval_source=wecom`
|
||||||
|
- **WHEN** 页面渲染换货列表行
|
||||||
|
- **THEN** `审批状态` MUST display backend `approval_status_name`
|
||||||
|
- **AND** `当前审批人摘要` MUST display backend `current_approver_summary`
|
||||||
|
- **AND** `业务处理状态` MUST independently display backend `processing_status_name`
|
||||||
|
|
||||||
|
#### Scenario: View long exchange approver summary
|
||||||
|
|
||||||
|
- **GIVEN** 换货记录的 `current_approver_summary` exceeds its table cell width
|
||||||
|
- **WHEN** 页面渲染当前审批人摘要列
|
||||||
|
- **THEN** 摘要 MUST be visually truncated in the cell
|
||||||
|
- **AND** 用户 MUST be able to view the complete backend text on hover
|
||||||
|
|
||||||
|
#### Scenario: Paginate exchanges without per-row approval requests
|
||||||
|
|
||||||
|
- **WHEN** 用户切换换货列表页码或刷新列表
|
||||||
|
- **THEN** 页面 MUST use the exchange list API response for approval summaries
|
||||||
|
- **AND** 页面 MUST NOT issue approval-detail requests per exchange row
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Refund List Approval Summary Contract
|
||||||
|
|
||||||
|
The `GET /api/admin/refunds` list-item contract SHALL support `submitter_name`, `approval_source`, `approval_status`, `approval_status_name`, `current_approver_summary`, `processing_status`, and `processing_status_name`.
|
||||||
|
|
||||||
|
#### Scenario: Receive refund approval summary fields
|
||||||
|
|
||||||
|
- **GIVEN** 后台退款列表接口返回退款记录
|
||||||
|
- **WHEN** 前端解析列表响应
|
||||||
|
- **THEN** 退款列表项类型 MUST preserve all approval and processing summary fields
|
||||||
|
- **AND** 页面 MUST NOT request an individual approval-detail API to populate the row
|
||||||
|
|
||||||
|
### Requirement: Refund List Approval And Processing Display
|
||||||
|
|
||||||
|
The refund management list SHALL display `提交人`, `审批状态`, `当前审批人摘要`, and `业务处理状态` as distinct columns based on backend summary fields.
|
||||||
|
|
||||||
|
#### Scenario: Display refund with no approval source
|
||||||
|
|
||||||
|
- **GIVEN** 退款记录的 `approval_source=none`
|
||||||
|
- **WHEN** 页面渲染退款列表行
|
||||||
|
- **THEN** `审批状态` MUST display `-`
|
||||||
|
- **AND** `当前审批人摘要` MUST display `-`
|
||||||
|
|
||||||
|
#### Scenario: Display legacy refund approval read-only
|
||||||
|
|
||||||
|
- **GIVEN** 退款记录的 `approval_source=legacy`
|
||||||
|
- **WHEN** 页面渲染退款列表行
|
||||||
|
- **THEN** `审批状态` MUST display `历史审批`
|
||||||
|
- **AND** 页面 MUST NOT add an approval operation button for that historical approval
|
||||||
|
|
||||||
|
#### Scenario: Display WeCom refund approval summary
|
||||||
|
|
||||||
|
- **GIVEN** 退款记录的 `approval_source=wecom`
|
||||||
|
- **WHEN** 页面渲染退款列表行
|
||||||
|
- **THEN** `审批状态` MUST display backend `approval_status_name`
|
||||||
|
- **AND** `当前审批人摘要` MUST display backend `current_approver_summary`
|
||||||
|
- **AND** `业务处理状态` MUST independently display backend `processing_status_name`
|
||||||
|
|
||||||
|
#### Scenario: View long refund approver summary
|
||||||
|
|
||||||
|
- **GIVEN** 退款记录的 `current_approver_summary` exceeds its table cell width
|
||||||
|
- **WHEN** 页面渲染当前审批人摘要列
|
||||||
|
- **THEN** 摘要 MUST be visually truncated in the cell
|
||||||
|
- **AND** 用户 MUST be able to view the complete backend text on hover
|
||||||
|
|
||||||
|
#### Scenario: Paginate refunds without per-row approval requests
|
||||||
|
|
||||||
|
- **WHEN** 用户切换退款列表页码或刷新列表
|
||||||
|
- **THEN** 页面 MUST use the refund list API response for approval summaries
|
||||||
|
- **AND** 页面 MUST NOT issue approval-detail requests per refund row
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
## 1. List Contracts
|
||||||
|
|
||||||
|
- [x] 1.1 扩展退款、代理充值和换货列表项类型,支持 `submitter_name`、`approval_source`、`approval_status`、`approval_status_name`、`current_approver_summary`、`processing_status`、`processing_status_name`。
|
||||||
|
- [x] 1.2 确认三个列表 API 使用列表响应直接提供上述字段,不新增逐条审批详情查询。
|
||||||
|
|
||||||
|
## 2. Shared Summary Behavior
|
||||||
|
|
||||||
|
- [x] 2.1 实现审批来源展示规则:`none` 显示 `-`,`legacy` 显示“历史审批”且只读,`wecom` 显示后端审批状态名称。
|
||||||
|
- [x] 2.2 将当前审批人摘要限制为单行省略,并提供完整文本悬浮提示。
|
||||||
|
- [x] 2.3 将业务处理状态独立显示为后端 `processing_status_name`,缺失时显示稳定占位内容。
|
||||||
|
|
||||||
|
## 3. Refund List
|
||||||
|
|
||||||
|
- [x] 3.1 在退款列表增加提交人、审批状态、当前审批人摘要、业务处理状态列。
|
||||||
|
- [x] 3.2 保留退款既有审批与业务操作,不为历史审批记录增加新操作按钮。
|
||||||
|
|
||||||
|
## 4. Agent Recharge List
|
||||||
|
|
||||||
|
- [x] 4.1 在代理充值列表增加提交人、审批状态、当前审批人摘要、业务处理状态列。
|
||||||
|
- [x] 4.2 保留代理充值既有确认支付、拒绝等操作,不为历史审批记录增加新操作按钮。
|
||||||
|
|
||||||
|
## 5. Exchange List
|
||||||
|
|
||||||
|
- [x] 5.1 在换货列表增加提交人、审批状态、当前审批人摘要、业务处理状态列。
|
||||||
|
- [x] 5.2 保留换货既有流程和资产筛选逻辑,不为历史审批记录增加新操作按钮。
|
||||||
|
|
||||||
|
## 6. Verification
|
||||||
|
|
||||||
|
- [x] 6.1 验证三类列表在 `approval_source=none` 时审批状态和当前审批人摘要均显示 `-`。
|
||||||
|
- [x] 6.2 验证 `approval_source=legacy` 时显示“历史审批”且没有新增审批操作,`wecom` 时显示后端审批状态和当前审批人摘要。
|
||||||
|
- [x] 6.3 验证长当前审批人摘要会省略显示并能通过悬浮查看完整文本。
|
||||||
|
- [x] 6.4 验证三个列表的业务处理状态独立显示,分页和刷新不触发逐行审批详情请求。
|
||||||
|
- [x] 6.5 运行相关类型检查、lint 或构建验证。
|
||||||
70
openspec/changes/add-notification-center/design.md
Normal file
70
openspec/changes/add-notification-center/design.md
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
## Context
|
||||||
|
|
||||||
|
系统已经存在 `ArtNotification` 顶部通知组件,但组件中的通知、消息和待办列表都是静态数据,顶部通知按钮处于注释状态。新的通知能力需要同时服务顶部快速查看和完整通知中心,并确保用户在任一入口执行已读操作后未读数与列表状态一致。
|
||||||
|
|
||||||
|
## Goals / Non-Goals
|
||||||
|
|
||||||
|
- Goals: 提供余额预警、临期提醒、审批结果和系统告警统一的站内通知入口。
|
||||||
|
- Goals: 在顶部快速查看最近 10 条通知,并提供进入通知中心的入口。
|
||||||
|
- Goals: 支持通知分类、类型、严重级别和已读状态筛选。
|
||||||
|
- Goals: 将通知点击导航限制在前端认可的业务目标内,禁止任意 URL 跳转。
|
||||||
|
- Goals: 单条已读、全部已读、抽屉和通知中心共享同一份未读状态。
|
||||||
|
- Non-Goals: 不实现 C 端通知页面。
|
||||||
|
- Non-Goals: 不实现推送通道或服务端通知生成规则。
|
||||||
|
- Non-Goals: 不让前端根据通知正文推断跳转地址。
|
||||||
|
|
||||||
|
## Decisions
|
||||||
|
|
||||||
|
- Decision: 通知铃铛放在顶部全局导航的设置按钮和用户头像菜单附近。
|
||||||
|
- Rationale: 该区域已承载全局设置和用户级入口,适合放置跨页面可访问的通知入口,也符合产品指定位置。
|
||||||
|
|
||||||
|
- Decision: 顶部抽屉只加载最近 10 条,完整通知中心使用独立路由 `/notifications`。
|
||||||
|
- Rationale: 顶部入口保持轻量,筛选和完整历史查询放在独立页面,避免挤占全局导航空间。
|
||||||
|
|
||||||
|
- Decision: 未读数使用独立接口获取,单条通知和全部已读成功后立即更新本地共享状态,并以接口返回值为最终结果。
|
||||||
|
- Rationale: 未读数是全局状态,不能依赖当前抽屉或列表的局部数量推导。
|
||||||
|
|
||||||
|
- Decision: 点击通知先调用单条已读接口,再调用目标接口,根据返回的受控 route name/route params 跳转。
|
||||||
|
- Rationale: 已读状态必须在导航前落库,目标由后端业务引用解析,前端不执行通知携带的任意 URL。
|
||||||
|
|
||||||
|
- Decision: 未知 `ref_type` 或目标接口无可用目标时只展示通知正文和状态,不跳转。
|
||||||
|
- Rationale: 保证安全,同时让无法关联页面的系统通知仍然可读。
|
||||||
|
|
||||||
|
- Decision: `unread-summary` 为顶部抽屉分类提供数据,`notifications` 为通知中心筛选列表提供数据。
|
||||||
|
- Rationale: 顶部快速查看与完整列表的数据量和筛选职责不同,避免顶部加载完整历史数据。
|
||||||
|
|
||||||
|
## Data Contract
|
||||||
|
|
||||||
|
- Notification item: id, title, content, category, type, severity, read status, created time and optional `ref_type`/reference ID.
|
||||||
|
- Unread count: non-negative integer; frontend formats it as `0`, `1`-`99` or `99+`.
|
||||||
|
- Unread summary: category counts and recent notification items, limited to the latest 10 items for the drawer.
|
||||||
|
- Notification list: paginated items plus total count, with category, type, severity and read-state filters.
|
||||||
|
- Target response: controlled internal route information, such as route name/path and route params; no arbitrary executable URL.
|
||||||
|
|
||||||
|
## Risks / Trade-offs
|
||||||
|
|
||||||
|
- Risk: 后端通知字段或枚举名称与文档不一致。
|
||||||
|
- Mitigation: 在任务阶段先确认字段契约,类型层保留稳定的可选字段和未知值占位展示。
|
||||||
|
|
||||||
|
- Risk: 用户在多个标签页同时读通知,单页本地未读数短暂不一致。
|
||||||
|
- Mitigation: 操作成功后刷新未读数和当前列表;跨标签实时同步不作为本期强制目标。
|
||||||
|
|
||||||
|
- Risk: 目标记录已删除或用户权限发生变化。
|
||||||
|
- Mitigation: 目标接口返回不可跳转时只展示正文,并处理权限/不存在状态,不回退到任意 URL。
|
||||||
|
|
||||||
|
## Migration Plan
|
||||||
|
|
||||||
|
1. 确认通知列表、摘要、未读数和目标接口字段及枚举。
|
||||||
|
2. 新增通知 API service、类型和共享状态。
|
||||||
|
3. 将顶部通知按钮放入设置/头像区域,接入未读数和最近通知抽屉。
|
||||||
|
4. 新增 `/notifications` 路由及通知中心页面。
|
||||||
|
5. 实现筛选、单条已读、全部已读和受控目标跳转。
|
||||||
|
6. 删除或替换 `ArtNotification` 中的静态 mock 数据,并验证四类通知展示一致。
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- 通知中心是否需要分页参数名称 `page/page_size`,以及默认每页数量需要后端确认。
|
||||||
|
- `category`、`type`、`severity` 和 `read_status` 的枚举值及展示名称需要后端确认。
|
||||||
|
- 目标接口返回 route name、path 还是 route key + params,需要与路由菜单契约确认。
|
||||||
|
- 未读数是否需要页面进入时定时刷新或仅在打开抽屉/完成操作时刷新,本期默认按接口调用时机刷新。
|
||||||
|
- 通知中心菜单权限和按钮权限编码需要后端权限表确认。
|
||||||
46
openspec/changes/add-notification-center/proposal.md
Normal file
46
openspec/changes/add-notification-center/proposal.md
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
# Change: 顶部通知铃铛与站内通知中心
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
当前顶部通知组件仍使用硬编码 mock 数据,通知按钮也未启用,运营人员无法统一查看余额预警、临期提醒、审批结果和系统告警。需要建立真实的站内通知数据链路,并在全局导航和通知中心之间保持未读状态同步。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在顶部全局导航的设置按钮与用户头像入口区域增加通知铃铛。
|
||||||
|
- 铃铛展示未读数量,统一格式为 `0`、`1`~`99` 或 `99+`。
|
||||||
|
- 点击铃铛展示最近 10 条通知抽屉,支持全部、审批、临期、同步/系统分类。
|
||||||
|
- 抽屉提供进入 `/notifications` 通知中心的入口。
|
||||||
|
- 新增通知中心页面,支持分类、通知类型、严重级别、已读状态筛选和全部已读。
|
||||||
|
- 点击通知时先调用标记已读接口,再根据受控 `ref_type` 获取目标并跳转;未知目标只展示通知正文,不执行任意 URL 跳转。
|
||||||
|
- 接入未读数、未读摘要、通知列表、单条已读和全部已读接口。
|
||||||
|
- 替换现有 `ArtNotification` 硬编码 mock 数据实现,并复用现有顶部布局和设置/头像区域的视觉位置。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `notification-center`
|
||||||
|
- Affected code:
|
||||||
|
- `src/components/core/layouts/art-header-bar/index.vue`
|
||||||
|
- `src/components/core/layouts/art-notification/index.vue`
|
||||||
|
- `src/components/core/layouts/art-notification/style.scss`
|
||||||
|
- `src/views/notifications/index.vue`
|
||||||
|
- `src/api/modules/notification.ts`
|
||||||
|
- `src/types/api/notification.ts`
|
||||||
|
- 路由、菜单和通知相关权限配置
|
||||||
|
- API contracts:
|
||||||
|
- `GET /api/admin/notifications/unread-count`
|
||||||
|
- `GET /api/admin/notifications/unread-summary`
|
||||||
|
- `GET /api/admin/notifications`
|
||||||
|
- `PUT /api/admin/notifications/{id}/read`
|
||||||
|
- `PUT /api/admin/notifications/read-all`
|
||||||
|
- `GET /api/admin/notifications/{id}/target`
|
||||||
|
- Dependencies:
|
||||||
|
- 后端按当前用户返回通知数据、未读统计和受控跳转目标。
|
||||||
|
- 后端明确通知分类、类型、严重级别、已读状态和 `ref_type` 枚举。
|
||||||
|
- 目标接口不得返回可被前端直接执行的任意外部 URL。
|
||||||
|
- Out of scope:
|
||||||
|
- C 端 `/api/c/v1/notifications` 接口和页面。
|
||||||
|
- 前端创建、编辑或删除通知。
|
||||||
|
- 浏览器推送、WebSocket 或轮询之外的实时推送机制。
|
||||||
|
- Breaking changes:
|
||||||
|
- 现有 `ArtNotification` mock 通知数据和无效的空操作按钮将被真实通知数据及接口行为替换。
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Global Notification Bell
|
||||||
|
|
||||||
|
The admin frontend SHALL provide a global notification bell in the top navigation near the settings and user avatar entries.
|
||||||
|
|
||||||
|
#### Scenario: Display unread count
|
||||||
|
|
||||||
|
- **GIVEN** 用户已登录后台
|
||||||
|
- **WHEN** 顶部导航加载未读通知数量
|
||||||
|
- **THEN** 铃铛 MUST call `GET /api/admin/notifications/unread-count`
|
||||||
|
- **AND** 数量 MUST display as `0`, `1` through `99`, or `99+`
|
||||||
|
|
||||||
|
#### Scenario: Open recent notification drawer
|
||||||
|
|
||||||
|
- **WHEN** 用户点击顶部通知铃铛
|
||||||
|
- **THEN** 页面 MUST display the latest 10 notifications from the unread summary contract
|
||||||
|
- **AND** 抽屉 MUST provide 全部、审批、临期、同步/系统分类
|
||||||
|
- **AND** 抽屉 MUST provide an entry to `/notifications`
|
||||||
|
|
||||||
|
### Requirement: Notification Center Filtering
|
||||||
|
|
||||||
|
The admin frontend SHALL provide a `/notifications` notification center with server-backed filtering.
|
||||||
|
|
||||||
|
#### Scenario: Filter notifications
|
||||||
|
|
||||||
|
- **WHEN** 用户打开通知中心或调整筛选条件
|
||||||
|
- **THEN** 页面 MUST support category, notification type, severity and read-state filters
|
||||||
|
- **AND** 页面 MUST load results from `GET /api/admin/notifications`
|
||||||
|
- **AND** 页面 MUST display notification title, content, category, severity, read state and created time
|
||||||
|
|
||||||
|
#### Scenario: Mark all notifications read
|
||||||
|
|
||||||
|
- **WHEN** 用户点击全部已读
|
||||||
|
- **THEN** 页面 MUST call `PUT /api/admin/notifications/read-all`
|
||||||
|
- **AND** 页面 MUST refresh the unread count and visible notification read states after success
|
||||||
|
|
||||||
|
### Requirement: Notification Read State Synchronization
|
||||||
|
|
||||||
|
The notification drawer and notification center SHALL keep read state and unread count synchronized with the backend.
|
||||||
|
|
||||||
|
#### Scenario: Mark a notification read
|
||||||
|
|
||||||
|
- **WHEN** 用户点击一条未读通知
|
||||||
|
- **THEN** 页面 MUST call `PUT /api/admin/notifications/{id}/read` before navigation
|
||||||
|
- **AND** 页面 MUST refresh or update the shared unread count after the read request succeeds
|
||||||
|
|
||||||
|
#### Scenario: Preserve read state after refresh
|
||||||
|
|
||||||
|
- **GIVEN** 用户已完成单条已读或全部已读操作
|
||||||
|
- **WHEN** 用户关闭抽屉、切换页面或刷新通知中心
|
||||||
|
- **THEN** 页面 MUST use the latest backend response rather than restoring stale local unread state
|
||||||
|
|
||||||
|
### Requirement: Controlled Notification Navigation
|
||||||
|
|
||||||
|
The admin frontend SHALL navigate from notifications only through controlled internal targets.
|
||||||
|
|
||||||
|
#### Scenario: Navigate to a valid notification target
|
||||||
|
|
||||||
|
- **GIVEN** 通知包含受支持的 `ref_type` 或业务引用
|
||||||
|
- **WHEN** 单条已读成功后页面请求 `GET /api/admin/notifications/{id}/target`
|
||||||
|
- **THEN** 页面 MUST navigate only to a target recognized by the frontend route table
|
||||||
|
- **AND** 页面 MUST preserve the target route parameters returned by the backend
|
||||||
|
|
||||||
|
#### Scenario: Handle an unknown target safely
|
||||||
|
|
||||||
|
- **GIVEN** 通知的 `ref_type` 未知、目标已删除或目标无权限
|
||||||
|
- **WHEN** 页面处理通知点击
|
||||||
|
- **THEN** 页面 MUST not navigate to an arbitrary URL
|
||||||
|
- **AND** 页面 MUST still display the notification content and a stable unavailable-target state
|
||||||
|
|
||||||
|
### Requirement: Consistent Notification Categories
|
||||||
|
|
||||||
|
The notification drawer and notification center SHALL present balance warnings, expiry reminders, approval results and system alerts through the same notification data contract.
|
||||||
|
|
||||||
|
#### Scenario: Display supported notification types
|
||||||
|
|
||||||
|
- **GIVEN** 后端返回余额预警、临期提醒、审批结果或系统告警
|
||||||
|
- **WHEN** 用户查看抽屉或通知中心
|
||||||
|
- **THEN** 页面 MUST display each item using its backend category, type and severity
|
||||||
|
- **AND** 页面 MUST not replace the item with hardcoded mock notification content
|
||||||
39
openspec/changes/add-notification-center/tasks.md
Normal file
39
openspec/changes/add-notification-center/tasks.md
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
## 1. Contract And Types
|
||||||
|
|
||||||
|
- [x] 1.1 按产品文档落地通知项、未读统计、未读摘要、分页列表和受控目标响应字段。
|
||||||
|
- [x] 1.2 按产品文档落地分类、通知类型、严重级别、已读状态和 `ref_type` 兼容类型。
|
||||||
|
- [x] 1.3 新增通知中心菜单权限 `notifications:view`、单条已读权限 `notifications:read`、全部已读权限 `notifications:read_all`。
|
||||||
|
- [x] 1.4 新增 `notification.ts` API service,覆盖未读数、摘要、列表、单条已读、全部已读和目标接口。
|
||||||
|
- [x] 1.5 新增通知实体、筛选参数、分页响应和目标响应类型。
|
||||||
|
|
||||||
|
## 2. Global Header And Drawer
|
||||||
|
|
||||||
|
- [x] 2.1 在顶部设置按钮与用户头像入口区域增加通知铃铛。
|
||||||
|
- [x] 2.2 实现未读数量格式化为 `0`、`1`~`99` 或 `99+`。
|
||||||
|
- [x] 2.3 顶部抽屉加载最近 10 条通知,并按全部、审批、临期、同步/系统分类展示。
|
||||||
|
- [x] 2.4 替换 `ArtNotification` 静态 mock 数据,接入真实摘要接口。
|
||||||
|
- [x] 2.5 提供进入 `/notifications` 通知中心的入口,并保证桌面端和移动端布局可用。
|
||||||
|
|
||||||
|
## 3. Notification Center
|
||||||
|
|
||||||
|
- [x] 3.1 新增 `/notifications` 路由和通知中心页面。
|
||||||
|
- [x] 3.2 支持分类、通知类型、严重级别和已读状态筛选。
|
||||||
|
- [x] 3.3 展示通知标题、正文、严重级别、分类、时间和已读状态。
|
||||||
|
- [x] 3.4 实现全部已读,并在成功后同步未读数和列表状态。
|
||||||
|
- [x] 3.5 处理空列表、加载失败、权限失败和未知枚举值的稳定展示。
|
||||||
|
|
||||||
|
## 4. Read And Controlled Navigation
|
||||||
|
|
||||||
|
- [x] 4.1 点击通知时先调用 `PUT /api/admin/notifications/{id}/read`。
|
||||||
|
- [x] 4.2 已读成功后调用 `GET /api/admin/notifications/{id}/target` 获取受控目标。
|
||||||
|
- [x] 4.3 仅允许跳转到后端返回且前端路由表认可的内部目标。
|
||||||
|
- [x] 4.4 未知 `ref_type`、目标不存在或无权限时只展示正文,不执行任意 URL 跳转。
|
||||||
|
- [x] 4.5 抽屉和通知中心的已读操作后刷新共享未读数。
|
||||||
|
|
||||||
|
## 5. Verification
|
||||||
|
|
||||||
|
- [x] 5.1 验证余额、临期、审批和系统通知在抽屉及通知中心展示一致。
|
||||||
|
- [x] 5.2 验证未读数在单条已读、全部已读、抽屉关闭和页面刷新后与接口结果一致。
|
||||||
|
- [x] 5.3 验证通知点击不会跳转到任意外部或未注册 URL。
|
||||||
|
- [x] 5.4 验证未知目标通知仍可查看正文且不会阻塞其他通知操作。
|
||||||
|
- [x] 5.5 运行类型检查、lint、相关测试和构建。
|
||||||
23
openspec/changes/add-shop-contact-phone-search/proposal.md
Normal file
23
openspec/changes/add-shop-contact-phone-search/proposal.md
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
# Change: 新增店铺联系电话精确搜索
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
运营无法通过店铺联系电话快速定位目标店铺。店铺列表已支持名称、编号和层级等条件筛选,但缺少联系电话的精确检索入口。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在店铺列表筛选区增加“联系电话”输入框,限制输入为 11 位数字。
|
||||||
|
- 将有效联系电话以 `contact_phone` 参数传递给现有 `GET /api/admin/shops` 查询,保持原店铺分页响应结构。
|
||||||
|
- 空联系电话不传 `contact_phone` 参数;非法号码不发起查询并显示输入错误提示。
|
||||||
|
- 使用搜索栏现有查询和清空能力:查询从第一页加载;清空联系电话后保留其他筛选条件并恢复不带联系电话条件的店铺列表。
|
||||||
|
- 保持有效联系电话精确匹配;支持加载中和空结果状态。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `shop-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/types/api/shop.ts`
|
||||||
|
- `src/api/modules/shop.ts`
|
||||||
|
- `src/views/shop-management/list/index.vue`
|
||||||
|
- API contract:
|
||||||
|
- `GET /api/admin/shops?contact_phone=13800138000`
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Shop Contact Phone Search Input
|
||||||
|
|
||||||
|
The shop management list SHALL provide a `联系电话` search input in its filter area. The input MUST only accept an 11-digit numeric phone number for a contact phone search.
|
||||||
|
|
||||||
|
#### Scenario: Enter a valid contact phone
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看店铺列表筛选区
|
||||||
|
- **WHEN** 用户输入 11 位数字联系电话
|
||||||
|
- **THEN** 页面 MUST retain the entered phone number as the `contact_phone` search value
|
||||||
|
- **AND** 用户 MUST be able to use the existing query action to search
|
||||||
|
|
||||||
|
#### Scenario: Prevent invalid contact phone query
|
||||||
|
|
||||||
|
- **GIVEN** 用户输入的联系电话不是 11 位数字
|
||||||
|
- **WHEN** 用户发起查询
|
||||||
|
- **THEN** 页面 MUST NOT send a shop list request
|
||||||
|
- **AND** 页面 MUST display an input validation error
|
||||||
|
|
||||||
|
### Requirement: Shop Contact Phone Query Contract
|
||||||
|
|
||||||
|
The shop management list SHALL use `contact_phone` as an optional exact-match query parameter of `GET /api/admin/shops` while preserving the existing shop pagination response structure.
|
||||||
|
|
||||||
|
#### Scenario: Query shops by exact contact phone
|
||||||
|
|
||||||
|
- **GIVEN** 用户输入有效的 11 位联系电话
|
||||||
|
- **WHEN** 用户发起店铺列表查询
|
||||||
|
- **THEN** 系统 MUST request `GET /api/admin/shops` with `contact_phone` equal to the entered value
|
||||||
|
- **AND** 系统 MUST reset the list to the first page
|
||||||
|
- **AND** 页面 MUST render the returned shop pagination result
|
||||||
|
|
||||||
|
#### Scenario: Omit empty contact phone from query
|
||||||
|
|
||||||
|
- **GIVEN** 联系电话筛选值为空
|
||||||
|
- **WHEN** 系统加载店铺列表
|
||||||
|
- **THEN** 请求 MUST NOT include `contact_phone`
|
||||||
|
|
||||||
|
### Requirement: Shop Contact Phone Search Reset and Result States
|
||||||
|
|
||||||
|
The shop management list SHALL clear the contact phone search through its existing reset or input clear interaction without affecting other selected filters. The page SHALL preserve existing loading and empty-result behavior.
|
||||||
|
|
||||||
|
#### Scenario: Clear contact phone while preserving other filters
|
||||||
|
|
||||||
|
- **GIVEN** 用户已按联系电话和其他店铺条件查询
|
||||||
|
- **WHEN** 用户清空联系电话并重新查询
|
||||||
|
- **THEN** 系统 MUST request the list without `contact_phone`
|
||||||
|
- **AND** 系统 MUST retain the other selected filters
|
||||||
|
|
||||||
|
#### Scenario: Display no matching shop result
|
||||||
|
|
||||||
|
- **GIVEN** 用户输入有效的 11 位联系电话
|
||||||
|
- **WHEN** 店铺接口返回空分页结果
|
||||||
|
- **THEN** 页面 MUST render the existing empty table result state
|
||||||
|
|
||||||
|
#### Scenario: Display loading while querying contact phone
|
||||||
|
|
||||||
|
- **WHEN** 系统正在按有效联系电话请求店铺列表
|
||||||
|
- **THEN** 页面 MUST render the existing list loading state until the request completes
|
||||||
22
openspec/changes/add-shop-contact-phone-search/tasks.md
Normal file
22
openspec/changes/add-shop-contact-phone-search/tasks.md
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
## 1. Query Contract
|
||||||
|
|
||||||
|
- [x] 1.1 在店铺列表查询参数类型中增加可选 `contact_phone`。
|
||||||
|
- [x] 1.2 保持调用 `GET /api/admin/shops` 和原店铺分页响应结构。
|
||||||
|
|
||||||
|
## 2. Shop List Search UI
|
||||||
|
|
||||||
|
- [x] 2.1 在店铺列表筛选区新增“联系电话”输入框,限制为 11 位数字。
|
||||||
|
- [x] 2.2 通过现有查询按钮发起联系电话筛选,并在查询时重置至第一页。
|
||||||
|
- [x] 2.3 通过现有清空能力移除联系电话筛选,保留其他筛选条件并恢复列表。
|
||||||
|
|
||||||
|
## 3. Validation and Results
|
||||||
|
|
||||||
|
- [x] 3.1 空联系电话不传 `contact_phone` 参数。
|
||||||
|
- [x] 3.2 联系电话不是 11 位数字时不发起请求并提示错误。
|
||||||
|
- [x] 3.3 有效联系电话按精确值传递 `contact_phone`,并支持加载中与空结果状态。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [ ] 4.1 验证有效 11 位联系电话精确命中店铺。
|
||||||
|
- [ ] 4.2 验证空值、清空、非法号码和无匹配结果行为正确。
|
||||||
|
- [x] 4.3 运行相关前端校验,并执行 `openspec validate add-shop-contact-phone-search --strict`。
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# Change: 代理现金余额不足100元展示
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
当前代理资金概况缺少对现金可用余额不足的明确提示,运营人员无法快速识别需要关注的店铺资金状态。业务要求以固定阈值 100 元展示预警,不开放阈值配置,也不把信用额度计入预警文案。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在代理资金概况中展示现金余额、冻结金额和基于后端 `low_balance_warning` 的“现金余额不足100元”红色状态。
|
||||||
|
- 复用 `GET /api/admin/shops/fund-summary`,读取 `balance`、`frozen_balance`、`cash_available`、`low_balance_warning` 字段,金额统一按分转元展示。
|
||||||
|
- 明确前端不得自行计算 100 元阈值,也不得展示阈值输入框。
|
||||||
|
- 不包含任何公共站内通知相关功能的实现或改造。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `commission-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/types/api/commission.ts`
|
||||||
|
- `src/views/commission-management/agent-fund-overview/index.vue`
|
||||||
|
- Out of scope:
|
||||||
|
- 顶部通知抽屉、站内通知中心及其他公共站内通知功能的开发或改造
|
||||||
|
- 任意余额预警阈值配置能力
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Agent Cash Available Low Balance Warning
|
||||||
|
|
||||||
|
The agent fund overview SHALL display cash balance data and a fixed-threshold low balance warning using the backend-provided `low_balance_warning` flag from `GET /api/admin/shops/fund-summary`. The frontend MUST NOT calculate the threshold itself and MUST NOT expose any threshold configuration input.
|
||||||
|
|
||||||
|
#### Scenario: Display normal balance state above threshold
|
||||||
|
|
||||||
|
- **GIVEN** 用户进入代理资金概况页面
|
||||||
|
- **WHEN** `GET /api/admin/shops/fund-summary` 返回 `balance`、`frozen_balance`、`cash_available`
|
||||||
|
- **AND** `low_balance_warning=false`
|
||||||
|
- **THEN** 页面 MUST 展示现金余额和冻结金额
|
||||||
|
- **AND** 所有金额 MUST 按分转元展示
|
||||||
|
- **AND** 页面 MUST NOT 展示“现金余额不足100元”红色状态
|
||||||
|
|
||||||
|
#### Scenario: Display warning state at or below threshold
|
||||||
|
|
||||||
|
- **GIVEN** 用户进入代理资金概况页面
|
||||||
|
- **WHEN** `GET /api/admin/shops/fund-summary` 返回 `low_balance_warning=true`
|
||||||
|
- **THEN** 页面 MUST 展示“现金余额不足100元”红色状态
|
||||||
|
- **AND** 该提示 MUST NOT 将信用额度计入文案
|
||||||
|
|
||||||
|
#### Scenario: Frontend does not expose threshold configuration
|
||||||
|
|
||||||
|
- **WHEN** 用户查看代理资金概况页面
|
||||||
|
- **THEN** 页面 MUST NOT 展示余额预警阈值输入框或配置控件
|
||||||
|
- **AND** 前端 MUST NOT 依据 `cash_available` 自行计算是否低于 `100` 元
|
||||||
|
|
||||||
|
### Requirement: Agent Fund Summary Low Balance Response Fields
|
||||||
|
|
||||||
|
The frontend SHALL read the low-balance display state exclusively from the `GET /api/admin/shops/fund-summary` response fields `balance:int64`, `frozen_balance:int64`, `cash_available:int64`, and `low_balance_warning:bool`.
|
||||||
|
|
||||||
|
#### Scenario: Read low balance response contract
|
||||||
|
|
||||||
|
- **WHEN** 前端请求 `GET /api/admin/shops/fund-summary`
|
||||||
|
- **THEN** 前端 MUST 读取 `balance`、`frozen_balance`、`cash_available`、`low_balance_warning`
|
||||||
|
- **AND** `low_balance_warning` MUST be the only source of truth for whether the warning is shown
|
||||||
|
|
||||||
|
### Requirement: Public Notification Features Are Out Of Scope
|
||||||
|
|
||||||
|
This change SHALL NOT add or modify top notification drawer, notification center, or any other public in-app notification feature.
|
||||||
|
|
||||||
|
#### Scenario: Deliver low balance overview without notification changes
|
||||||
|
|
||||||
|
- **WHEN** 本次变更落地
|
||||||
|
- **THEN** 代理资金概况的低余额展示 MUST be available
|
||||||
|
- **AND** 顶部通知抽屉、站内通知中心及其他公共站内通知功能 MUST NOT be changed by this proposal
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
## 1. API Contract
|
||||||
|
|
||||||
|
- [x] 1.1 更新代理资金概况相关数据模型,补充 `balance`、`frozen_balance`、`cash_available`、`low_balance_warning` 字段读取。
|
||||||
|
|
||||||
|
## 2. Agent Fund Overview UI
|
||||||
|
|
||||||
|
- [x] 2.1 在代理资金概况中展示现金余额、冻结金额,并统一按分转元格式化。
|
||||||
|
- [x] 2.2 当 `low_balance_warning=true` 时展示“现金余额不足100元”红色状态。
|
||||||
|
- [x] 2.3 不展示阈值输入框,不把信用额度计入预警文案,也不由前端自行计算余额阈值。
|
||||||
|
|
||||||
|
## 3. Verification
|
||||||
|
|
||||||
|
- [ ] 3.1 验证现金可用余额高于、等于、低于100元三种情况下的状态展示正确,且仅由 `low_balance_warning` 控制。
|
||||||
|
- [x] 3.2 验证本次改动未引入公共站内通知相关功能。
|
||||||
|
- [x] 3.3 运行相关前端校验,并执行 `openspec validate update-agent-fund-low-balance-warning --strict`。
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# Change: 资产详情前代后代换货标识
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
资产详情虽然可展示业务状态和世代编号,但运营无法判断当前资产在换货链中的位置,也无法在具备权限时快速前往关联资产。需要基于后端返回的换货链路数据明确展示前代和后代资产关系。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 扩展资产解析响应,读取 `exchange_trace.previous_asset` 和 `exchange_trace.next_asset`。
|
||||||
|
- 前代资产存在时,在当前资产详情展示“换货新资产”标签与前代资产信息。
|
||||||
|
- 后代资产存在时,在当前资产详情展示“已换出旧资产”标签与后代资产信息。
|
||||||
|
- 中间资产同时展示前代和后代换货标识。
|
||||||
|
- 当关联项 `can_view=true` 时允许跳转资产详情;为 `false` 时仅展示标识文本,不提供跳转操作。
|
||||||
|
- 不由前端根据换货状态、世代编号或其他字段自行推导换货链;关联项为空时不展示对应区域。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `asset-information`
|
||||||
|
- Related active changes: `add-asset-status-generation-display`(共享资产世代和详情展示区域)
|
||||||
|
- Affected code:
|
||||||
|
- `src/types/api/asset.ts`
|
||||||
|
- `src/views/asset-management/asset-information/types.ts`
|
||||||
|
- `src/views/asset-management/asset-information/composables/useAssetInfo.ts`
|
||||||
|
- `src/views/asset-management/asset-information/components/BasicInfoCard.vue`
|
||||||
|
- API contract:
|
||||||
|
- `GET /api/admin/assets/resolve/{identifier}`
|
||||||
|
- Response field: `exchange_trace.previous_asset` and `exchange_trace.next_asset`
|
||||||
|
- Related asset item fields: `asset_type:string`, `asset_id:int64|null`, `identifier:string`, `exchange_no:string`, `can_view:bool`
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Asset Exchange Generation Trace Display
|
||||||
|
|
||||||
|
The asset information page SHALL display exchange generation relationships exclusively from `exchange_trace.previous_asset` and `exchange_trace.next_asset` returned by `GET /api/admin/assets/resolve/{identifier}`. The frontend MUST NOT infer the exchange chain from asset status, generation, exchange order status, or any field outside `exchange_trace`.
|
||||||
|
|
||||||
|
#### Scenario: Display previous asset for a replacement asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看资产信息页
|
||||||
|
- **WHEN** 解析响应包含非空的 `exchange_trace.previous_asset`
|
||||||
|
- **THEN** 页面 MUST 显示“换货新资产”标签
|
||||||
|
- **AND** 页面 MUST 展示前代资产的标识符和换货单号
|
||||||
|
- **AND** 页面 MUST use `previous_asset.identifier` and `previous_asset.exchange_no` as the displayed source values
|
||||||
|
|
||||||
|
#### Scenario: Display next asset for a replaced asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看资产信息页
|
||||||
|
- **WHEN** 解析响应包含非空的 `exchange_trace.next_asset`
|
||||||
|
- **THEN** 页面 MUST 显示“已换出旧资产”标签
|
||||||
|
- **AND** 页面 MUST 展示后代资产的标识符和换货单号
|
||||||
|
- **AND** 页面 MUST use `next_asset.identifier` and `next_asset.exchange_no` as the displayed source values
|
||||||
|
|
||||||
|
#### Scenario: Display both relationships for an intermediate asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看位于换货链中间的资产
|
||||||
|
- **WHEN** 解析响应同时包含非空的 `previous_asset` 和 `next_asset`
|
||||||
|
- **THEN** 页面 MUST 同时展示“换货新资产”和“已换出旧资产”两个关联区域
|
||||||
|
- **AND** 两个区域 MUST use their corresponding relationship item values independently
|
||||||
|
|
||||||
|
#### Scenario: Hide absent exchange relationship
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看资产信息页
|
||||||
|
- **WHEN** `previous_asset` 或 `next_asset` 为 `null`、空值或未返回
|
||||||
|
- **THEN** 页面 MUST NOT 展示对应的换货关联区域
|
||||||
|
- **AND** 前端 MUST NOT 根据资产状态、世代编号、换货单状态或其他字段推导该区域
|
||||||
|
|
||||||
|
#### Scenario: Display no exchange relationship for unrelated asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看无前代和后代换货关系的资产
|
||||||
|
- **WHEN** 解析响应未返回 `exchange_trace` 或 `exchange_trace` 内两个关联项均为空
|
||||||
|
- **THEN** 页面 MUST NOT 展示“换货新资产”标签
|
||||||
|
- **AND** 页面 MUST NOT 展示“已换出旧资产”标签
|
||||||
|
- **AND** 页面 MUST NOT render an empty exchange relationship placeholder
|
||||||
|
|
||||||
|
### Requirement: Exchange Related Asset Navigation Authorization
|
||||||
|
|
||||||
|
The asset information page SHALL allow navigation to a related exchange asset only when that relationship item has `can_view=true`. When `can_view=false`, the relationship item SHALL remain visible as text only and MUST NOT provide any asset-detail navigation affordance.
|
||||||
|
|
||||||
|
#### Scenario: Navigate to authorized related asset
|
||||||
|
|
||||||
|
- **GIVEN** 换货关联资产项的 `can_view=true`
|
||||||
|
- **WHEN** 用户点击关联资产标识符
|
||||||
|
- **THEN** 系统 MUST 跳转到该关联资产的资产详情
|
||||||
|
- **AND** 跳转 MUST 使用关联项返回的 `identifier`
|
||||||
|
- **AND** 页面 MUST NOT reconstruct the target identifier from the current asset or exchange order
|
||||||
|
|
||||||
|
#### Scenario: Render unauthorized related asset as text
|
||||||
|
|
||||||
|
- **GIVEN** 换货关联资产项的 `can_view=false`
|
||||||
|
- **WHEN** 页面渲染换货关联区域
|
||||||
|
- **THEN** 页面 MUST 展示关联资产标识符和换货单号
|
||||||
|
- **AND** 页面 MUST NOT 将关联资产标识符渲染为可点击跳转操作
|
||||||
|
|
||||||
|
#### Scenario: Render nullable related asset ID without navigation
|
||||||
|
|
||||||
|
- **GIVEN** 换货关联资产项的 `asset_id=null`
|
||||||
|
- **AND** 该关联资产项的 `can_view=false`
|
||||||
|
- **WHEN** 页面渲染换货关联区域
|
||||||
|
- **THEN** 页面 MUST 展示关联资产标识符和换货单号
|
||||||
|
- **AND** 页面 MUST NOT depend on `asset_id` to render the relationship text
|
||||||
|
- **AND** 页面 MUST NOT provide navigation to the related asset
|
||||||
|
|
||||||
|
### Requirement: Exchange Trace Response Contract
|
||||||
|
|
||||||
|
The frontend asset resolve contract SHALL support optional `exchange_trace.previous_asset` and `exchange_trace.next_asset` returned by `GET /api/admin/assets/resolve/{identifier}`. Each non-empty relationship item SHALL preserve `asset_type:string`, `asset_id:int64|null`, `identifier:string`, `exchange_no:string`, and `can_view:bool`.
|
||||||
|
|
||||||
|
#### Scenario: Read exchange trace response fields
|
||||||
|
|
||||||
|
- **WHEN** 前端解析 `GET /api/admin/assets/resolve/{identifier}` 响应
|
||||||
|
- **THEN** 前端类型 MUST 支持 `exchange_trace.previous_asset` 和 `exchange_trace.next_asset`
|
||||||
|
- **AND** 每个非空关联项 MUST 支持读取 `asset_type`、`asset_id`、`identifier`、`exchange_no`、`can_view`
|
||||||
|
- **AND** `asset_id` MUST allow `null` for no-permission relationship items
|
||||||
|
- **AND** `previous_asset` and `next_asset` MUST each allow `null`, empty, or omitted values
|
||||||
|
|
||||||
|
#### Scenario: Preserve asset type in exchange trace item
|
||||||
|
|
||||||
|
- **WHEN** 解析响应返回 `exchange_trace.previous_asset` 或 `exchange_trace.next_asset`
|
||||||
|
- **THEN** 前端类型 MUST preserve `asset_type` as a string value such as `device` or `card`
|
||||||
|
- **AND** 页面 logic MUST NOT assume all related exchange assets are the same type as the current asset
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
## 1. API Contract
|
||||||
|
|
||||||
|
- [x] 1.1 更新资产解析响应类型,支持 `exchange_trace.previous_asset` 和 `exchange_trace.next_asset`。
|
||||||
|
- [x] 1.2 定义换货关联资产类型,读取 `asset_type`、`asset_id`、`identifier`、`exchange_no`、`can_view`。
|
||||||
|
|
||||||
|
## 2. Asset Detail Exchange Trace UI
|
||||||
|
|
||||||
|
- [x] 2.1 `previous_asset` 存在时展示“换货新资产”标签和前代资产信息。
|
||||||
|
- [x] 2.2 `next_asset` 存在时展示“已换出旧资产”标签和后代资产信息。
|
||||||
|
- [x] 2.3 当前资产同时存在前代和后代时,同时展示两个关联区域。
|
||||||
|
- [x] 2.4 关联资产为空时隐藏对应区域,不通过换货状态或世代编号推导关联链路。
|
||||||
|
|
||||||
|
## 3. Exchange Trace Navigation
|
||||||
|
|
||||||
|
- [x] 3.1 `can_view=true` 时允许点击关联资产标识跳转资产详情。
|
||||||
|
- [x] 3.2 `can_view=false` 时仅展示关联资产标识文本,不渲染跳转操作。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [ ] 4.1 验证旧资产、新资产、中间资产和无关联资产的展示正确。
|
||||||
|
- [ ] 4.2 验证有权限和无权限关联资产的跳转行为正确。
|
||||||
|
- [x] 4.3 运行相关前端校验,并执行 `openspec validate update-asset-exchange-generation-links --strict`。
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
# Change: 适配复机实名校验结果提示
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
复机是否允许取决于运营商的实名能力和后端实名规则,不能以行业卡类别作为前端放行依据。当前复机失败不会向运营清晰呈现后端返回的中文业务原因,无法区分同为行业卡但实名能力不同的放行或拦截结果。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 复用资产信息页现有复机入口和确认框,继续调用 `POST /api/admin/assets/{identifier}/start`。
|
||||||
|
- 补齐复机成功响应类型,读取最新的 `status`、`status_name`、`real_name_status`、`real_name_status_name`。
|
||||||
|
- 复机提交期间禁用入口,避免重复提交。
|
||||||
|
- 复机被后端实名规则或其他业务规则拦截时,在当前复机操作上下文直接展示后端返回的中文业务原因,不以通用前端文案替代,也不只记录到控制台。
|
||||||
|
- 复机成功后重新拉取资产详情,以最新资产数据更新页面。
|
||||||
|
- 前端不得读取或根据 `card_category` 判断是否需要实名、是否允许复机,所有放行或拦截均以后端结果为准。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `asset-information`
|
||||||
|
- Affected code:
|
||||||
|
- `src/types/api/asset.ts`
|
||||||
|
- `src/api/modules/asset.ts`
|
||||||
|
- `src/views/asset-management/asset-information/composables/useAssetOperations.ts`
|
||||||
|
- `src/views/asset-management/asset-information/components/BasicInfoCard.vue`
|
||||||
|
- API contract:
|
||||||
|
- `POST /api/admin/assets/{identifier}/start`
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Asset Start Response Contract
|
||||||
|
|
||||||
|
The asset start API contract SHALL use `POST /api/admin/assets/{identifier}/start` and support a successful response containing the latest `status`, `status_name`, `real_name_status`, and `real_name_status_name` values.
|
||||||
|
|
||||||
|
#### Scenario: Read successful asset start result
|
||||||
|
|
||||||
|
- **WHEN** 用户对资产提交复机且后端成功处理请求
|
||||||
|
- **THEN** 前端类型 MUST support `status`、`status_name`、`real_name_status` 和 `real_name_status_name`
|
||||||
|
- **AND** 前端 MUST use the existing asset start endpoint
|
||||||
|
|
||||||
|
### Requirement: Asset Start Submission and Refresh
|
||||||
|
|
||||||
|
The asset information page SHALL retain the existing asset start entry and confirmation dialog. It MUST prevent duplicate submissions while the asset start request is pending and refresh the asset detail after a successful start.
|
||||||
|
|
||||||
|
#### Scenario: Keep existing asset start confirmation
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看处于停机状态的资产信息页
|
||||||
|
- **WHEN** 用户发起复机操作
|
||||||
|
- **THEN** 页面 MUST display the existing start confirmation dialog
|
||||||
|
- **AND** 页面 MUST NOT add a separate asset start entry
|
||||||
|
|
||||||
|
#### Scenario: Prevent duplicate asset start submissions
|
||||||
|
|
||||||
|
- **GIVEN** 用户已确认复机操作
|
||||||
|
- **WHEN** 复机请求仍在提交中
|
||||||
|
- **THEN** 复机按钮 MUST be disabled
|
||||||
|
- **AND** 系统 MUST NOT send another asset start request for that interaction
|
||||||
|
|
||||||
|
#### Scenario: Refresh asset detail after a successful start
|
||||||
|
|
||||||
|
- **WHEN** 复机接口成功返回
|
||||||
|
- **THEN** 页面 MUST reload the current asset detail
|
||||||
|
- **AND** 页面 MUST render the refreshed asset status and real-name status data
|
||||||
|
|
||||||
|
### Requirement: Backend-Controlled Asset Start Realname Validation
|
||||||
|
|
||||||
|
The asset information page SHALL rely exclusively on the backend asset start result to decide whether an asset is allowed to start. The frontend MUST NOT read or use `card_category` to infer real-name requirements or to permit an asset start.
|
||||||
|
|
||||||
|
#### Scenario: Allow start based on backend result
|
||||||
|
|
||||||
|
- **GIVEN** 用户对行业卡资产发起复机
|
||||||
|
- **WHEN** 后端允许复机
|
||||||
|
- **THEN** 页面 MUST treat the operation as successful regardless of the asset `card_category`
|
||||||
|
- **AND** 页面 MUST reload the asset detail
|
||||||
|
|
||||||
|
#### Scenario: Block start based on backend realname validation
|
||||||
|
|
||||||
|
- **GIVEN** 用户对行业卡资产发起复机
|
||||||
|
- **WHEN** 后端因实名规则拒绝复机并返回中文业务原因
|
||||||
|
- **THEN** 页面 MUST keep the asset start operation unsuccessful
|
||||||
|
- **AND** 页面 MUST NOT use `card_category` to override or bypass the backend decision
|
||||||
|
|
||||||
|
### Requirement: Asset Start Business Failure Feedback
|
||||||
|
|
||||||
|
When the asset start API rejects an operation for real-name validation or another business rule, the asset information page SHALL show the backend-provided Chinese business reason in the current asset start operation context.
|
||||||
|
|
||||||
|
#### Scenario: Show backend realname rejection reason
|
||||||
|
|
||||||
|
- **GIVEN** 用户已在资产信息页确认复机
|
||||||
|
- **WHEN** 后端返回实名校验失败及中文业务原因
|
||||||
|
- **THEN** 页面 MUST display that backend Chinese business reason directly in the asset start operation context
|
||||||
|
- **AND** 页面 MUST NOT replace it with a generic frontend failure message
|
||||||
|
|
||||||
|
#### Scenario: Show other backend business rejection reason
|
||||||
|
|
||||||
|
- **GIVEN** 用户已在资产信息页确认复机
|
||||||
|
- **WHEN** 后端返回非实名相关的业务拦截及中文业务原因
|
||||||
|
- **THEN** 页面 MUST display that backend Chinese business reason directly in the asset start operation context
|
||||||
|
- **AND** 页面 MUST NOT only log the failure to the browser console
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
## 1. API Contract
|
||||||
|
|
||||||
|
- [x] 1.1 定义复机成功响应类型,支持 `status`、`status_name`、`real_name_status`、`real_name_status_name`。
|
||||||
|
- [x] 1.2 更新复机接口返回类型,继续使用 `POST /api/admin/assets/{identifier}/start`。
|
||||||
|
|
||||||
|
## 2. Asset Start Interaction
|
||||||
|
|
||||||
|
- [x] 2.1 保持资产信息页现有复机入口和确认框。
|
||||||
|
- [x] 2.2 复机请求提交期间禁用复机按钮,防止重复提交。
|
||||||
|
- [x] 2.3 复机成功后重新拉取资产详情。
|
||||||
|
|
||||||
|
## 3. Backend Realname Validation Feedback
|
||||||
|
|
||||||
|
- [x] 3.1 后端返回实名或其他业务拦截结果时,在复机操作上下文显示后端中文业务原因。
|
||||||
|
- [x] 3.2 不以通用前端错误文案覆盖后端中文业务原因,也不只将错误写入控制台。
|
||||||
|
- [x] 3.3 不读取或根据 `card_category` 推断实名要求或复机放行结果。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [ ] 4.1 验证复机成功后页面重新加载并展示最新资产详情。
|
||||||
|
- [ ] 4.2 验证后端实名校验拦截时显示其中文业务原因。
|
||||||
|
- [ ] 4.3 验证同为行业卡但运营商实名能力不同的资产,页面按后端结果分别放行或拦截。
|
||||||
|
- [ ] 4.4 验证提交期间无法重复发起复机请求。
|
||||||
|
- [x] 4.5 运行相关前端校验,并执行 `openspec validate update-asset-start-realname-validation-feedback --strict`。
|
||||||
30
openspec/changes/update-asset-sync-status-trail/proposal.md
Normal file
30
openspec/changes/update-asset-sync-status-trail/proposal.md
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
# Change: 调整资产同步状态与同步轨迹入口
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
运营需要通过统一审计查看资产业务事件、运营商回调和周期轮询的同步轨迹。新需求明确资产信息页只保留已有手动刷新和轮询展示,不新增用于推断轮询计划的状态字段。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 保留卡和设备资产信息页现有的手动刷新按钮、接口契约和轮询状态展示,不新增第二个同步或刷新按钮。
|
||||||
|
- 不展示活跃级别、最后活跃场景或下次轮询时间,也不根据事件轨迹推算新的周期轮询时间。
|
||||||
|
- 增加“查看同步轨迹”入口,跳转全局审计外部集成页并带入当前资产的 `resource_type` 和 `resource_key` 筛选参数。
|
||||||
|
- 约定审计查询支持 `resource_type`、`resource_key`、`correlation_id`,以供目标页连续展示立即、3分钟、5分钟的同步结果,以及运营商回调和周期轮询的 Integration Log。
|
||||||
|
- 对 `rate_limited` 手动刷新结果仅展示本次失败,不展示自动退避倒计时。
|
||||||
|
- 全局审计外部集成页面自身暂不在本提案中开发或改造。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `asset-information`
|
||||||
|
- Related active changes: `update-asset-realtime-sync-timestamps-display`(共享资产同步信息展示)
|
||||||
|
- Affected code:
|
||||||
|
- `src/views/asset-management/asset-information/components/BasicInfoCard.vue`
|
||||||
|
- `src/views/asset-management/asset-information/index.vue`
|
||||||
|
- 资产信息页到全局审计外部集成页的路由跳转参数
|
||||||
|
- API contracts:
|
||||||
|
- `POST /api/admin/assets/{identifier}/refresh`(保持既有契约)
|
||||||
|
- `GET /api/admin/audit/integrations`(复用 `resource_type`、`resource_key`、`correlation_id` 查询参数)
|
||||||
|
- Out of scope:
|
||||||
|
- 全局审计外部集成页面自身的开发或改造
|
||||||
|
- 审计轨迹结果页的加载、空记录和失败状态界面实现
|
||||||
|
- 新增轮询活跃级别、最后活跃场景、下次轮询时间或自动退避倒计时展示
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Existing Asset Sync Controls and Polling Display
|
||||||
|
|
||||||
|
The asset information page SHALL preserve the existing manual refresh control and existing polling status display for both card and device assets. The page MUST NOT add another synchronization or refresh control.
|
||||||
|
|
||||||
|
#### Scenario: Retain existing controls for a card asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看卡资产信息页
|
||||||
|
- **THEN** 页面 MUST 保留现有手动刷新按钮和现有轮询状态展示
|
||||||
|
- **AND** 页面 MUST NOT 增加第二个同步或刷新按钮
|
||||||
|
|
||||||
|
#### Scenario: Retain existing controls for a device asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看设备资产信息页
|
||||||
|
- **THEN** 页面 MUST 保留现有手动刷新按钮和现有轮询状态展示
|
||||||
|
- **AND** 页面 MUST NOT 增加第二个同步或刷新按钮
|
||||||
|
|
||||||
|
#### Scenario: Do not display new polling activity fields
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看卡或设备资产信息页
|
||||||
|
- **WHEN** 资产解析响应包含 `activity_level`、`last_activity_scene` 或 `next_poll_at`
|
||||||
|
- **THEN** 页面 MUST NOT 展示活跃级别、最后活跃场景或下次轮询时间字段
|
||||||
|
|
||||||
|
### Requirement: Asset Manual Refresh Remains the Only Refresh Entry
|
||||||
|
|
||||||
|
The asset information page SHALL preserve the existing manual refresh button and interface contract as the only asset refresh entry. The frontend MUST NOT infer or display a future periodic polling time from refresh results or event traces.
|
||||||
|
|
||||||
|
#### Scenario: Preserve existing manual refresh behavior
|
||||||
|
|
||||||
|
- **WHEN** 用户在资产信息页发起手动刷新
|
||||||
|
- **THEN** 系统 MUST 调用现有手动刷新接口
|
||||||
|
- **AND** 页面 MUST NOT 新增第二个同步或刷新按钮
|
||||||
|
|
||||||
|
#### Scenario: Show rate limited result without countdown
|
||||||
|
|
||||||
|
- **WHEN** 手动刷新请求返回 `rate_limited` 或等价限流失败结果
|
||||||
|
- **THEN** 系统 MUST 仅展示本次请求失败信息
|
||||||
|
- **AND** 系统 MUST NOT 展示自动退避倒计时
|
||||||
|
|
||||||
|
#### Scenario: Do not infer a future polling schedule
|
||||||
|
|
||||||
|
- **WHEN** 用户查看刷新结果或同步事件轨迹
|
||||||
|
- **THEN** 前端 MUST NOT 根据结果推算或展示新的周期轮询时间
|
||||||
|
|
||||||
|
### Requirement: Asset Sync Trail Navigation
|
||||||
|
|
||||||
|
The asset information page SHALL provide a `查看同步轨迹` entry that navigates to the global audit integration page with filters for the current asset. The target audit query contract SHALL support `resource_type`, `resource_key`, and `correlation_id` filters.
|
||||||
|
|
||||||
|
#### Scenario: Navigate to filtered sync trail from a card asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看卡资产信息页
|
||||||
|
- **WHEN** 用户点击“查看同步轨迹”
|
||||||
|
- **THEN** 系统 MUST 跳转到全局审计外部集成页
|
||||||
|
- **AND** 跳转参数 MUST 带入当前卡资产对应的 `resource_type` 和 `resource_key` 筛选信息
|
||||||
|
|
||||||
|
#### Scenario: Navigate to filtered sync trail from a device asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看设备资产信息页
|
||||||
|
- **WHEN** 用户点击“查看同步轨迹”
|
||||||
|
- **THEN** 系统 MUST 跳转到全局审计外部集成页
|
||||||
|
- **AND** 跳转参数 MUST 带入当前设备资产对应的 `resource_type` 和 `resource_key` 筛选信息
|
||||||
|
|
||||||
|
#### Scenario: Audit query filters a correlation group
|
||||||
|
|
||||||
|
- **WHEN** 全局审计外部集成页按一次业务事件的 `correlation_id` 查询同步轨迹
|
||||||
|
- **THEN** 审计查询契约 MUST 支持该筛选参数
|
||||||
|
|
||||||
|
#### Scenario: Audit target page is outside this change
|
||||||
|
|
||||||
|
- **WHEN** 本次变更落地
|
||||||
|
- **THEN** 资产信息页的同步轨迹跳转入口 MUST 可用
|
||||||
|
- **AND** 全局审计外部集成页面的加载、空记录和失败状态界面 MUST NOT 被要求在本提案中开发或改造
|
||||||
24
openspec/changes/update-asset-sync-status-trail/tasks.md
Normal file
24
openspec/changes/update-asset-sync-status-trail/tasks.md
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
## 1. Asset Sync Controls
|
||||||
|
|
||||||
|
- [x] 1.1 保留卡和设备资产信息页现有手动刷新按钮及其接口调用方式,不新增同步或刷新按钮。
|
||||||
|
- [x] 1.2 保留现有轮询状态展示,移除活跃级别、最后活跃场景和下次轮询时间展示。
|
||||||
|
- [x] 1.3 `rate_limited` 时仅展示本次刷新失败,不展示自动退避倒计时或新的轮询时间。
|
||||||
|
|
||||||
|
## 2. Sync Trail Navigation
|
||||||
|
|
||||||
|
- [x] 2.1 在卡和设备资产信息页增加“查看同步轨迹”入口,跳转全局审计外部集成页。
|
||||||
|
- [x] 2.2 跳转时带入当前资产的 `resource_type` 和 `resource_key` 筛选参数。
|
||||||
|
- [x] 2.3 前端不根据事件轨迹推算或展示新的周期轮询时间。
|
||||||
|
|
||||||
|
## 3. Audit Integration Contract
|
||||||
|
|
||||||
|
- [ ] 3.1 与审计接口确认并联调 `resource_type`、`resource_key`、`correlation_id` 查询参数。
|
||||||
|
- [ ] 3.2 确认目标查询可覆盖立即、3分钟、5分钟的连续同步结果,以及运营商回调和周期轮询的 Integration Log。
|
||||||
|
- [x] 3.3 不开发或改造全局审计外部集成页面的加载、空记录和失败状态界面。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [ ] 4.1 验证卡和设备均保留既有手动刷新和轮询状态展示,且不显示新增轮询活跃字段。
|
||||||
|
- [ ] 4.2 验证“查看同步轨迹”跳转携带当前资产筛选。
|
||||||
|
- [ ] 4.3 待全局审计外部集成页就绪后,验证过滤后的轨迹加载、空记录、失败状态及连续同步结果完整。
|
||||||
|
- [x] 4.4 运行相关前端校验,并执行 `openspec validate update-asset-sync-status-trail --strict`。
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
# Change: 更新资产信息账号类型字段可见性与运营商账户展示
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
资产信息页当前在卡/设备基础信息区域存在两类与最新业务口径不一致的问题:
|
||||||
|
|
||||||
|
- 卡资产“卡信息”中的 `实名认证策略` 仍会对 `user_type=3`(代理账号)和 `user_type=4`(企业账号)显示。
|
||||||
|
- 设备资产“设备信息”中的 `实名认证策略` 和 `制造商` 仍会对 `user_type=3/4` 显示。
|
||||||
|
- 卡资产“运营商账户”当前展示的是 `carrier_name`,而最新要求需要改为展示 `carrier_type`,并按运营商管理中的映射规则转成中文,例如 `CTCC -> 中国电信`。
|
||||||
|
|
||||||
|
如果不统一这些展示规则,不同账号在资产信息页会继续看到不应暴露的字段,同时“运营商账户”的显示口径也会与系统内其他模块不一致。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 更新卡资产“卡信息”区域:
|
||||||
|
- 当当前登录账号 `user_type` 为 `3` 或 `4` 时,隐藏 `实名认证策略` 字段。
|
||||||
|
- 当当前登录账号 `user_type` 为 `3` 或 `4` 时,`运营商账户` 字段改为展示 `carrier_type` 的中文映射值,而不是 `carrier_name`。
|
||||||
|
- 当当前登录账号 `user_type` 不是 `3` 且不是 `4` 时,`运营商账户` 字段继续保持当前 `carrier_name` 展示口径。
|
||||||
|
- 已知运营商类型映射沿用运营商管理口径:`CMCC -> 中国移动`、`CUCC -> 中国联通`、`CTCC -> 中国电信`、`CBN -> 中国广电`。
|
||||||
|
- 当 `carrier_type` 为空时显示 `-`;若返回未知编码,则保留原编码展示,避免吞掉上游信息。
|
||||||
|
- 更新设备资产“设备信息”区域:
|
||||||
|
- 当当前登录账号 `user_type` 为 `3` 或 `4` 时,隐藏 `实名认证策略` 字段。
|
||||||
|
- 当当前登录账号 `user_type` 为 `3` 或 `4` 时,隐藏 `制造商` 字段。
|
||||||
|
- 范围约束:
|
||||||
|
- 本提案仅调整资产信息基础描述区字段展示。
|
||||||
|
- 本提案不改动实名认证策略相关操作按钮的权限和可见性。
|
||||||
|
- 本提案不改动设备详情“绑定卡列表”中的列展示规则,除非后续另行提出变更。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `asset-information`
|
||||||
|
- Affected code:
|
||||||
|
- `src/views/asset-management/asset-information/components/BasicInfoCard.vue`
|
||||||
|
- `src/views/asset-management/asset-information/composables/useAssetFormatters.ts`
|
||||||
|
- `src/views/asset-management/asset-information/types.ts`
|
||||||
|
- `src/views/asset-management/asset-information/composables/useAssetInfo.ts`
|
||||||
|
- `src/config/constants/carrierTypes.ts`
|
||||||
|
- Dependencies:
|
||||||
|
- 依赖当前登录账号 `user_type` 可从用户状态中稳定读取
|
||||||
|
- 依赖资产详情接口继续返回 `carrier_type`
|
||||||
|
- 运营商类型中文映射应与运营商管理模块保持一致
|
||||||
|
- Breaking changes:
|
||||||
|
- 无外部接口破坏性变更;本次仅调整后台页面展示契约和字段可见性
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Admin Card Asset Carrier Type Contract
|
||||||
|
|
||||||
|
The admin asset information integration SHALL accept and preserve `carrier_type` from `GET /api/admin/assets/resolve/:identifier` for card assets so the card information section can render the carrier account value from the carrier type code.
|
||||||
|
|
||||||
|
#### Scenario: Card asset detail preserves carrier_type from resolve response
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **AND** `GET /api/admin/assets/resolve/:identifier` 返回了 `carrier_type`
|
||||||
|
- **WHEN** 前端解析卡资产详情响应
|
||||||
|
- **THEN** 页面状态 MUST 保留该 `carrier_type` 原始值
|
||||||
|
- **AND** 后续“卡信息”区域的 `运营商账户` 展示 MUST 基于该状态值进行格式化
|
||||||
|
|
||||||
|
#### Scenario: Missing carrier_type does not break card asset detail parsing
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **AND** `GET /api/admin/assets/resolve/:identifier` 未返回 `carrier_type` 或该字段为空
|
||||||
|
- **WHEN** 前端解析卡资产详情响应
|
||||||
|
- **THEN** 页面 MUST 继续保留其他卡资产字段的解析行为
|
||||||
|
- **AND** MUST NOT 因 `carrier_type` 缺失导致“卡信息”区域渲染失败
|
||||||
|
|
||||||
|
### Requirement: Admin Card Asset Carrier Account Display
|
||||||
|
|
||||||
|
The admin asset information view SHALL render the card information field `运营商账户` according to the current logged-in account type.
|
||||||
|
|
||||||
|
For logged-in accounts whose `user_type` is `3` (代理账号) or `4` (企业账号), the field MUST use `carrier_type` and the same carrier-type-to-Chinese mapping used by carrier management.
|
||||||
|
|
||||||
|
Known mappings MUST include `CMCC -> 中国移动`, `CUCC -> 中国联通`, `CTCC -> 中国电信`, and `CBN -> 中国广电`.
|
||||||
|
|
||||||
|
For other logged-in account types, the field MUST keep the existing `carrier_name` display behavior.
|
||||||
|
|
||||||
|
If `carrier_type` is empty or missing, the page MUST display `-`. If `carrier_type` contains an unknown code, the page MUST preserve and display the original code.
|
||||||
|
|
||||||
|
#### Scenario: Show China Telecom label for CTCC in card information for agent or enterprise account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 是 `3` 或 `4`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **AND** 当前卡资产详情状态中的 `carrier_type` 为 `CTCC`
|
||||||
|
- **WHEN** 页面渲染“卡信息”区域中的 `运营商账户`
|
||||||
|
- **THEN** 页面 MUST 显示 `中国电信`
|
||||||
|
|
||||||
|
#### Scenario: Show placeholder when carrier_type is empty for agent or enterprise account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 是 `3` 或 `4`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **AND** 当前卡资产详情状态中的 `carrier_type` 为空、缺失或仅包含空白字符
|
||||||
|
- **WHEN** 页面渲染“卡信息”区域中的 `运营商账户`
|
||||||
|
- **THEN** 页面 MUST 显示 `-`
|
||||||
|
|
||||||
|
#### Scenario: Preserve unknown carrier_type code for agent or enterprise account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 是 `3` 或 `4`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **AND** 当前卡资产详情状态中的 `carrier_type` 为未收录的编码
|
||||||
|
- **WHEN** 页面渲染“卡信息”区域中的 `运营商账户`
|
||||||
|
- **THEN** 页面 MUST 直接显示该原始编码
|
||||||
|
- **AND** MUST NOT 错误映射为其他运营商中文名称
|
||||||
|
|
||||||
|
#### Scenario: Keep carrier_name display for non-agent non-enterprise account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 不是 `3` 也不是 `4`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **AND** 当前卡资产详情状态中的 `carrier_name` 为有效值
|
||||||
|
- **WHEN** 页面渲染“卡信息”区域中的 `运营商账户`
|
||||||
|
- **THEN** 页面 MUST 显示该 `carrier_name`
|
||||||
|
|
||||||
|
### Requirement: Admin Card Realname Policy Visibility By Account Type
|
||||||
|
|
||||||
|
The admin asset information view SHALL hide the card information field `实名认证策略` for logged-in accounts whose `user_type` is `3` (代理账号) or `4` (企业账号).
|
||||||
|
|
||||||
|
For other logged-in account types, the page SHALL keep the existing card information field visibility behavior for `实名认证策略`.
|
||||||
|
|
||||||
|
#### Scenario: Hide card realname policy for agent account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 是 `3`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **WHEN** 页面渲染“卡信息”区域
|
||||||
|
- **THEN** 页面 MUST NOT 显示 `实名认证策略` 字段
|
||||||
|
|
||||||
|
#### Scenario: Hide card realname policy for enterprise account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 是 `4`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **WHEN** 页面渲染“卡信息”区域
|
||||||
|
- **THEN** 页面 MUST NOT 显示 `实名认证策略` 字段
|
||||||
|
|
||||||
|
#### Scenario: Keep card realname policy visible for non-agent non-enterprise account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 不是 `3` 也不是 `4`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的卡资产详情
|
||||||
|
- **WHEN** 页面渲染“卡信息”区域
|
||||||
|
- **THEN** 页面 MUST 继续按现有规则渲染 `实名认证策略` 字段
|
||||||
|
|
||||||
|
### Requirement: Admin Device Sensitive Field Visibility By Account Type
|
||||||
|
|
||||||
|
The admin asset information view SHALL hide the device information fields `实名认证策略` and `制造商` for logged-in accounts whose `user_type` is `3` (代理账号) or `4` (企业账号).
|
||||||
|
|
||||||
|
For other logged-in account types, the page SHALL keep the existing device information field visibility behavior for both fields.
|
||||||
|
|
||||||
|
#### Scenario: Hide device realname policy and manufacturer for agent account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 是 `3`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的设备资产详情
|
||||||
|
- **WHEN** 页面渲染“设备信息”区域
|
||||||
|
- **THEN** 页面 MUST NOT 显示 `实名认证策略` 字段
|
||||||
|
- **AND** 页面 MUST NOT 显示 `制造商` 字段
|
||||||
|
|
||||||
|
#### Scenario: Hide device realname policy and manufacturer for enterprise account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 是 `4`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的设备资产详情
|
||||||
|
- **WHEN** 页面渲染“设备信息”区域
|
||||||
|
- **THEN** 页面 MUST NOT 显示 `实名认证策略` 字段
|
||||||
|
- **AND** 页面 MUST NOT 显示 `制造商` 字段
|
||||||
|
|
||||||
|
#### Scenario: Keep device realname policy and manufacturer visible for non-agent non-enterprise account
|
||||||
|
|
||||||
|
- **GIVEN** 当前登录账号的 `user_type` 不是 `3` 也不是 `4`
|
||||||
|
- **AND** 用户正在查看后台“资产信息”中的设备资产详情
|
||||||
|
- **WHEN** 页面渲染“设备信息”区域
|
||||||
|
- **THEN** 页面 MUST 继续按现有规则渲染 `实名认证策略` 字段
|
||||||
|
- **AND** 页面 MUST 继续按现有规则渲染 `制造商` 字段
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
## 1. Contract And Formatting
|
||||||
|
|
||||||
|
- [x] 1.1 补齐资产信息页面本地类型/状态中的 `carrier_type` 字段,确保卡资产详情可稳定保留该值。
|
||||||
|
- [x] 1.2 复用运营商管理中的运营商类型映射规则,为资产信息页提供 `carrier_type` 到中文文案的格式化能力。
|
||||||
|
|
||||||
|
## 2. UI Visibility
|
||||||
|
|
||||||
|
- [x] 2.1 调整卡资产“卡信息”区域的 `运营商账户` 字段:`user_type=3/4` 展示 `carrier_type` 中文映射,其他账号继续展示原来的 `carrier_name`。
|
||||||
|
- [x] 2.2 当当前登录账号 `user_type` 为 `3` 或 `4` 时,隐藏卡资产“卡信息”区域的 `实名认证策略` 字段。
|
||||||
|
- [x] 2.3 当当前登录账号 `user_type` 为 `3` 或 `4` 时,隐藏设备资产“设备信息”区域的 `实名认证策略` 和 `制造商` 字段。
|
||||||
|
- [x] 2.4 确认本次变更仅影响基础信息描述区,不改动实名认证策略操作按钮和设备绑定卡列表列。
|
||||||
|
|
||||||
|
## 3. Verification
|
||||||
|
|
||||||
|
- [ ] 3.1 验证 `user_type=3/4` 查看卡资产且返回 `carrier_type=CTCC` 时,“运营商账户”显示为 `中国电信`。
|
||||||
|
- [ ] 3.2 验证 `user_type=3/4` 查看卡资产且返回 `carrier_type=CMCC/CUCC/CBN` 时,“运营商账户”分别显示与运营商管理一致的中文文案;空值显示 `-`。
|
||||||
|
- [ ] 3.3 验证 `user_type=3/4` 查看卡资产且返回未知 `carrier_type` 编码时,“运营商账户”保留原编码展示。
|
||||||
|
- [ ] 3.4 验证 `user_type=3` 和 `user_type=4` 查看卡资产时,不显示 `实名认证策略` 字段。
|
||||||
|
- [ ] 3.5 验证 `user_type=3` 和 `user_type=4` 查看设备资产时,不显示 `实名认证策略` 和 `制造商` 字段。
|
||||||
|
- [ ] 3.6 验证其他账号类型查看卡资产时,“运营商账户”继续显示原来的 `carrier_name`;其余上述字段继续按现有规则显示。
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
# Change: 允许企业账号登录后台管理系统
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
当前前端登录流程会在登录接口成功返回后,基于 `user_type=4` 对企业账号做前端拦截,并提示“企业账号无法登录后台管理系统,请使用平台/代理账号登录”。这与最新业务要求不一致,导致企业账号即使后端已返回有效 token、菜单和权限,也无法进入后台。
|
||||||
|
|
||||||
|
如果只保留现状,企业账号无法访问后台中已经按权限和菜单控制开放给它们的页面,也会与近期多项针对企业账号后台可见性和资产能力的变更方向相冲突。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 移除前端登录流程中对 `user_type=4` 企业账号的后台登录拦截。
|
||||||
|
- 企业账号登录成功后,前端应与其他账号类型一致地:
|
||||||
|
- 保存 token
|
||||||
|
- 保存用户信息
|
||||||
|
- 保存权限、菜单和按钮数据
|
||||||
|
- 在存在可用后台菜单和权限时,继续进入后台默认首页/重定向目标页
|
||||||
|
- 当登录接口成功但 `menus` 为空或 `permissions` 为空时:
|
||||||
|
- 前端仅提示“当前账号暂无任何权限,请联系管理员分配角色和权限”
|
||||||
|
- 不继续进入后台首页或动态路由注册流程
|
||||||
|
- 不作为这条提示的后续动作调用退出登录接口
|
||||||
|
- 登录成功后的页面访问边界继续由现有菜单、路由权限、按钮权限和后端接口权限共同控制。
|
||||||
|
- 本提案不要求本次同步放开所有企业账号受限接口或页面;仅调整“企业账号能否进入后台”的前端准入逻辑。
|
||||||
|
- 本提案不修改登录接口路径、请求参数或返回结构。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `admin-authentication`
|
||||||
|
- Affected code:
|
||||||
|
- `src/composables/useLogin.ts`
|
||||||
|
- `src/router/guards/beforeEach.ts`
|
||||||
|
- `src/router/guards/permission.ts`
|
||||||
|
- `src/App.vue`
|
||||||
|
- 其他依赖当前登录态、菜单和权限进行页面准入的后台入口逻辑
|
||||||
|
- Dependencies:
|
||||||
|
- 后端登录接口继续允许企业账号返回有效 `access_token`、`user`、`permissions`、`menus`、`buttons`
|
||||||
|
- 企业账号需要至少具备一部分后台菜单或权限,才能进入可访问页面
|
||||||
|
- Breaking changes:
|
||||||
|
- 无外部接口破坏性变更;本次为前端登录准入行为放宽
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Enterprise Account Admin Login Admission
|
||||||
|
|
||||||
|
The admin login flow SHALL allow enterprise accounts whose `user_type` is `4` to sign in to the admin system when the login API returns a successful response with valid authentication data.
|
||||||
|
|
||||||
|
The frontend MUST NOT reject admin login solely because `user_type` equals `4`.
|
||||||
|
|
||||||
|
#### Scenario: Enterprise account is allowed to complete admin login
|
||||||
|
|
||||||
|
- **GIVEN** 用户使用企业账号凭证登录后台管理系统
|
||||||
|
- **AND** 登录接口返回成功状态
|
||||||
|
- **AND** 返回数据包含有效 `access_token`
|
||||||
|
- **AND** 返回数据中的 `user.user_type` 为 `4`
|
||||||
|
- **WHEN** 前端处理登录成功响应
|
||||||
|
- **THEN** 前端 MUST 继续执行后台登录成功流程
|
||||||
|
- **AND** MUST NOT 弹出“企业账号无法登录后台管理系统,请使用平台/代理账号登录”提示
|
||||||
|
|
||||||
|
#### Scenario: Enterprise account login still fails when login API itself fails
|
||||||
|
|
||||||
|
- **GIVEN** 用户使用企业账号凭证登录后台管理系统
|
||||||
|
- **AND** 登录接口返回失败状态,或未返回有效 `access_token`
|
||||||
|
- **WHEN** 前端处理登录响应
|
||||||
|
- **THEN** 前端 MUST 继续按现有登录失败流程处理
|
||||||
|
- **AND** MUST NOT 将“允许企业账号登录后台”解释为绕过登录接口失败
|
||||||
|
|
||||||
|
### Requirement: Enterprise Account Login State Persistence
|
||||||
|
|
||||||
|
The admin login flow SHALL persist enterprise-account login state using the same token, user, permissions, menus, and buttons handling used for other successful admin logins only when the login response provides usable admin-access data.
|
||||||
|
|
||||||
|
#### Scenario: Enterprise account saves auth state after successful login with usable admin access data
|
||||||
|
|
||||||
|
- **GIVEN** 用户使用企业账号成功登录后台管理系统
|
||||||
|
- **AND** 登录返回中包含 `access_token`、`refresh_token`、`user`、`permissions`、`menus`、`buttons`
|
||||||
|
- **AND** `permissions` 非空
|
||||||
|
- **AND** `menus` 非空
|
||||||
|
- **WHEN** 前端写入登录态
|
||||||
|
- **THEN** 前端 MUST 保存 token
|
||||||
|
- **AND** MUST 保存用户信息
|
||||||
|
- **AND** MUST 保存权限、菜单和按钮数据
|
||||||
|
|
||||||
|
#### Scenario: Enterprise account shows no-permission warning without logout follow-up
|
||||||
|
|
||||||
|
- **GIVEN** 用户使用企业账号成功登录后台管理系统
|
||||||
|
- **AND** 登录返回中的 `permissions` 为空,或 `menus` 为空
|
||||||
|
- **WHEN** 前端处理登录成功响应
|
||||||
|
- **THEN** 前端 MUST 继续显示现有“当前账号暂无任何权限,请联系管理员分配角色和权限”提示
|
||||||
|
- **AND** MUST NOT 因为空权限或空菜单回退为企业账号登录拦截
|
||||||
|
- **AND** MUST NOT 继续进入后台首页或动态路由注册流程
|
||||||
|
- **AND** MUST NOT 因这条无权限提示而调用退出登录接口
|
||||||
|
|
||||||
|
### Requirement: Enterprise Account Admin Entry Uses Existing Authorization Boundaries
|
||||||
|
|
||||||
|
Allowing enterprise accounts to sign in to the admin system SHALL NOT by itself grant additional page or API access beyond the existing menu, route-permission, button-permission, and backend authorization boundaries.
|
||||||
|
|
||||||
|
#### Scenario: Enterprise account enters admin and follows existing route registration flow
|
||||||
|
|
||||||
|
- **GIVEN** 用户使用企业账号成功登录后台管理系统
|
||||||
|
- **AND** 登录返回中的 `permissions` 非空
|
||||||
|
- **AND** 登录返回中的 `menus` 非空
|
||||||
|
- **WHEN** 前端进入登录后的路由注册和首页跳转流程
|
||||||
|
- **THEN** 前端 MUST 继续按现有菜单和动态路由注册逻辑处理
|
||||||
|
- **AND** MUST NOT 因 `user_type=4` 在该阶段额外拒绝用户进入后台
|
||||||
|
|
||||||
|
#### Scenario: Enterprise account page access remains permission-controlled
|
||||||
|
|
||||||
|
- **GIVEN** 用户已使用企业账号登录后台管理系统
|
||||||
|
- **WHEN** 用户尝试访问某个后台页面或触发某个后台操作
|
||||||
|
- **THEN** 页面访问和操作可用性 MUST 继续由现有菜单、路由权限、按钮权限和后端接口鉴权决定
|
||||||
|
- **AND** 允许登录后台本身 MUST NOT 被解释为默认拥有全部后台页面和操作权限
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
## 1. Login Flow
|
||||||
|
|
||||||
|
- [x] 1.1 移除登录成功后对 `user_type=4` 企业账号的前端拒绝逻辑和错误提示。
|
||||||
|
- [x] 1.2 确保企业账号在登录成功后与其他账号一样完成 token、用户信息、权限、菜单、按钮的保存流程。
|
||||||
|
- [x] 1.3 当登录成功但 `menus` 或 `permissions` 为空时,仅提示“当前账号暂无任何权限,请联系管理员分配角色和权限”并停止后续登录流程,不调用退出登录接口。
|
||||||
|
|
||||||
|
## 2. Navigation And Access
|
||||||
|
|
||||||
|
- [x] 2.1 确保企业账号在具备可用后台菜单和权限时,继续走现有后台首页跳转和路由注册流程,不因账号类型被额外拦截。
|
||||||
|
- [x] 2.2 确认企业账号后台访问范围仍由现有菜单、路由权限和后端接口权限控制,而不是在登录阶段一刀切拒绝。
|
||||||
|
|
||||||
|
## 3. Verification
|
||||||
|
|
||||||
|
- [ ] 3.1 验证企业账号登录成功后不再出现“企业账号无法登录后台管理系统,请使用平台/代理账号登录”提示。
|
||||||
|
- [ ] 3.2 验证企业账号在具备可用后台菜单和权限时,能正常保存登录态并进入后台首页或重定向目标页。
|
||||||
|
- [ ] 3.3 验证企业账号在菜单为空或权限为空时,仅提示“暂无任何权限”,且不会继续调用退出登录接口。
|
||||||
|
- [ ] 3.4 验证平台账号和代理账号登录流程不受影响。
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# Change: 换货新资产归属继承提示
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
当前换货流程在选择新资产后,页面没有明确告知换货完成后的最终归属店铺,运营人员容易误以为可以手工选择目标店铺,进而对换货结果产生误判。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在换货创建入口、发货确认入口、换货详情页补充旧资产所属店铺和新资产继承归属店铺的展示。
|
||||||
|
- 直接换货创建入口查询新资产时,按已选旧资产的 `shop_id` 过滤新资产候选,确保新旧资产限定在同一店铺范围内选择。
|
||||||
|
- 保持现有换货创建、发货、确认完成接口和入参语义不变,不新增目标店铺选择控件或目标店铺提交字段。
|
||||||
|
- 扩展换货响应数据,返回 `inherited_shop_id` 和 `inherited_shop_name` 供前端统一展示最终归属店铺。
|
||||||
|
- 在创建、发货、确认完成流程中补充提交中禁用、防重复提交、后端归属校验失败提示,以及成功后的详情刷新;创建换货单失败提示复用统一 HTTP 错误处理。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `exchange-management`
|
||||||
|
- Related active changes: `update-exchange-flow-direct-type`(本提案建立在现有换货流程类型改造之上,需合并考虑)
|
||||||
|
- Affected code:
|
||||||
|
- `src/api/modules/exchange.ts`
|
||||||
|
- `src/views/asset-management/exchange-management/index.vue`
|
||||||
|
- `src/views/asset-management/exchange-management/detail.vue`
|
||||||
|
- 相关旧资产/新资产搜索结果类型或映射逻辑(如需补充店铺名称展示数据)
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: 换货归属继承上下文展示
|
||||||
|
|
||||||
|
系统 SHALL 在换货创建和发货确认流程中展示旧资产当前所属店铺,并在用户选定新资产后以只读方式提示换货完成后的继承归属店铺,避免用户误认为可以手工指定目标店铺。
|
||||||
|
|
||||||
|
#### Scenario: 创建入口展示旧资产所属店铺
|
||||||
|
|
||||||
|
- **GIVEN** 用户进入现有换货创建入口
|
||||||
|
- **WHEN** 用户选择旧资产
|
||||||
|
- **THEN** 系统 MUST 显示该旧资产当前所属店铺名称
|
||||||
|
- **AND** 该所属店铺信息 MUST be read-only
|
||||||
|
|
||||||
|
#### Scenario: 选择新资产后展示继承归属提示
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在换货创建或发货确认流程中操作
|
||||||
|
- **WHEN** 用户选择新资产
|
||||||
|
- **THEN** 系统 MUST 显示只读提示 `换货完成后将归属:{店铺名称}`
|
||||||
|
- **AND** `{店铺名称}` MUST 表示该新资产换货完成后的最终归属店铺
|
||||||
|
|
||||||
|
#### Scenario: 页面不提供目标店铺选择控件
|
||||||
|
|
||||||
|
- **WHEN** 用户查看换货创建或发货确认入口
|
||||||
|
- **THEN** 系统 MUST NOT 渲染目标店铺选择控件
|
||||||
|
- **AND** 用户 MUST NOT 能够手工覆盖继承归属店铺
|
||||||
|
|
||||||
|
#### Scenario: 直接换货新资产候选按旧资产店铺过滤
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在创建直接换货单
|
||||||
|
- **AND** 用户已选择旧资产
|
||||||
|
- **WHEN** 前端加载或搜索新资产标识符候选项
|
||||||
|
- **THEN** 新 IoT 卡候选查询 MUST include the selected old asset `shop_id`
|
||||||
|
- **AND** 新设备候选查询 MUST include the selected old asset `shop_id`
|
||||||
|
- **AND** 查询 MUST continue to include `status=1`
|
||||||
|
|
||||||
|
#### Scenario: 未选择旧资产时不加载直接换货新资产候选
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在创建直接换货单
|
||||||
|
- **AND** 用户尚未选择旧资产
|
||||||
|
- **WHEN** 新资产标识符候选项准备加载
|
||||||
|
- **THEN** 前端 MUST NOT request new asset candidates without the old asset `shop_id`
|
||||||
|
- **AND** 新资产候选列表 MUST remain empty until an old asset is selected
|
||||||
|
|
||||||
|
### Requirement: 换货归属继承接口契约
|
||||||
|
|
||||||
|
系统 SHALL 复用现有换货创建、发货和确认完成接口,并在换货数据模型中返回继承后的店铺标识和店铺名称,供创建结果、发货结果、完成结果和详情页统一展示。
|
||||||
|
|
||||||
|
#### Scenario: 创建请求保持既有字段语义
|
||||||
|
|
||||||
|
- **WHEN** 前端调用 `POST /api/admin/exchanges`
|
||||||
|
- **THEN** 请求体 MUST 继续沿用旧资产、新资产、换货类型和资料迁移字段
|
||||||
|
- **AND** 请求体 MUST NOT 新增目标店铺字段
|
||||||
|
|
||||||
|
#### Scenario: 发货和完成请求不新增目标店铺字段
|
||||||
|
|
||||||
|
- **WHEN** 前端调用 `POST /api/admin/exchanges/{id}/ship` 或 `POST /api/admin/exchanges/{id}/complete`
|
||||||
|
- **THEN** 请求体 MUST NOT 新增目标店铺字段
|
||||||
|
- **AND** 后端 MUST 继续按现有换货流程处理归属继承
|
||||||
|
|
||||||
|
#### Scenario: 换货响应返回继承店铺字段
|
||||||
|
|
||||||
|
- **WHEN** 前端收到换货创建、发货、确认完成结果或读取换货详情
|
||||||
|
- **THEN** 返回的 `data` MUST 包含 `inherited_shop_id:int64` 和 `inherited_shop_name:string`
|
||||||
|
- **AND** `inherited_shop_name` MUST 表示换货完成后新资产最终归属的店铺名称
|
||||||
|
|
||||||
|
### Requirement: 换货详情继承归属展示
|
||||||
|
|
||||||
|
系统 SHALL 在换货详情页展示继承后的店铺名称,并在关键操作成功后刷新详情数据,保证页面展示的归属信息与后端一致。
|
||||||
|
|
||||||
|
#### Scenario: 详情页展示继承后的店铺名称
|
||||||
|
|
||||||
|
- **GIVEN** 用户进入换货详情页
|
||||||
|
- **WHEN** 详情数据加载成功
|
||||||
|
- **THEN** 页面 MUST 展示继承后的店铺名称
|
||||||
|
- **AND** 页面 MUST NOT 隐藏该归属字段
|
||||||
|
|
||||||
|
#### Scenario: 发货或确认完成成功后刷新详情
|
||||||
|
|
||||||
|
- **GIVEN** 用户完成换货发货或确认完成操作
|
||||||
|
- **WHEN** 接口返回成功
|
||||||
|
- **THEN** 系统 MUST 重新拉取该换货单详情
|
||||||
|
- **AND** 刷新后的详情 MUST 展示最新的继承归属店铺信息
|
||||||
|
|
||||||
|
### Requirement: 换货归属继承错误与提交状态处理
|
||||||
|
|
||||||
|
系统 SHALL 在新资产归属校验失败时展示后端错误,并在创建、发货、确认完成提交期间禁用操作按钮,防止重复提交,同时保证失败后可以重试。创建换货单接口失败 MUST use the unified HTTP error handling and MUST NOT render a duplicate local error alert inside the create dialog.
|
||||||
|
|
||||||
|
#### Scenario: 新资产属于其他店铺时展示后端错误
|
||||||
|
|
||||||
|
- **GIVEN** 用户选择了不允许用于当前换货流程的新资产
|
||||||
|
- **WHEN** 后端返回“新资产属于其他店铺”或等价归属校验错误
|
||||||
|
- **THEN** 系统 MUST 通过统一 HTTP 错误处理展示后端错误信息
|
||||||
|
- **AND** 系统 MUST NOT 提供手工修改目标店铺的替代入口
|
||||||
|
- **AND** 创建换货单弹窗内 MUST NOT 额外展示重复错误 Alert
|
||||||
|
|
||||||
|
#### Scenario: 提交期间禁用按钮防止重复提交
|
||||||
|
|
||||||
|
- **WHEN** 用户提交创建、发货或确认完成操作
|
||||||
|
- **THEN** 当前操作按钮 MUST 进入禁用或 loading 状态直到请求结束
|
||||||
|
- **AND** 在请求完成前的重复点击 MUST NOT 触发第二次提交
|
||||||
|
|
||||||
|
#### Scenario: 请求失败后恢复可重试状态
|
||||||
|
|
||||||
|
- **WHEN** 创建、发货或确认完成请求失败
|
||||||
|
- **THEN** 系统 MUST 恢复当前操作按钮可用状态
|
||||||
|
- **AND** 页面 MUST 保留当前已展示的资产与归属提示,便于用户修正后重试
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
## 1. API Contract
|
||||||
|
|
||||||
|
- [x] 1.1 更新换货数据模型,补充 `inherited_shop_id` 和 `inherited_shop_name` 响应字段,并覆盖创建、发货、确认完成及详情读取场景。
|
||||||
|
- [x] 1.2 保持 `POST /api/admin/exchanges`、`POST /api/admin/exchanges/{id}/ship`、`POST /api/admin/exchanges/{id}/complete` 的既有入参语义,不新增目标店铺字段。
|
||||||
|
|
||||||
|
## 2. Exchange Create And Ship UI
|
||||||
|
|
||||||
|
- [x] 2.1 在换货创建入口中,选择旧资产后展示旧资产所属店铺。
|
||||||
|
- [x] 2.2 在换货创建入口和发货确认入口中,选择新资产后展示只读提示 `换货完成后将归属:{店铺名称}`。
|
||||||
|
- [x] 2.3 确保上述页面不新增目标店铺选择控件,也不允许手工覆盖继承归属。
|
||||||
|
- [x] 2.4 直接换货创建入口的新资产默认列表和搜索请求按已选旧资产 `shop_id` 过滤,并继续固定 `status=1`。
|
||||||
|
|
||||||
|
## 3. Exchange Detail And Submission States
|
||||||
|
|
||||||
|
- [x] 3.1 在换货详情页展示继承后的店铺名称,并在发货或确认完成成功后重新拉取详情。
|
||||||
|
- [x] 3.2 在创建、发货、确认完成提交期间禁用操作按钮,防止重复提交。
|
||||||
|
- [x] 3.3 在新资产归属校验失败时通过统一 HTTP 错误处理展示后端错误,并在失败后恢复可重试状态。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [x] 4.1 验证创建、发货确认、详情三个入口均能正确展示旧资产所属店铺和继承归属店铺。
|
||||||
|
- [x] 4.2 验证加载中、失败提示、重复提交防护和成功后详情刷新的交互状态。
|
||||||
|
- [x] 4.3 运行相关前端校验,并执行 `openspec validate update-exchange-inherited-shop-hint --strict`。
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# Change: 展示换货退款拦截错误
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
创建换货单时,后端会拦截存在活跃退款申请的资产,但当前创建页仅使用通用提示或控制台日志,运营无法直接知道资产因退款申请不能换货。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 复用 `POST /api/admin/exchanges` 的现有失败 `code`、`msg` 契约,不改变成功响应结构。
|
||||||
|
- 创建换货单被退款拦截或其他后端业务规则拒绝时,通过统一 HTTP 错误处理展示后端业务原因,例如“该资产存在退款申请”,不在创建弹窗内额外渲染本地错误区域。
|
||||||
|
- 创建失败后保留当前填写的表单、已选资产与流程类型,恢复提交按钮使用户可更换资产后重新提交。
|
||||||
|
- 前端不新增退款状态查询、预检查区域或退款申请入口。
|
||||||
|
- 前端不读取或推断退款审批、撤销、拒绝或处理完成状态;是否允许换货完全依据创建接口结果。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `exchange-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/api/modules/exchange.ts`
|
||||||
|
- `src/views/asset-management/exchange-management/index.vue`
|
||||||
|
- API contract:
|
||||||
|
- `POST /api/admin/exchanges`
|
||||||
|
- Out of scope:
|
||||||
|
- 退款状态查询和预检查
|
||||||
|
- 退款审批、撤销、拒绝或处理功能
|
||||||
|
- 换货创建成功响应结构调整
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Exchange Creation Refund Interception Feedback
|
||||||
|
|
||||||
|
The exchange creation page SHALL display the backend business reason through the unified HTTP error handling when `POST /api/admin/exchanges` rejects the selected old asset because of an active refund application. The page MUST use the response `code` and `msg` contract without changing the successful exchange response structure, and MUST NOT render an additional local error area inside the create dialog for the same failure.
|
||||||
|
|
||||||
|
#### Scenario: Display active refund interception reason
|
||||||
|
|
||||||
|
- **GIVEN** 用户已填写创建换货单表单并选择存在活跃退款申请的旧资产
|
||||||
|
- **WHEN** `POST /api/admin/exchanges` 返回失败 `code` 和 `msg`
|
||||||
|
- **THEN** 页面 MUST display the backend business reason through the unified HTTP error handling
|
||||||
|
- **AND** 当后端 `msg` 为“该资产存在退款申请”时,页面 MUST display that message directly
|
||||||
|
- **AND** 页面 MUST NOT display a duplicate error alert inside the create exchange dialog
|
||||||
|
- **AND** 系统 MUST NOT create a new exchange order
|
||||||
|
|
||||||
|
#### Scenario: Display other exchange creation business reason
|
||||||
|
|
||||||
|
- **GIVEN** 用户已填写创建换货单表单
|
||||||
|
- **WHEN** 创建接口返回非退款相关的业务失败 `code` 和 `msg`
|
||||||
|
- **THEN** 页面 MUST display the backend `msg` through the unified HTTP error handling
|
||||||
|
- **AND** 页面 MUST NOT replace the backend business reason with a generic frontend failure message
|
||||||
|
- **AND** 页面 MUST NOT display a duplicate error alert inside the create exchange dialog
|
||||||
|
|
||||||
|
### Requirement: Exchange Creation Retry After Interception
|
||||||
|
|
||||||
|
The exchange creation page SHALL preserve the current form values after a backend rejection and allow the user to change assets and submit again after the request completes.
|
||||||
|
|
||||||
|
#### Scenario: Preserve form after refund interception
|
||||||
|
|
||||||
|
- **GIVEN** 创建换货单请求被后端退款规则拒绝
|
||||||
|
- **WHEN** 页面展示后端业务原因
|
||||||
|
- **THEN** 页面 MUST retain the selected old asset, new asset when applicable, flow type, reason, and other form values
|
||||||
|
- **AND** 提交按钮 MUST leave its loading state after the request completes
|
||||||
|
|
||||||
|
#### Scenario: Retry with another asset
|
||||||
|
|
||||||
|
- **GIVEN** 用户已收到退款拦截错误
|
||||||
|
- **WHEN** 用户更换旧资产并再次提交创建换货单
|
||||||
|
- **THEN** 系统 MUST send a new `POST /api/admin/exchanges` request using the updated form values
|
||||||
|
|
||||||
|
### Requirement: Backend-Controlled Exchange Refund Eligibility
|
||||||
|
|
||||||
|
The exchange creation page MUST rely exclusively on the exchange creation response to determine refund-related eligibility. The frontend MUST NOT add a refund status lookup, a refund pre-check area, or infer eligibility from refund approval, rejection, withdrawal, or completion states.
|
||||||
|
|
||||||
|
#### Scenario: Do not pre-check refund eligibility
|
||||||
|
|
||||||
|
- **WHEN** 用户打开或填写创建换货单表单
|
||||||
|
- **THEN** 页面 MUST NOT issue a refund status query solely to determine exchange eligibility
|
||||||
|
- **AND** 页面 MUST NOT render a refund status pre-check area
|
||||||
|
|
||||||
|
#### Scenario: Permit assets according to backend decision
|
||||||
|
|
||||||
|
- **GIVEN** 用户选择曾有退款申请但后端允许换货的资产
|
||||||
|
- **WHEN** 创建接口成功返回
|
||||||
|
- **THEN** 页面 MUST treat the exchange creation as successful
|
||||||
|
- **AND** 页面 MUST NOT block the operation based on a frontend interpretation of refund history
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
## 1. Exchange Creation Failure Contract
|
||||||
|
|
||||||
|
- [x] 1.1 保持 `POST /api/admin/exchanges` 及其成功响应结构不变。
|
||||||
|
- [x] 1.2 读取创建失败响应的统一 `code` 和 `msg`,不将后端业务原因替换为通用前端文案。
|
||||||
|
|
||||||
|
## 2. Refund Interception Feedback
|
||||||
|
|
||||||
|
- [x] 2.1 通过统一 HTTP 错误处理展示后端返回的退款拦截业务原因,不在创建弹窗内额外渲染本地错误区域。
|
||||||
|
- [x] 2.2 退款拦截失败后保留表单输入、已选资产和流程类型。
|
||||||
|
- [x] 2.3 请求结束后恢复提交按钮,使用户能够更换资产并再次提交。
|
||||||
|
|
||||||
|
## 3. Backend-Controlled Eligibility
|
||||||
|
|
||||||
|
- [x] 3.1 不增加退款状态查询、预检查区域或退款申请入口。
|
||||||
|
- [x] 3.2 不根据退款审批、撤销、拒绝或处理状态自行判断资产能否换货。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [ ] 4.1 验证活跃退款资产创建换货时显示“该资产存在退款申请”或后端等价业务原因,且不创建换货单。
|
||||||
|
- [ ] 4.2 验证已拒绝、撤销或处理完成退款的资产按后端结果可继续创建换货。
|
||||||
|
- [ ] 4.3 验证失败后保留表单并可更换资产重新提交。
|
||||||
|
- [x] 4.4 运行相关前端校验,并执行 `openspec validate update-exchange-refund-interception-feedback --strict`。
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Change: 更新换货列表的新旧资产展示与独立搜索
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
换货管理列表当前使用一个资产标识符条件同时匹配旧资产和新资产,且表格未完整区分两侧资产类型与标识。运营人员无法准确按换出资产或换入资产检索、识别换货单。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 将换货列表筛选区的单一“资产标识符”替换为“旧资产”和“新资产”两个独立输入框。
|
||||||
|
- 列表查询使用 `old_asset_keyword` 和 `new_asset_keyword`;两个条件可独立或组合传递,空条件不传。
|
||||||
|
- 停止在换货列表查询中使用旧的通用 `identifier` 参数。
|
||||||
|
- 扩展换货列表项契约,支持旧资产和新资产各自的 `type`、`id`、`identifier`,以及 `status`、`status_name`。
|
||||||
|
- 换货列表分别展示旧资产类型、旧资产标识、新资产类型、新资产标识四列,不能混列。
|
||||||
|
- 物联网卡使用后端返回的 ICCID,设备使用后端返回的设备号;前端不转换接入号、虚拟号或其他输入标识。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `exchange-management`
|
||||||
|
- Related active changes:
|
||||||
|
- `update-exchange-flow-direct-type`,本提案替换其换货列表通用资产标识符筛选口径,不改变流程类型筛选与换货操作。
|
||||||
|
- `update-asset-exchange-generation-links`,仅共享换货领域概念,不修改资产详情换货链路展示。
|
||||||
|
- Affected code:
|
||||||
|
- `src/api/modules/exchange.ts`
|
||||||
|
- `src/views/asset-management/exchange-management/index.vue`
|
||||||
|
- API contract:
|
||||||
|
- `GET /api/admin/exchanges?old_asset_keyword=&new_asset_keyword=`
|
||||||
|
- Dependencies:
|
||||||
|
- 后端列表接口支持分别按旧资产和新资产关键词查询,并返回新旧资产字段。
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Exchange List Separate Asset Query Contract
|
||||||
|
|
||||||
|
The exchange management list integration SHALL query `GET /api/admin/exchanges` with optional `old_asset_keyword` and `new_asset_keyword` parameters instead of the deprecated generic `identifier` parameter.
|
||||||
|
|
||||||
|
#### Scenario: Query by old asset only
|
||||||
|
|
||||||
|
- **GIVEN** 用户在换货管理列表的“旧资产”输入框中填写关键词
|
||||||
|
- **AND** “新资产”输入框为空
|
||||||
|
- **WHEN** 用户执行搜索
|
||||||
|
- **THEN** 请求 MUST include `old_asset_keyword` with the entered value
|
||||||
|
- **AND** 请求 MUST NOT include `new_asset_keyword`
|
||||||
|
- **AND** 请求 MUST NOT include `identifier`
|
||||||
|
|
||||||
|
#### Scenario: Query by new asset only
|
||||||
|
|
||||||
|
- **GIVEN** 用户在换货管理列表的“新资产”输入框中填写关键词
|
||||||
|
- **AND** “旧资产”输入框为空
|
||||||
|
- **WHEN** 用户执行搜索
|
||||||
|
- **THEN** 请求 MUST include `new_asset_keyword` with the entered value
|
||||||
|
- **AND** 请求 MUST NOT include `old_asset_keyword`
|
||||||
|
- **AND** 请求 MUST NOT include `identifier`
|
||||||
|
|
||||||
|
#### Scenario: Combine old and new asset keywords
|
||||||
|
|
||||||
|
- **GIVEN** 用户在“旧资产”和“新资产”输入框中均填写关键词
|
||||||
|
- **WHEN** 用户执行搜索
|
||||||
|
- **THEN** 请求 MUST include both `old_asset_keyword` and `new_asset_keyword`
|
||||||
|
- **AND** 后端返回同时匹配两项条件的换货单
|
||||||
|
|
||||||
|
#### Scenario: Omit empty asset keywords
|
||||||
|
|
||||||
|
- **GIVEN** “旧资产”和“新资产”输入框均为空
|
||||||
|
- **WHEN** 用户查询、刷新、切换分页或重置搜索条件
|
||||||
|
- **THEN** 请求 MUST NOT include `old_asset_keyword`
|
||||||
|
- **AND** 请求 MUST NOT include `new_asset_keyword`
|
||||||
|
- **AND** 请求 MUST NOT include `identifier`
|
||||||
|
|
||||||
|
#### Scenario: Preserve raw asset keyword input
|
||||||
|
|
||||||
|
- **GIVEN** 用户输入 ICCID、接入号、虚拟号、IMEI 或 SN 作为旧资产或新资产关键词
|
||||||
|
- **WHEN** 页面发送列表查询请求
|
||||||
|
- **THEN** 页面 MUST pass the entered text unchanged in its corresponding keyword parameter
|
||||||
|
- **AND** 页面 MUST NOT convert an access number, virtual number, or other identifier into another asset identifier
|
||||||
|
|
||||||
|
### Requirement: Exchange List Separate Asset Display Contract
|
||||||
|
|
||||||
|
The exchange list-item contract SHALL preserve `old_asset_type`, `old_asset_id`, `old_asset_identifier`, `new_asset_type`, `new_asset_id`, `new_asset_identifier`, `status`, and `status_name` from each `GET /api/admin/exchanges` item.
|
||||||
|
|
||||||
|
#### Scenario: Parse old and new asset fields
|
||||||
|
|
||||||
|
- **GIVEN** 换货列表接口返回一条换货单
|
||||||
|
- **WHEN** 前端解析该列表项
|
||||||
|
- **THEN** 前端类型 MUST support the old asset type, ID, and identifier fields independently from the new asset fields
|
||||||
|
- **AND** 前端类型 MUST support `status` and `status_name`
|
||||||
|
|
||||||
|
### Requirement: Exchange List Separate Asset Columns
|
||||||
|
|
||||||
|
The exchange management list SHALL display distinct columns for `旧资产类型`, `旧资产标识`, `新资产类型`, and `新资产标识`.
|
||||||
|
|
||||||
|
#### Scenario: Display separate old and new IoT card assets
|
||||||
|
|
||||||
|
- **GIVEN** 换货列表项的 `old_asset_type` 和 `new_asset_type` 均为 `iot_card`
|
||||||
|
- **WHEN** 页面渲染换货列表行
|
||||||
|
- **THEN** 旧资产类型和新资产类型 MUST each display `物联网卡`
|
||||||
|
- **AND** 旧资产标识 MUST display `old_asset_identifier` as the backend-returned ICCID
|
||||||
|
- **AND** 新资产标识 MUST display `new_asset_identifier` as the backend-returned ICCID
|
||||||
|
|
||||||
|
#### Scenario: Display separate old and new device assets
|
||||||
|
|
||||||
|
- **GIVEN** 换货列表项的旧资产或新资产类型为 `device`
|
||||||
|
- **WHEN** 页面渲染换货列表行
|
||||||
|
- **THEN** 对应资产类型 MUST display `设备`
|
||||||
|
- **AND** 对应资产标识 MUST display its backend-returned device number
|
||||||
|
|
||||||
|
#### Scenario: Keep old and new asset values separated
|
||||||
|
|
||||||
|
- **GIVEN** 换货列表接口返回新旧资产字段
|
||||||
|
- **WHEN** 页面渲染换货列表行
|
||||||
|
- **THEN** 旧资产列 MUST only read `old_asset_type` and `old_asset_identifier`
|
||||||
|
- **AND** 新资产列 MUST only read `new_asset_type` and `new_asset_identifier`
|
||||||
|
- **AND** 页面 MUST NOT substitute a missing new asset value with an old asset value
|
||||||
|
|
||||||
|
#### Scenario: Display unavailable new asset placeholder
|
||||||
|
|
||||||
|
- **GIVEN** 换货列表项尚未关联新资产,或新资产类型或标识为空
|
||||||
|
- **WHEN** 页面渲染新资产列
|
||||||
|
- **THEN** 页面 MUST display a stable placeholder for each unavailable value
|
||||||
|
|
||||||
|
#### Scenario: Display backend exchange status name
|
||||||
|
|
||||||
|
- **GIVEN** 换货列表项返回 `status_name`
|
||||||
|
- **WHEN** 页面渲染状态列
|
||||||
|
- **THEN** 页面 MUST display `status_name`
|
||||||
|
- **AND** 当 `status_name` 缺失时页面 MUST display a stable placeholder
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
## 1. API Contract And Types
|
||||||
|
|
||||||
|
- [ ] 1.1 将换货列表查询类型中的通用 `identifier` 替换为可选的 `old_asset_keyword` 与 `new_asset_keyword`。
|
||||||
|
- [ ] 1.2 扩展换货列表项类型,支持 `old_asset_type`、`old_asset_id`、`old_asset_identifier`、`new_asset_type`、`new_asset_id`、`new_asset_identifier`、`status` 和 `status_name`。
|
||||||
|
|
||||||
|
## 2. Exchange List Search
|
||||||
|
|
||||||
|
- [ ] 2.1 将换货管理列表筛选区的“资产标识符”替换为“旧资产”和“新资产”输入框。
|
||||||
|
- [ ] 2.2 查询、刷新和分页时保留并传递非空的 `old_asset_keyword`、`new_asset_keyword`,不再发送 `identifier`。
|
||||||
|
- [ ] 2.3 重置搜索条件时清空新旧资产关键词,后续请求不发送这两个参数。
|
||||||
|
- [ ] 2.4 保留用户输入的 ICCID、接入号、虚拟号、IMEI 或 SN 原始值,不在前端转换后再传递给后端。
|
||||||
|
|
||||||
|
## 3. Exchange List Display
|
||||||
|
|
||||||
|
- [ ] 3.1 增加旧资产类型、旧资产标识、新资产类型、新资产标识四个独立列表列。
|
||||||
|
- [ ] 3.2 根据后端资产类型显示“物联网卡”或“设备”,并原样显示对应后端资产标识。
|
||||||
|
- [ ] 3.3 状态列优先展示后端 `status_name`,缺失时显示稳定占位内容。
|
||||||
|
- [ ] 3.4 新资产字段在未分配时显示稳定占位内容,不与旧资产字段混用。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [ ] 4.1 验证仅输入旧资产、仅输入新资产、同时输入新旧资产时,请求分别传递正确的关键词参数。
|
||||||
|
- [ ] 4.2 验证两个资产关键词均为空时不传筛选参数,重置后保持相同行为。
|
||||||
|
- [ ] 4.3 验证旧资产和新资产类型、标识符分别显示,IoT 卡显示 ICCID、设备显示设备号。
|
||||||
|
- [ ] 4.4 验证卡的 ICCID、接入号或虚拟号关键词均由后端按输入所在的旧/新资产条件命中,前端不转换输入值。
|
||||||
|
- [ ] 4.5 运行相关类型检查、lint 或构建验证。
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# Change: 支持套餐分配生效条件覆盖
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
代理套餐分配目前只能使用套餐本身的默认生效条件,运营无法针对某个店铺套餐授权选择购买即生效或实名即生效。分配页也无法区分套餐默认值、分配覆盖值和最终实际生效值,容易误解后续订单的生效规则。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在套餐授权/分配和已分配套餐编辑入口增加“生效条件”单选:跟随套餐默认、购买即生效、实名激活时生效。
|
||||||
|
- 新建分配时调用 `POST /api/admin/shop-package-allocations`,明确传递 `expiry_base_override`;选择“跟随套餐默认”时 MUST 显式传递 `null`,不得省略字段。
|
||||||
|
- 系列授权创建、系列授权新增套餐和批量套餐分配时,均 MUST 显式传递 `expiry_base_override`;该配置只作用于本次新建分配。
|
||||||
|
- 已分配套餐修改生效条件时调用 `PATCH /api/admin/shop-package-allocations/{id}/expiry-base`,请求体为 `expiry_base_override:null|from_purchase|from_activation`。
|
||||||
|
- 在分配详情、编辑弹框和代理系列授权套餐列表展示后端返回的默认生效条件、覆盖生效条件和最终生效条件的中文名称。
|
||||||
|
- 修改弹框提示“仅影响后续新订单,不影响已购买套餐”。
|
||||||
|
- 前端不根据默认值和覆盖值自行计算最终生效条件,直接使用后端返回的 `effective_expiry_base` 及其名称字段。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `shop-package-allocation`
|
||||||
|
- `shop-series-grant-packages`
|
||||||
|
- Affected code:
|
||||||
|
- `src/types/api/packageManagement.ts`
|
||||||
|
- 新增或扩展 `src/api/modules` 中的店铺套餐分配服务
|
||||||
|
- `src/views/package-management/series-grants/index.vue`
|
||||||
|
- `src/views/package-management/series-grants/packages.vue`
|
||||||
|
- `src/views/package-management/series-grants/detail.vue`
|
||||||
|
- API contracts:
|
||||||
|
- `POST /api/admin/shop-package-allocations`
|
||||||
|
- `PATCH /api/admin/shop-package-allocations/{id}/expiry-base`
|
||||||
|
- `POST /api/admin/shop-series-grants`
|
||||||
|
- `PUT /api/admin/shop-series-grants/{id}/packages`
|
||||||
|
- `POST /api/admin/shop-package-batch-allocations`
|
||||||
|
- Out of scope:
|
||||||
|
- 已购买套餐或历史订单的生效条件迁移
|
||||||
|
- 前端根据分配字段推导或覆盖实际生效条件
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Package Allocation Expiry Base Override Contract
|
||||||
|
|
||||||
|
The shop package allocation contract SHALL support an explicit `expiry_base_override` when creating or updating an allocation. The allowed request values MUST be `null`, `from_purchase`, and `from_activation`. The frontend MUST NOT send `from_realname`.
|
||||||
|
|
||||||
|
#### Scenario: Create allocation following the package default
|
||||||
|
|
||||||
|
- **GIVEN** 用户在套餐授权/分配弹框选择“跟随套餐默认”
|
||||||
|
- **WHEN** 用户创建店铺套餐分配
|
||||||
|
- **THEN** 系统 MUST call `POST /api/admin/shop-package-allocations`
|
||||||
|
- **AND** 请求 MUST explicitly contain `expiry_base_override: null`
|
||||||
|
- **AND** 系统 MUST NOT omit `expiry_base_override` to represent following the default
|
||||||
|
|
||||||
|
#### Scenario: Create allocation with purchase activation override
|
||||||
|
|
||||||
|
- **GIVEN** 用户在套餐授权/分配弹框选择“购买即生效”
|
||||||
|
- **WHEN** 用户创建店铺套餐分配
|
||||||
|
- **THEN** 请求 MUST contain `expiry_base_override: "from_purchase"`
|
||||||
|
|
||||||
|
#### Scenario: Create allocation with activation override
|
||||||
|
|
||||||
|
- **GIVEN** 用户在套餐授权/分配弹框选择“实名激活时生效”
|
||||||
|
- **WHEN** 用户创建店铺套餐分配
|
||||||
|
- **THEN** 请求 MUST contain `expiry_base_override: "from_activation"`
|
||||||
|
|
||||||
|
### Requirement: Package Allocation Expiry Base Update
|
||||||
|
|
||||||
|
The system SHALL update an existing package allocation's expiry-base override through `PATCH /api/admin/shop-package-allocations/{id}/expiry-base` with a body containing `expiry_base_override`.
|
||||||
|
|
||||||
|
#### Scenario: Update allocation expiry base override
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在编辑已分配套餐的生效条件
|
||||||
|
- **WHEN** 用户选择“购买即生效”或“实名激活时生效”并保存
|
||||||
|
- **THEN** 系统 MUST call `PATCH /api/admin/shop-package-allocations/{id}/expiry-base`
|
||||||
|
- **AND** 请求体 MUST contain the selected `expiry_base_override`
|
||||||
|
|
||||||
|
#### Scenario: Restore allocation to package default
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在编辑已分配套餐的生效条件
|
||||||
|
- **WHEN** 用户选择“跟随套餐默认”并保存
|
||||||
|
- **THEN** 请求体 MUST explicitly contain `expiry_base_override: null`
|
||||||
|
|
||||||
|
#### Scenario: Use activation override enum
|
||||||
|
|
||||||
|
- **GIVEN** 用户在已分配套餐编辑弹框选择“实名激活时生效”
|
||||||
|
- **WHEN** 用户保存生效条件
|
||||||
|
- **THEN** 请求体 MUST contain `expiry_base_override: "from_activation"`
|
||||||
|
- **AND** 请求体 MUST NOT contain `expiry_base_override: "from_realname"`
|
||||||
|
|
||||||
|
### Requirement: Package Allocation Expiry Base Resolution Response
|
||||||
|
|
||||||
|
The package allocation response SHALL provide `default_expiry_base`, `expiry_base_override`, and `effective_expiry_base`, together with their corresponding Chinese name fields. The frontend MUST render the returned effective value and name without calculating it from other fields.
|
||||||
|
|
||||||
|
#### Scenario: Display distinct expiry base values
|
||||||
|
|
||||||
|
- **WHEN** 前端加载或更新店铺套餐分配记录
|
||||||
|
- **THEN** 前端类型 MUST support `default_expiry_base`、`expiry_base_override`、`effective_expiry_base`
|
||||||
|
- **AND** 前端类型 MUST support the corresponding Chinese name fields
|
||||||
|
- **AND** 页面 MUST distinguish the default value, override value, and effective value
|
||||||
|
|
||||||
|
#### Scenario: Use backend effective expiry base
|
||||||
|
|
||||||
|
- **GIVEN** 分配响应同时返回默认值和覆盖值
|
||||||
|
- **WHEN** 页面展示最终生效条件
|
||||||
|
- **THEN** 页面 MUST display the backend returned `effective_expiry_base_name`
|
||||||
|
- **AND** 前端 MUST NOT calculate or replace the effective value from the default value and override value
|
||||||
|
|
||||||
|
#### Scenario: Display null override as following package default
|
||||||
|
|
||||||
|
- **GIVEN** 分配响应的 `expiry_base_override` 为 `null`
|
||||||
|
- **WHEN** 页面展示覆盖生效条件
|
||||||
|
- **THEN** 页面 MUST use `expiry_base_override_name` when it is returned
|
||||||
|
- **AND** 页面 MUST display “跟随套餐默认” when the returned override name is empty or null
|
||||||
|
|
||||||
|
### Requirement: Package Allocation Expiry Base Applies Prospectively
|
||||||
|
|
||||||
|
The package allocation expiry-base override SHALL apply only to future new orders. The allocation creation and editing UI MUST inform the user that purchased packages are unaffected.
|
||||||
|
|
||||||
|
#### Scenario: Inform user before changing allocation expiry base
|
||||||
|
|
||||||
|
- **WHEN** 用户在已分配套餐编辑弹框查看或修改生效条件
|
||||||
|
- **THEN** 页面 MUST display `仅影响后续新订单,不影响已购买套餐`
|
||||||
|
|
||||||
|
#### Scenario: Preserve purchased package behavior
|
||||||
|
|
||||||
|
- **WHEN** 用户创建、更新或恢复套餐分配的生效条件
|
||||||
|
- **THEN** 前端 MUST NOT attempt to update existing purchased packages or historical orders
|
||||||
|
|
||||||
|
### Requirement: Package Allocation Response Field Contract
|
||||||
|
|
||||||
|
All package allocation and package response objects involved in allocation management SHALL preserve the six expiry-base fields returned by the backend: `default_expiry_base`, `default_expiry_base_name`, `expiry_base_override`, `expiry_base_override_name`, `effective_expiry_base`, and `effective_expiry_base_name`.
|
||||||
|
|
||||||
|
#### Scenario: Preserve six expiry-base fields in allocation responses
|
||||||
|
|
||||||
|
- **WHEN** 前端接收套餐分配创建、更新、详情或列表响应
|
||||||
|
- **THEN** 前端类型 MUST support all six expiry-base fields
|
||||||
|
- **AND** 页面 MUST use backend-provided `*_name` fields for display
|
||||||
|
|
||||||
|
#### Scenario: Preserve six expiry-base fields in package responses
|
||||||
|
|
||||||
|
- **WHEN** 前端接收套餐列表、套餐详情、套餐创建或套餐更新响应
|
||||||
|
- **THEN** 前端类型 MUST support all six expiry-base fields when returned by the API
|
||||||
|
- **AND** 前端 MUST NOT infer allocation effective expiry behavior from package default fields
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Series Grant Package Expiry Base Visibility
|
||||||
|
|
||||||
|
The series grant package list and package edit context SHALL display the package allocation's default expiry base, override expiry base, and effective expiry base using the Chinese name fields returned by the backend.
|
||||||
|
|
||||||
|
#### Scenario: Display expiry bases in series grant package list
|
||||||
|
|
||||||
|
- **GIVEN** 用户进入代理系列授权套餐列表
|
||||||
|
- **WHEN** 已授权套餐记录返回默认、覆盖和最终生效条件字段
|
||||||
|
- **THEN** 页面 MUST display the default expiry base name, override expiry base name, and effective expiry base name for the package allocation
|
||||||
|
|
||||||
|
#### Scenario: Display expiry bases in package edit context
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开代理系列授权中已授权套餐的编辑弹框
|
||||||
|
- **WHEN** 套餐分配数据加载完成
|
||||||
|
- **THEN** 页面 MUST display the default expiry base name, override expiry base name, and effective expiry base name
|
||||||
|
- **AND** 页面 MUST display `仅影响后续新订单,不影响已购买套餐`
|
||||||
|
|
||||||
|
### Requirement: Series Grant Package Expiry Base Editing
|
||||||
|
|
||||||
|
The series grant package edit context SHALL provide `跟随套餐默认`, `购买即生效`, and `实名激活时生效` options, then update the corresponding package allocation record through the package allocation expiry-base API.
|
||||||
|
|
||||||
|
#### Scenario: Edit override from series grant package list
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在代理系列授权套餐列表编辑已授权套餐
|
||||||
|
- **WHEN** 用户选择生效条件并保存
|
||||||
|
- **THEN** 系统 MUST use the corresponding package allocation record ID to call `PATCH /api/admin/shop-package-allocations/{id}/expiry-base`
|
||||||
|
- **AND** 选择“跟随套餐默认”时请求 MUST explicitly contain `expiry_base_override: null`
|
||||||
|
|
||||||
|
### Requirement: Series Grant Creation Expiry Base Contract
|
||||||
|
|
||||||
|
The series grant creation and package addition flows SHALL explicitly send one shared `expiry_base_override` for all newly created package allocations. The allowed values MUST be `null`, `from_purchase`, and `from_activation`.
|
||||||
|
|
||||||
|
#### Scenario: Create series grant with shared expiry base override
|
||||||
|
|
||||||
|
- **WHEN** 前端调用 `POST /api/admin/shop-series-grants`
|
||||||
|
- **THEN** 请求 MUST explicitly contain `expiry_base_override`
|
||||||
|
- **AND** the selected value MUST apply to all package allocations created by the initial authorization
|
||||||
|
|
||||||
|
#### Scenario: Add packages to existing series grant with shared expiry base override
|
||||||
|
|
||||||
|
- **WHEN** 前端调用 `PUT /api/admin/shop-series-grants/{id}/packages` to add packages
|
||||||
|
- **THEN** 请求 MUST explicitly contain `expiry_base_override`
|
||||||
|
- **AND** the selected value MUST apply only to the newly added package allocations
|
||||||
|
- **AND** modifying or deleting existing packages MUST NOT change their historical override values
|
||||||
|
|
||||||
|
#### Scenario: Restore default during series grant creation or package addition
|
||||||
|
|
||||||
|
- **WHEN** 用户选择“跟随套餐默认”
|
||||||
|
- **THEN** 请求 MUST explicitly contain `expiry_base_override: null`
|
||||||
|
- **AND** 请求 MUST NOT omit the field to represent the default
|
||||||
|
|
||||||
|
### Requirement: Batch Package Allocation Expiry Base Contract
|
||||||
|
|
||||||
|
The batch package allocation flow SHALL apply one explicitly selected `expiry_base_override` to all allocations created by the batch request.
|
||||||
|
|
||||||
|
#### Scenario: Create batch allocations with shared expiry base
|
||||||
|
|
||||||
|
- **WHEN** 前端调用 `POST /api/admin/shop-package-batch-allocations`
|
||||||
|
- **THEN** 请求 MUST explicitly contain `expiry_base_override`
|
||||||
|
- **AND** all returned `data.allocations[]` items MUST preserve the allocation ID and six expiry-base fields
|
||||||
|
|
||||||
|
#### Scenario: Batch allocation follows package default
|
||||||
|
|
||||||
|
- **WHEN** 用户在批量分配中选择“跟随套餐默认”
|
||||||
|
- **THEN** 请求 MUST explicitly contain `expiry_base_override: null`
|
||||||
|
|
||||||
|
#### Scenario: Refresh effective value after editing
|
||||||
|
|
||||||
|
- **WHEN** 代理系列授权套餐的生效条件更新成功
|
||||||
|
- **THEN** 页面 MUST refresh the relevant package allocation data
|
||||||
|
- **AND** 页面 MUST display the latest backend returned effective expiry base name
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
## 1. Allocation Contract
|
||||||
|
|
||||||
|
- [x] 1.1 扩展店铺套餐分配请求与响应类型,支持 `expiry_base_override`、`default_expiry_base`、`effective_expiry_base` 及对应中文名称字段。
|
||||||
|
- [x] 1.2 接入创建分配接口 `POST /api/admin/shop-package-allocations` 的 `expiry_base_override` 参数。
|
||||||
|
- [x] 1.3 接入修改生效条件接口 `PATCH /api/admin/shop-package-allocations/{id}/expiry-base`。
|
||||||
|
|
||||||
|
## 2. Allocation Expiry Condition UI
|
||||||
|
|
||||||
|
- [x] 2.1 在套餐授权/分配弹框提供“跟随套餐默认”“购买即生效”“实名激活时生效”三选一。
|
||||||
|
- [x] 2.2 选择“跟随套餐默认”时显式提交 `expiry_base_override: null`。
|
||||||
|
- [x] 2.3 在已分配套餐编辑弹框显示“仅影响后续新订单,不影响已购买套餐”提示。
|
||||||
|
- [x] 2.4 在已分配套餐详情或编辑弹框显示默认值、覆盖值和最终值的后端中文名称。
|
||||||
|
|
||||||
|
## 3. Series Grant Package Visibility
|
||||||
|
|
||||||
|
- [x] 3.1 在代理系列授权套餐列表显示默认生效条件、覆盖生效条件和最终生效条件。
|
||||||
|
- [x] 3.2 从代理系列授权套餐列表编辑生效条件时,使用对应套餐分配记录 ID 调用生效条件更新接口。
|
||||||
|
- [x] 3.3 保存成功后刷新授权套餐列表或详情,展示后端返回的最新最终生效条件。
|
||||||
|
|
||||||
|
## 4. Policy Integrity and Verification
|
||||||
|
|
||||||
|
- [x] 4.1 前端不从默认值和覆盖值计算或修改 `effective_expiry_base`。
|
||||||
|
- [x] 4.2 验证新建分配时三种选项分别提交 `null`、`from_purchase`、`from_activation`,且不提交 `from_realname`。
|
||||||
|
- [x] 4.3 验证编辑覆盖值和恢复默认均只影响后续新订单,不影响已购买套餐。
|
||||||
|
- [x] 4.4 验证页面可区分默认值、覆盖值和最终生效条件,并正确显示后端中文名称。
|
||||||
|
- [x] 4.5 运行相关前端校验,并执行 `openspec validate update-package-allocation-expiry-base-override --strict`。
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
## Context
|
||||||
|
|
||||||
|
退款申请由后台提交业务资料,审批过程在企微完成,后台只负责展示企微审批信息以及订单退款的业务处理结果。当前页面仍按本地审批模型展示通过、拒绝和退回操作,需要调整为只读状态展示并保留受限的重新申请能力。
|
||||||
|
|
||||||
|
## Goals / Non-Goals
|
||||||
|
|
||||||
|
- Goals: 让退款创建、列表和详情与企微审批及业务处理状态保持一致。
|
||||||
|
- Goals: 展示可追溯的审批单号、参与人、意见、附件和时间线。
|
||||||
|
- Goals: 明确区分审批状态与业务处理状态,并覆盖处理失败和自动重试提示。
|
||||||
|
- Goals: 允许符合条件的退款重新申请,同时锁定订单、资产和提交人快照。
|
||||||
|
- Non-Goals: 不在前端实现企微审批动作、审批回调或审批引擎。
|
||||||
|
- Non-Goals: 不在后台执行非代理钱包的人工退款。
|
||||||
|
- Non-Goals: 不根据本地旧状态推断企微审批状态或处理状态。
|
||||||
|
|
||||||
|
## Decisions
|
||||||
|
|
||||||
|
- Decision: 详情接口返回的 `approval` 对象作为企微审批信息的唯一数据源。
|
||||||
|
- Rationale: 审批动作在企微完成,前端不应通过本地状态或额外请求重建审批过程。
|
||||||
|
|
||||||
|
- Decision: `processing_status` 与审批状态独立展示,并使用后端返回的状态名称、失败摘要和业务处理结果。
|
||||||
|
- Rationale: “审批通过”不等于退款处理完成,两个状态必须避免混用。
|
||||||
|
|
||||||
|
- Decision: 创建和重新申请的附件统一使用 `{ file_key, file_name, file_size }[]`。
|
||||||
|
- Rationale: 页面既要提交对象存储文件标识,也要在审批详情中保留可读的文件元数据。
|
||||||
|
|
||||||
|
- Decision: 重新申请资格由后端最终校验,前端按已驳回、已撤销或已删除状态控制入口并处理接口拒绝。
|
||||||
|
- Rationale: 状态可能被并发更新,前端展示控制不能替代服务端业务校验。
|
||||||
|
|
||||||
|
- Decision: 移除本地通过、驳回、退回和人工退款确认入口及调用。
|
||||||
|
- Rationale: 这些操作与企微审批职责冲突,继续保留会造成重复审批或错误退款。
|
||||||
|
|
||||||
|
## Data Contract
|
||||||
|
|
||||||
|
- Create request: refund amount, reason, remark and `attachments`.
|
||||||
|
- Detail response: refund business data, `approval` object and `processing_status`.
|
||||||
|
- Approval object: `source`, `sp_no`, `status`, `status_name`, `template_version`, `applicant`, `approvers`, `comments`, `attachments`, `timeline`, `business_process_result`.
|
||||||
|
- Resubmit request: editable refund amount, attachments and reason; immutable order, asset and submitter snapshots.
|
||||||
|
- Resubmit eligible statuses: rejected, revoked or deleted, using the backend status contract.
|
||||||
|
|
||||||
|
## Risks / Trade-offs
|
||||||
|
|
||||||
|
- Risk: 企微审批状态名称或时间线字段可能为空或增加新状态.
|
||||||
|
- Mitigation: 保留后端原始字段,缺失时显示稳定占位,不在前端硬编码未知状态映射。
|
||||||
|
|
||||||
|
- Risk: 审批通过后业务处理可能失败或进入重试.
|
||||||
|
- Mitigation: 独立展示处理状态、失败摘要,并按后端结果显示系统重试或联系管理员提示。
|
||||||
|
|
||||||
|
- Risk: 后端仍允许旧本地审批接口调用.
|
||||||
|
- Mitigation: 前端移除入口和调用,同时由后端按新审批模式拒绝不适用的本地操作。
|
||||||
|
|
||||||
|
## Migration Plan
|
||||||
|
|
||||||
|
1. 确认退款创建、详情和重新申请接口的字段名称及状态枚举。
|
||||||
|
2. 扩展退款类型和对象存储附件元数据类型。
|
||||||
|
3. 更新创建退款表单和附件提交结构。
|
||||||
|
4. 重构退款详情为业务信息、企微审批信息和业务处理结果三个区域。
|
||||||
|
5. 移除本地审批及人工退款操作,保留并限制重新申请入口。
|
||||||
|
6. 验证审批中、通过处理中、处理成功、驳回、撤销和通过后撤销异常状态。
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- `processing_status` 的完整枚举、展示名称和“系统重试中/联系管理员”的触发字段需要后端确认。
|
||||||
|
- “已删除”是退款记录状态、审批状态还是业务处理状态,需要接口契约明确。
|
||||||
|
- `approval.attachments` 是否与退款创建附件共用文件对象结构,需要联调确认。
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
# Change: 退款企微审批详情与业务处理状态
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
退款申请创建时需要一次性提交完整业务资料,后续审批由企微完成,后台系统不再承担本地通过、驳回、退回或人工退款确认。当前退款页面仍展示本地审批操作,且详情无法完整呈现企微审批过程和退款业务处理结果,容易造成审批状态与实际处理状态混淆。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 退款创建表单支持退款金额、退款原因、备注和附件,并以对象存储附件对象数组提交。
|
||||||
|
- 创建后申请退款金额不可在本地修改,审批金额以企微审批结果为准。
|
||||||
|
- 退款详情拆分为退款业务信息、企微审批信息和业务处理结果三个区域。
|
||||||
|
- 企微审批区域展示 `sp_no`、审批状态、申请人、审批人、意见、附件和审批时间线。
|
||||||
|
- 业务处理区域展示 `processing_status`、处理失败摘要和“系统重试中/联系管理员”提示。
|
||||||
|
- 退款列表和详情仅展示审批及处理状态,不提供本地通过、驳回、退回或人工退款确认按钮。
|
||||||
|
- 重新申请仅允许已驳回、已撤销或已删除的退款记录,并允许修改金额、凭证和原因;订单、资产和提交人快照不可修改。
|
||||||
|
- 继续使用 `POST /api/admin/refunds`、`GET /api/admin/refunds/{id}` 和 `POST /api/admin/refunds/{id}/resubmit`,同步扩展请求和响应契约。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `refund-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/types/api/refund.ts`
|
||||||
|
- `src/api/modules/refund.ts`
|
||||||
|
- `src/views/finance/refund/index.vue`
|
||||||
|
- `src/views/finance/refund/detail.vue`
|
||||||
|
- 退款创建与附件展示组件
|
||||||
|
- API contracts:
|
||||||
|
- `POST /api/admin/refunds`
|
||||||
|
- `GET /api/admin/refunds/{id}`
|
||||||
|
- `POST /api/admin/refunds/{id}/resubmit`
|
||||||
|
- Dependencies:
|
||||||
|
- 后端返回完整 `approval` 对象和 `processing_status`。
|
||||||
|
- 对象存储上传接口可返回 `file_key`,前端维护文件名和文件大小。
|
||||||
|
- 企微审批系统负责审批动作和审批结果同步。
|
||||||
|
- Out of scope:
|
||||||
|
- 前端发起、撤回或执行企微审批动作。
|
||||||
|
- 前端实现财务线下退款。
|
||||||
|
- 前端根据状态码自行推导审批结果或业务处理结果。
|
||||||
|
- Breaking changes:
|
||||||
|
- 退款审批相关本地操作按钮和对应前端调用不再适用于企微审批退款流程。
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Refund Creation Submits WeCom Approval Materials
|
||||||
|
|
||||||
|
The refund creation flow SHALL submit the refund business materials required for an external WeCom approval.
|
||||||
|
|
||||||
|
#### Scenario: Create refund with business materials
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开退款创建表单
|
||||||
|
- **WHEN** 用户填写退款金额、退款原因、备注并完成附件上传
|
||||||
|
- **THEN** 系统 MUST submit the refund amount, reason, remark and attachment metadata to `POST /api/admin/refunds`
|
||||||
|
- **AND** 每个附件 MUST use the structure `{ file_key, file_name, file_size }`
|
||||||
|
|
||||||
|
#### Scenario: Submitted amount is immutable locally
|
||||||
|
|
||||||
|
- **GIVEN** 退款申请已创建并进入企微审批
|
||||||
|
- **WHEN** 用户查看退款记录
|
||||||
|
- **THEN** 页面 MUST NOT provide a local control to modify the submitted refund amount
|
||||||
|
- **AND** any changed amount MUST be submitted through the defined resubmission flow only
|
||||||
|
|
||||||
|
### Requirement: Refund Detail Displays WeCom Approval
|
||||||
|
|
||||||
|
The refund detail page SHALL display the backend-provided WeCom approval object as a read-only approval record.
|
||||||
|
|
||||||
|
#### Scenario: Display approval details
|
||||||
|
|
||||||
|
- **GIVEN** `GET /api/admin/refunds/{id}` returns an `approval` object
|
||||||
|
- **WHEN** 用户打开退款详情
|
||||||
|
- **THEN** 页面 MUST display the approval source, `sp_no`, status, status name, applicant, approvers, comments, attachments and timeline
|
||||||
|
- **AND** 页面 MUST preserve the backend approval values without locally changing or deriving them
|
||||||
|
|
||||||
|
#### Scenario: No local approval controls
|
||||||
|
|
||||||
|
- **GIVEN** 用户查看退款列表或退款详情
|
||||||
|
- **WHEN** 页面展示企微审批信息
|
||||||
|
- **THEN** 页面 MUST NOT display local approve, reject, return or manual refund confirmation buttons
|
||||||
|
- **AND** 页面 MUST NOT call local approval action endpoints for this flow
|
||||||
|
|
||||||
|
### Requirement: Refund Processing Result Is Independent From Approval
|
||||||
|
|
||||||
|
The refund detail page SHALL display business processing status separately from WeCom approval status.
|
||||||
|
|
||||||
|
#### Scenario: Display processing result
|
||||||
|
|
||||||
|
- **GIVEN** 退款详情返回 `processing_status` and its result fields
|
||||||
|
- **WHEN** 用户查看退款业务处理区域
|
||||||
|
- **THEN** 页面 MUST display the processing status, failure summary and business process result
|
||||||
|
- **AND** 页面 MUST display a system-retrying or contact-administrator message when indicated by the backend
|
||||||
|
|
||||||
|
#### Scenario: Display required lifecycle states
|
||||||
|
|
||||||
|
- **GIVEN** 后端返回审批中、通过处理中、处理成功、驳回、撤销或通过后撤销异常状态
|
||||||
|
- **WHEN** 页面渲染退款列表或详情
|
||||||
|
- **THEN** 页面 MUST show an explicit status for the returned state
|
||||||
|
- **AND** 页面 MUST NOT infer processing completion from approval status alone
|
||||||
|
|
||||||
|
### Requirement: Refund Resubmission Has Restricted Editable Fields
|
||||||
|
|
||||||
|
The refund resubmission flow SHALL allow resubmission only for rejected, revoked or deleted records and SHALL preserve immutable business snapshots.
|
||||||
|
|
||||||
|
#### Scenario: Resubmit an eligible refund
|
||||||
|
|
||||||
|
- **GIVEN** 退款状态为已驳回、已撤销或已删除
|
||||||
|
- **WHEN** 用户发起重新申请
|
||||||
|
- **THEN** 页面 MUST allow editing the refund amount, attachments and refund reason
|
||||||
|
- **AND** 系统 MUST submit the request to `POST /api/admin/refunds/{id}/resubmit`
|
||||||
|
|
||||||
|
#### Scenario: Reject resubmission for an ineligible refund
|
||||||
|
|
||||||
|
- **GIVEN** 退款记录不属于已驳回、已撤销或已删除状态
|
||||||
|
- **WHEN** 用户查看退款详情
|
||||||
|
- **THEN** 页面 MUST NOT enable the resubmission action
|
||||||
|
- **AND** 页面 MUST handle a backend rejection without creating a new approval request
|
||||||
|
|
||||||
|
#### Scenario: Preserve refund snapshots on resubmission
|
||||||
|
|
||||||
|
- **GIVEN** 用户填写重新申请表单
|
||||||
|
- **WHEN** 用户修改可编辑字段
|
||||||
|
- **THEN** 页面 MUST NOT provide controls to change the order snapshot, asset snapshot or submitter snapshot
|
||||||
|
|
||||||
|
### Requirement: Refund Pages Use Backend Approval And Processing Data
|
||||||
|
|
||||||
|
The refund list and detail pages SHALL use backend response data as the source of truth for approval and processing display.
|
||||||
|
|
||||||
|
#### Scenario: Refresh refund status
|
||||||
|
|
||||||
|
- **WHEN** 用户刷新退款列表或重新加载退款详情
|
||||||
|
- **THEN** 页面 MUST use the latest refund, approval and processing data returned by the backend
|
||||||
|
- **AND** 页面 MUST NOT reconstruct a status from stale local form data or legacy status mappings
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
## 1. Contract And Types
|
||||||
|
|
||||||
|
- [x] 1.1 按产品文档落地退款创建接口的金额、原因、备注和附件字段名称。
|
||||||
|
- [x] 1.2 按产品文档扩展退款详情响应中的 `approval`、`processing_status`、失败摘要和业务处理结果字段。
|
||||||
|
- [x] 1.3 按产品文档限制重新申请的可编辑字段、允许状态和不可变快照字段。
|
||||||
|
- [x] 1.4 扩展退款请求、响应和审批对象 TypeScript 类型,支持附件对象数组。
|
||||||
|
- [x] 1.5 更新退款 API service 类型及注释,移除不再适用的本地审批调用契约。
|
||||||
|
|
||||||
|
## 2. Refund Creation
|
||||||
|
|
||||||
|
- [x] 2.1 更新退款创建表单,提交退款金额、原因、备注和附件。
|
||||||
|
- [x] 2.2 复用现有对象存储上传流程,并将上传结果规范化为 `{ file_key, file_name, file_size }[]`。
|
||||||
|
- [x] 2.3 创建成功后明确提示已提交企微审批,创建后的申请金额不可在本地修改。
|
||||||
|
- [x] 2.4 验证附件上传中、上传失败、空附件和接口失败时不能提交错误数据。
|
||||||
|
|
||||||
|
## 3. Refund List And Detail
|
||||||
|
|
||||||
|
- [x] 3.1 退款详情拆分为退款业务信息、企微审批信息和业务处理结果三个区域。
|
||||||
|
- [x] 3.2 展示 `sp_no`、审批状态、申请人、审批人、意见、附件和审批时间线。
|
||||||
|
- [x] 3.3 展示 `processing_status`、失败摘要,以及系统重试中/联系管理员提示。
|
||||||
|
- [x] 3.4 退款列表和详情不显示本地通过、驳回、退回或人工退款确认按钮。
|
||||||
|
- [x] 3.5 保留既有退款业务信息和附件查看能力,不根据前端状态推导审批或处理结果。
|
||||||
|
|
||||||
|
## 4. Resubmission
|
||||||
|
|
||||||
|
- [x] 4.1 仅在已驳回、已撤销或已删除状态显示重新申请入口。
|
||||||
|
- [x] 4.2 重新申请允许修改退款金额、凭证和退款原因。
|
||||||
|
- [x] 4.3 重新申请禁止修改订单、资产和提交人快照。
|
||||||
|
- [x] 4.4 提交 `/api/admin/refunds/{id}/resubmit` 后刷新详情并展示新的企微审批状态。
|
||||||
|
- [x] 4.5 处理后端状态变化或无权限时的重新申请失败提示。
|
||||||
|
|
||||||
|
## 5. Verification
|
||||||
|
|
||||||
|
- [x] 5.1 验证审批中、通过处理中、处理成功、驳回、撤销和通过后撤销异常展示明确。
|
||||||
|
- [x] 5.2 验证审批信息与业务处理状态分区展示且互不推导。
|
||||||
|
- [x] 5.3 验证本地审批及人工退款操作入口和 API 调用均已移除。
|
||||||
|
- [x] 5.4 验证刷新、列表进入详情和重新申请后的数据来自后端最新响应。
|
||||||
|
- [x] 5.5 运行类型检查、lint、相关测试和构建。
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
## Context
|
||||||
|
|
||||||
|
信用额度分为两个层级:客户角色上的默认信用只决定未来新建代理店铺的初始值,店铺上的实际信用额度才参与资金页展示和后续额度调整。两者必须解耦,避免角色配置变更影响已有店铺。
|
||||||
|
|
||||||
|
## Goals / Non-Goals
|
||||||
|
|
||||||
|
Goals:
|
||||||
|
|
||||||
|
- 明确角色默认信用和店铺实际信用额度的职责边界。
|
||||||
|
- 明确资金概况页读取后端返回的金额和版本作为展示、调额和并发控制来源。
|
||||||
|
- 明确关闭信用时额度输入归零。
|
||||||
|
|
||||||
|
Non-Goals:
|
||||||
|
|
||||||
|
- 不在前端重新计算可用金额、欠款金额或是否欠款。
|
||||||
|
- 不为平台员工角色提供信用配置。
|
||||||
|
- 不批量同步历史店铺额度。
|
||||||
|
|
||||||
|
## Decisions
|
||||||
|
|
||||||
|
- 角色默认信用保存到 `PUT /api/admin/roles/{id}/default-credit`,请求体为 `credit_enabled` 和 `credit_limit`。
|
||||||
|
- 店铺实际信用额度保存到 `PUT /api/admin/shops/{id}/credit-limit`,请求体为 `credit_enabled`、`credit_limit` 和 `version`。
|
||||||
|
- 资金概况继续通过 `GET /api/admin/shops/fund-summary` 获取,前端展示 `balance`、`frozen_balance`、`credit_enabled`、`credit_limit`、`available_balance`、`is_in_debt`、`debt_amount` 和 `version`。
|
||||||
|
- 调整弹框展示修改前后金额预览,但最终可用金额、欠款金额和欠款状态仍以后端刷新后的资金概况为准。
|
||||||
|
|
||||||
|
## Risks / Trade-offs
|
||||||
|
|
||||||
|
- 并发更新可能覆盖他人修改。通过提交 `version` 并在冲突时刷新资金概况降低风险。
|
||||||
|
- 用户可能误以为角色默认信用会修改已有店铺。通过固定提示“修改后不会影响已有店铺”降低误解。
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- 并发冲突的后端错误码或 HTTP 状态码是否固定为某个值,需要实现时与接口文档对齐。
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# Change: 角色默认信用与店铺实际额度管理
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
当前角色信用配置容易被理解为会直接影响已有店铺,且代理商资金页缺少单独维护店铺实际信用额度的入口。需要将“未来新建店铺的默认信用”和“已有店铺的实际信用额度”拆分管理,避免修改角色配置误伤存量店铺。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 客户角色配置页新增“新建代理默认信用”开关和额度输入,并提示“修改后不会影响已有店铺”。
|
||||||
|
- 平台员工角色不展示默认信用配置。
|
||||||
|
- 店铺创建时使用所选客户角色的默认信用初始化新店铺实际信用额度。
|
||||||
|
- 代理商资金概况页展示现金余额、冻结金额、实际信用额度、可用金额、欠款金额和版本。
|
||||||
|
- 代理商资金概况页提供独立的店铺实际额度调整弹框,展示修改前后金额预览。
|
||||||
|
- 调整店铺实际额度时携带资金概况版本,遇到并发冲突后提示用户并刷新最新资金概况。
|
||||||
|
- 前端不重新计算可用金额、欠款金额或资金状态,金额展示以接口返回为准。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `role-management`, `shop-management`, `commission-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/api/modules/role.ts`
|
||||||
|
- `src/api/modules/shop.ts`
|
||||||
|
- `src/api/modules/commission.ts`
|
||||||
|
- `src/types/api/role.ts`
|
||||||
|
- `src/types/api/shop.ts`
|
||||||
|
- `src/types/api/commission.ts`
|
||||||
|
- `src/views/system/role/index.vue`
|
||||||
|
- `src/views/shop-management/list/index.vue`
|
||||||
|
- `src/views/commission-management/agent-fund-overview/index.vue`
|
||||||
|
- Source product note: `docs/产品迭代7月份/15- 角色默认信用与店铺实际额度管理.md`
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Agent Fund Summary Actual Credit Display
|
||||||
|
|
||||||
|
The agent fund overview page SHALL display shop actual credit and fund summary fields from `GET /api/admin/shops/fund-summary` without recalculating monetary values on the frontend.
|
||||||
|
|
||||||
|
#### Scenario: Display fund summary credit fields
|
||||||
|
|
||||||
|
- **GIVEN** 用户进入代理商资金概况页
|
||||||
|
- **WHEN** `GET /api/admin/shops/fund-summary` 返回资金概况记录
|
||||||
|
- **THEN** 页面 MUST 展示现金余额 `balance`
|
||||||
|
- **AND** 页面 MUST 展示冻结金额 `frozen_balance`
|
||||||
|
- **AND** 页面 MUST 展示实际信用额度 `credit_limit`
|
||||||
|
- **AND** 页面 MUST 展示可用金额 `available_balance`
|
||||||
|
- **AND** 页面 MUST 展示欠款金额 `debt_amount`
|
||||||
|
- **AND** 页面 MUST 展示版本 `version`
|
||||||
|
|
||||||
|
#### Scenario: Display credit disabled state
|
||||||
|
|
||||||
|
- **GIVEN** 资金概况记录返回 `credit_enabled=false`
|
||||||
|
- **WHEN** 页面渲染该记录
|
||||||
|
- **THEN** 页面 MUST 将实际信用显示为关闭状态
|
||||||
|
- **AND** 页面 MUST display credit limit as `0` or backend-provided formatted value
|
||||||
|
|
||||||
|
#### Scenario: Do not recalculate fund amounts on frontend
|
||||||
|
|
||||||
|
- **GIVEN** 资金概况接口返回 `available_balance`、`is_in_debt` 和 `debt_amount`
|
||||||
|
- **WHEN** 页面渲染资金概况
|
||||||
|
- **THEN** 前端 MUST 使用接口返回的 `available_balance`
|
||||||
|
- **AND** 前端 MUST 使用接口返回的 `is_in_debt`
|
||||||
|
- **AND** 前端 MUST 使用接口返回的 `debt_amount`
|
||||||
|
- **AND** 前端 MUST NOT 根据现金余额、冻结金额或信用额度重新计算这些字段
|
||||||
|
|
||||||
|
### Requirement: Shop Actual Credit Adjustment Dialog
|
||||||
|
|
||||||
|
The agent fund overview page SHALL provide an independent dialog for adjusting a shop's actual credit limit and previewing the before/after amount.
|
||||||
|
|
||||||
|
#### Scenario: Open actual credit adjustment dialog
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在代理商资金概况页查看店铺资金记录
|
||||||
|
- **WHEN** 用户点击调整实际信用额度入口
|
||||||
|
- **THEN** 页面 MUST 打开独立调整弹框
|
||||||
|
- **AND** 弹框 MUST 展示修改前信用启用状态和信用额度
|
||||||
|
- **AND** 弹框 MUST 展示修改后信用启用状态和信用额度预览
|
||||||
|
|
||||||
|
#### Scenario: Submit actual credit adjustment
|
||||||
|
|
||||||
|
- **GIVEN** 用户已经在调整弹框内修改实际信用配置
|
||||||
|
- **WHEN** 用户确认提交
|
||||||
|
- **THEN** 前端 MUST submit `credit_enabled`、`credit_limit` and `version` to `PUT /api/admin/shops/{id}/credit-limit`
|
||||||
|
- **AND** 保存成功后页面 MUST 关闭弹框
|
||||||
|
- **AND** 页面 MUST 刷新代理商资金概况列表
|
||||||
|
|
||||||
|
#### Scenario: Disable credit in adjustment dialog
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在调整弹框内修改实际信用配置
|
||||||
|
- **WHEN** 用户关闭信用开关
|
||||||
|
- **THEN** 弹框 MUST 将额度输入归零
|
||||||
|
- **AND** 修改后金额预览 MUST reflect disabled credit with zero credit limit
|
||||||
|
|
||||||
|
#### Scenario: Handle concurrent credit update conflict
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开调整弹框时记录了资金概况 `version`
|
||||||
|
- **AND** 该店铺资金概况已被其他操作更新
|
||||||
|
- **WHEN** 用户提交旧版本的实际信用调整
|
||||||
|
- **THEN** 页面 MUST 展示并发冲突提示
|
||||||
|
- **AND** 页面 MUST 刷新最新代理商资金概况
|
||||||
|
- **AND** 页面 MUST NOT keep showing stale version as current data
|
||||||
|
|
||||||
|
### Requirement: Agent Fund Summary Credit Response Contract
|
||||||
|
|
||||||
|
The frontend SHALL read actual credit fields from `GET /api/admin/shops/fund-summary` response records.
|
||||||
|
|
||||||
|
#### Scenario: Read actual credit response fields
|
||||||
|
|
||||||
|
- **WHEN** 前端请求 `GET /api/admin/shops/fund-summary`
|
||||||
|
- **THEN** 前端 MUST read `balance`
|
||||||
|
- **AND** 前端 MUST read `frozen_balance`
|
||||||
|
- **AND** 前端 MUST read `credit_enabled`
|
||||||
|
- **AND** 前端 MUST read `credit_limit`
|
||||||
|
- **AND** 前端 MUST read `available_balance`
|
||||||
|
- **AND** 前端 MUST read `is_in_debt`
|
||||||
|
- **AND** 前端 MUST read `debt_amount`
|
||||||
|
- **AND** 前端 MUST read `version`
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Customer Role Default Credit Configuration
|
||||||
|
|
||||||
|
The role management page SHALL allow customer roles to configure default credit only for future newly created agent shops.
|
||||||
|
|
||||||
|
#### Scenario: Display default credit controls for customer roles
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在客户角色配置页编辑客户角色
|
||||||
|
- **WHEN** 页面渲染角色表单或配置区域
|
||||||
|
- **THEN** 页面 MUST 展示“新建代理默认信用”开关
|
||||||
|
- **AND** 页面 MUST 展示信用额度输入框
|
||||||
|
- **AND** 页面 MUST 展示提示文案“修改后不会影响已有店铺”
|
||||||
|
|
||||||
|
#### Scenario: Hide default credit controls for platform employee roles
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在编辑平台员工角色
|
||||||
|
- **WHEN** 页面渲染角色表单或配置区域
|
||||||
|
- **THEN** 页面 MUST NOT 展示“新建代理默认信用”开关
|
||||||
|
- **AND** 页面 MUST NOT 展示信用额度输入框
|
||||||
|
|
||||||
|
#### Scenario: Save customer role default credit
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在编辑客户角色默认信用
|
||||||
|
- **WHEN** 用户提交默认信用配置
|
||||||
|
- **THEN** 前端 MUST call `PUT /api/admin/roles/{id}/default-credit`
|
||||||
|
- **AND** 请求体 MUST include `credit_enabled: bool` and `credit_limit: int64`
|
||||||
|
- **AND** 保存成功后页面 MUST 提示保存成功
|
||||||
|
|
||||||
|
#### Scenario: Disable customer role default credit
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在编辑客户角色默认信用
|
||||||
|
- **WHEN** 用户关闭“新建代理默认信用”开关
|
||||||
|
- **THEN** 页面 MUST 将额度输入归零
|
||||||
|
- **AND** 提交时请求体 MUST include `credit_enabled=false`
|
||||||
|
- **AND** 提交时请求体 MUST include `credit_limit=0`
|
||||||
|
|
||||||
|
#### Scenario: Role default credit does not mutate existing shops
|
||||||
|
|
||||||
|
- **GIVEN** 已有店铺已经创建并拥有实际信用额度
|
||||||
|
- **WHEN** 用户修改该店铺所属客户角色的默认信用配置
|
||||||
|
- **THEN** 系统 MUST NOT 修改已有店铺的实际信用额度
|
||||||
|
- **AND** 已有店铺的实际额度 MUST 只能通过店铺实际额度调整入口修改
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: New Shop Credit Initialization From Customer Role
|
||||||
|
|
||||||
|
The shop creation flow SHALL initialize a newly created agent shop's actual credit from the selected customer role's default credit configuration.
|
||||||
|
|
||||||
|
#### Scenario: Create agent shop with enabled role default credit
|
||||||
|
|
||||||
|
- **GIVEN** 选中的客户角色已启用默认信用
|
||||||
|
- **AND** 该客户角色配置了默认信用额度
|
||||||
|
- **WHEN** 用户创建新的代理店铺
|
||||||
|
- **THEN** 新店铺的实际信用 MUST 初始化为启用状态
|
||||||
|
- **AND** 新店铺的实际信用额度 MUST 使用该客户角色的默认信用额度
|
||||||
|
|
||||||
|
#### Scenario: Create agent shop with disabled role default credit
|
||||||
|
|
||||||
|
- **GIVEN** 选中的客户角色未启用默认信用
|
||||||
|
- **WHEN** 用户创建新的代理店铺
|
||||||
|
- **THEN** 新店铺的实际信用 MUST 初始化为关闭状态
|
||||||
|
- **AND** 新店铺的实际信用额度 MUST be `0`
|
||||||
|
|
||||||
|
#### Scenario: Existing shop keeps actual credit after role default change
|
||||||
|
|
||||||
|
- **GIVEN** 店铺已经完成创建
|
||||||
|
- **WHEN** 用户修改该店铺所属客户角色的默认信用配置
|
||||||
|
- **THEN** 该店铺的实际信用启用状态 MUST NOT change
|
||||||
|
- **AND** 该店铺的实际信用额度 MUST NOT change
|
||||||
|
|
||||||
|
### Requirement: Shop Actual Credit Limit Update API
|
||||||
|
|
||||||
|
The frontend SHALL update an existing shop's actual credit limit through `PUT /api/admin/shops/{id}/credit-limit` with optimistic concurrency versioning.
|
||||||
|
|
||||||
|
#### Scenario: Submit shop actual credit update
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在调整已有店铺实际信用额度
|
||||||
|
- **WHEN** 用户提交调整
|
||||||
|
- **THEN** 前端 MUST call `PUT /api/admin/shops/{id}/credit-limit`
|
||||||
|
- **AND** 请求体 MUST include `credit_enabled: bool`
|
||||||
|
- **AND** 请求体 MUST include `credit_limit: int64`
|
||||||
|
- **AND** 请求体 MUST include `version: int64`
|
||||||
|
|
||||||
|
#### Scenario: Disable shop actual credit
|
||||||
|
|
||||||
|
- **GIVEN** 用户正在调整已有店铺实际信用额度
|
||||||
|
- **WHEN** 用户关闭信用开关
|
||||||
|
- **THEN** 页面 MUST 将额度输入归零
|
||||||
|
- **AND** 提交时请求体 MUST include `credit_enabled=false`
|
||||||
|
- **AND** 提交时请求体 MUST include `credit_limit=0`
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
## 1. API And Types
|
||||||
|
|
||||||
|
- [x] 1.1 在角色 API 和类型中新增 `PUT /api/admin/roles/{id}/default-credit` 请求类型与服务方法。
|
||||||
|
- [x] 1.2 在店铺 API 和类型中新增 `PUT /api/admin/shops/{id}/credit-limit` 请求类型与服务方法。
|
||||||
|
- [x] 1.3 扩展代理商资金概况类型,包含 `credit_enabled`、`credit_limit`、`available_balance`、`is_in_debt`、`debt_amount` 和 `version`。
|
||||||
|
|
||||||
|
## 2. Role Default Credit
|
||||||
|
|
||||||
|
- [x] 2.1 在客户角色配置页展示“新建代理默认信用”开关、额度输入和“修改后不会影响已有店铺”提示。
|
||||||
|
- [x] 2.2 平台员工角色不展示信用配置。
|
||||||
|
- [x] 2.3 关闭默认信用时将额度输入归零并提交 `credit_limit=0`。
|
||||||
|
- [x] 2.4 保存默认信用配置时调用 `PUT /api/admin/roles/{id}/default-credit`。
|
||||||
|
|
||||||
|
## 3. Shop Credit Initialization
|
||||||
|
|
||||||
|
- [x] 3.1 确认店铺创建页不把角色默认信用表现为会影响已有店铺的配置。
|
||||||
|
- [x] 3.2 确认新建店铺实际信用额度由后端按所选客户角色默认信用初始化。
|
||||||
|
|
||||||
|
## 4. Agent Fund Overview
|
||||||
|
|
||||||
|
- [x] 4.1 在代理商资金概况页展示现金余额、冻结金额、实际信用额度、可用金额、欠款金额和版本。
|
||||||
|
- [x] 4.2 金额字段按接口返回值展示,不在前端重新计算可用金额或欠款金额。
|
||||||
|
- [x] 4.3 新增店铺实际额度调整弹框,展示当前值、修改后值和关闭信用归零行为。
|
||||||
|
- [x] 4.4 提交调额时携带当前 `version` 调用 `PUT /api/admin/shops/{id}/credit-limit`。
|
||||||
|
- [x] 4.5 并发冲突时展示提示并刷新最新资金概况。
|
||||||
|
|
||||||
|
## 5. Verification
|
||||||
|
|
||||||
|
- [x] 5.1 验证客户角色默认信用保存后不会修改已有店铺展示的实际信用额度。
|
||||||
|
- [x] 5.2 验证新建店铺使用所选客户角色默认信用初始化实际额度。
|
||||||
|
- [x] 5.3 验证资金概况页展示字段与接口返回一致。
|
||||||
|
- [x] 5.4 验证关闭信用时额度输入归零。
|
||||||
|
- [x] 5.5 验证并发冲突后页面提示并刷新最新资金概况。
|
||||||
|
- [x] 5.6 运行相关 lint、类型检查或构建命令。
|
||||||
|
|
||||||
|
## Verification Notes
|
||||||
|
|
||||||
|
- 角色默认信用保存只调用角色默认信用接口,店铺资金概况只读取后端返回的实际额度,未发现前端同步历史店铺额度的逻辑。
|
||||||
|
- 店铺创建参数未包含信用额度字段,实际额度初始化由后端按所选客户角色处理。
|
||||||
|
- 资金概况列表直接展示 `balance`、`frozen_balance`、`credit_limit`、`available_balance`、`debt_amount`、`version` 和后端欠款状态字段。
|
||||||
|
- 关闭信用时角色配置和店铺调额表单均将额度归零,并以 `credit_limit=0` 提交。
|
||||||
|
- 调额响应或异常命中版本冲突时,页面提示并重新加载资金概况。
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Change: 店铺平台业务员选择、展示与筛选
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
当前店铺没有记录负责的平台业务员,运营无法在新建、编辑、列表和详情中维护或查看业务归属。需要为店铺绑定可选的平台业务员,该绑定仅用于业务归属和通知关系,不承载分销、佣金或发展层级语义。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 在店铺新建和编辑表单新增可清空、可搜索的“平台业务员”选择器。
|
||||||
|
- 候选业务员复用启用的平台账号查询接口,展示账号名和手机号摘要。
|
||||||
|
- 扩展店铺创建、更新、列表查询、列表返回和详情返回的数据契约,支持 `business_owner_account_id` 及业务员展示字段。
|
||||||
|
- 在店铺列表新增业务员列和按业务员筛选项,在店铺详情展示业务员名称和手机号摘要。
|
||||||
|
- 已停用的已绑定业务员仅用于历史列表和详情展示,不能作为新建或编辑表单的候选项。
|
||||||
|
- 不新增分销、佣金、发展层级或其他业务结算行为。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs: `shop-management`
|
||||||
|
- Affected code:
|
||||||
|
- `src/api/modules/shop.ts`
|
||||||
|
- `src/types/api/shop.ts`
|
||||||
|
- 平台账号查询 API 类型或服务模块
|
||||||
|
- `src/views/shop-management/list/index.vue`
|
||||||
|
- 店铺详情页或详情抽屉的展示配置
|
||||||
|
- API contracts:
|
||||||
|
- `POST /api/admin/shops`
|
||||||
|
- `PUT /api/admin/shops/{id}`
|
||||||
|
- `GET /api/admin/shops`
|
||||||
|
- `GET /api/admin/accounts?account_type=platform&status=1`
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Shop Platform Salesperson Assignment
|
||||||
|
|
||||||
|
The system SHALL allow users to assign or clear an optional platform salesperson for a shop during shop creation and editing. The assignment SHALL represent only business ownership and notification relationship and MUST NOT create distribution, commission, or hierarchy behavior.
|
||||||
|
|
||||||
|
#### Scenario: Assign an enabled platform account during shop creation
|
||||||
|
|
||||||
|
- **GIVEN** 用户进入店铺新建表单
|
||||||
|
- **WHEN** 用户在“平台业务员”可搜索下拉中选择一个启用的平台账号
|
||||||
|
- **THEN** 系统 MUST 提交该账号的 `business_owner_account_id`
|
||||||
|
- **AND** 候选项 MUST 展示账号名和手机号摘要
|
||||||
|
|
||||||
|
#### Scenario: Edit a shop salesperson assignment
|
||||||
|
|
||||||
|
- **GIVEN** 用户进入已存在店铺的编辑表单
|
||||||
|
- **WHEN** 用户选择不同的启用平台账号
|
||||||
|
- **THEN** 系统 MUST 在 `PUT /api/admin/shops/{id}` 请求中提交新的 `business_owner_account_id`
|
||||||
|
|
||||||
|
#### Scenario: Clear a shop salesperson assignment
|
||||||
|
|
||||||
|
- **GIVEN** 店铺已绑定平台业务员
|
||||||
|
- **WHEN** 用户清空“平台业务员”选择器并提交编辑表单
|
||||||
|
- **THEN** 系统 MUST 提交 `business_owner_account_id: null`
|
||||||
|
- **AND** 店铺不再关联该业务员
|
||||||
|
|
||||||
|
#### Scenario: Do not expose disabled accounts as editable candidates
|
||||||
|
|
||||||
|
- **WHEN** 用户打开或搜索“平台业务员”选择器
|
||||||
|
- **THEN** 系统 MUST 仅查询 `account_type=platform` 且 `status=1` 的账号
|
||||||
|
- **AND** 已停用平台账号 MUST NOT 作为新建或编辑候选项显示
|
||||||
|
|
||||||
|
#### Scenario: No eligible salesperson exists
|
||||||
|
|
||||||
|
- **GIVEN** 不存在启用的平台账号
|
||||||
|
- **WHEN** 用户打开“平台业务员”选择器
|
||||||
|
- **THEN** 系统 MUST 显示无可选账号状态
|
||||||
|
- **AND** 用户仍 MUST 能够不选择业务员完成表单提交
|
||||||
|
|
||||||
|
### Requirement: Shop Salesperson List Filtering And Display
|
||||||
|
|
||||||
|
The shop list SHALL display the assigned salesperson and support filtering by `business_owner_account_id`.
|
||||||
|
|
||||||
|
#### Scenario: Display salesperson in shop list
|
||||||
|
|
||||||
|
- **WHEN** 用户查看店铺列表
|
||||||
|
- **THEN** 列表 MUST 显示业务员列
|
||||||
|
- **AND** 已绑定业务员的行 MUST 展示 `business_owner_name` 和 `business_owner_phone_masked`
|
||||||
|
|
||||||
|
#### Scenario: Filter shops by salesperson
|
||||||
|
|
||||||
|
- **WHEN** 用户在店铺列表选择一个平台业务员作为筛选条件
|
||||||
|
- **THEN** 前端 MUST 在 `GET /api/admin/shops` 请求中提交该账号的 `business_owner_account_id`
|
||||||
|
- **AND** 列表 MUST 仅展示后端返回的匹配店铺
|
||||||
|
|
||||||
|
#### Scenario: Display historical disabled salesperson in list
|
||||||
|
|
||||||
|
- **GIVEN** 店铺历史上已绑定的平台业务员后来被停用
|
||||||
|
- **WHEN** 用户查看店铺列表
|
||||||
|
- **THEN** 列表 MUST 继续展示该店铺返回的 `business_owner_name` 和 `business_owner_phone_masked`
|
||||||
|
|
||||||
|
### Requirement: Shop Detail Salesperson Display
|
||||||
|
|
||||||
|
The shop detail SHALL display the assigned salesperson name and masked phone from the shop detail response, including historical assignments to disabled accounts.
|
||||||
|
|
||||||
|
#### Scenario: Display salesperson in shop detail
|
||||||
|
|
||||||
|
- **WHEN** 用户查看已绑定平台业务员的店铺详情
|
||||||
|
- **THEN** 页面 MUST 展示业务员名称和手机号摘要
|
||||||
|
|
||||||
|
#### Scenario: Display historical disabled salesperson in detail
|
||||||
|
|
||||||
|
- **GIVEN** 店铺绑定的业务员已停用
|
||||||
|
- **WHEN** 用户查看该店铺详情
|
||||||
|
- **THEN** 页面 MUST 继续使用详情响应中的 `business_owner_name` 和 `business_owner_phone_masked` 展示历史业务员信息
|
||||||
|
|
||||||
|
#### Scenario: Do not add distribution or commission semantics
|
||||||
|
|
||||||
|
- **WHEN** 用户查看店铺新建、编辑、列表或详情页面
|
||||||
|
- **THEN** 页面 MUST NOT 将平台业务员描述为分销关系、佣金关系或发展层级
|
||||||
27
openspec/changes/update-shop-salesperson-selection/tasks.md
Normal file
27
openspec/changes/update-shop-salesperson-selection/tasks.md
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
## 1. API Contract
|
||||||
|
|
||||||
|
- [x] 1.1 更新店铺创建和编辑请求类型,支持可空的 `business_owner_account_id`。
|
||||||
|
- [x] 1.2 更新店铺列表查询类型,支持 `business_owner_account_id` 筛选参数。
|
||||||
|
- [x] 1.3 更新店铺列表和详情响应类型,读取业务员 ID、名称和脱敏手机号字段。
|
||||||
|
- [x] 1.4 复用启用平台账号查询接口,读取 `account_id`、`account_name`、`phone_masked` 作为候选项。
|
||||||
|
|
||||||
|
## 2. Shop Form UI
|
||||||
|
|
||||||
|
- [x] 2.1 在店铺新建和编辑表单增加可搜索、可清空的“平台业务员”下拉选择。
|
||||||
|
- [x] 2.2 候选项展示账号名和手机号摘要,仅查询并展示启用的平台账号。
|
||||||
|
- [x] 2.3 支持清空已选择业务员,并按 `business_owner_account_id: null` 提交。
|
||||||
|
- [x] 2.4 已停用业务员不出现在编辑候选项中。
|
||||||
|
|
||||||
|
## 3. Shop List And Detail UI
|
||||||
|
|
||||||
|
- [x] 3.1 在店铺列表增加业务员列,展示业务员名称和手机号摘要。
|
||||||
|
- [x] 3.2 在店铺列表搜索区增加按业务员筛选项,并提交选中的 `business_owner_account_id`。
|
||||||
|
- [x] 3.3 在店铺详情展示业务员名称和手机号摘要;已停用但历史绑定的业务员仍正常显示。
|
||||||
|
|
||||||
|
## 4. Verification
|
||||||
|
|
||||||
|
- [ ] 4.1 验证创建、编辑、清空业务员和无可选账号状态。
|
||||||
|
- [ ] 4.2 验证列表业务员展示和按业务员筛选正确。
|
||||||
|
- [ ] 4.3 验证详情对历史停用业务员仍能展示名称和手机号摘要。
|
||||||
|
- [x] 4.4 确认页面不引入分销、佣金或发展层级文案。
|
||||||
|
- [x] 4.5 运行相关前端校验,并执行 `openspec validate update-shop-salesperson-selection --strict`。
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
## Context
|
||||||
|
|
||||||
|
设备批量分配、批量订购和导出都属于可能耗时的异步操作,但现有页面和任务模型不统一。产品要求以相同的状态语义、进度结构、轮询节奏和恢复行为覆盖这些入口,同时不改变已有业务接口中未涉及的字段。
|
||||||
|
|
||||||
|
## Goals / Non-Goals
|
||||||
|
|
||||||
|
- Goals: 统一三类页面的公共状态展示、任务进度展示、任务恢复、轮询和错误重试行为。
|
||||||
|
- Goals: 为导出任务补齐稳定的任务标识、计数、错误摘要和更新时间字段。
|
||||||
|
- Non-Goals: 不在前端实现任务调度、任务执行、失败明细生成或后端状态流转。
|
||||||
|
- Non-Goals: 不新增“部分成功”状态,不替换既有业务接口路径,不删除导出接口原字段。
|
||||||
|
|
||||||
|
## Decisions
|
||||||
|
|
||||||
|
- Decision: 使用固定五态映射:`1=待处理`、`2=处理中`、`3=已完成`、`4=已失败`、`5=已取消`。
|
||||||
|
- Rationale: 三类任务使用同一状态语义;部分成功由计数表达,避免增加状态分支。
|
||||||
|
|
||||||
|
- Decision: 将任务轮询实现为可复用的 composable 或等价公共模块,由页面提供任务详情查询函数和终态判断函数。
|
||||||
|
- Rationale: 轮询节奏、页面可见性处理和清理逻辑必须只维护一份,避免各页面出现漂移。
|
||||||
|
|
||||||
|
- Decision: 任务恢复使用持久化的业务入口标识与 `task_id`,恢复时优先查询任务详情;任务进入终态后清理当前入口的活动任务引用。
|
||||||
|
- Rationale: 页面刷新后可以继续展示原任务,同时终态任务不会阻止用户创建新的任务。
|
||||||
|
|
||||||
|
- Decision: 轮询采用单次调度而非固定高频定时器,延迟序列为 2 秒、3 秒、5 秒,随后保持 10 秒;页面隐藏时取消待执行调度,重新可见时立即查询一次。
|
||||||
|
- Rationale: 降低无效请求,并满足页面恢复后的即时反馈要求。
|
||||||
|
|
||||||
|
- Decision: 任务失败优先使用后端安全字段 `error_summary` 作为用户文案;`error_code` 只用于前端分类和日志,不直接展示底层技术错误。
|
||||||
|
- Rationale: 保证用户可理解,同时避免泄露内部错误信息。
|
||||||
|
|
||||||
|
## Data Model
|
||||||
|
|
||||||
|
- `task_id`: 稳定任务标识,用于持久化和恢复查询。
|
||||||
|
- `status`: 五态任务状态。
|
||||||
|
- `total_count`: 任务总数。
|
||||||
|
- `success_count`: 成功数。
|
||||||
|
- `failed_count`: 失败数。
|
||||||
|
- `failure_details`: 失败明细;具体字段由业务任务详情接口定义。
|
||||||
|
- `error_code`: 稳定错误分类码。
|
||||||
|
- `error_summary`: 可安全展示的中文错误摘要。
|
||||||
|
- `updated_at`: 任务最近更新时间。
|
||||||
|
|
||||||
|
## Risks / Trade-offs
|
||||||
|
|
||||||
|
- Risk: 不同业务详情接口的失败明细字段不完全一致。
|
||||||
|
- Mitigation: 公共交互层只约束失败明细可展示,业务页面负责将各自接口字段映射为统一展示模型。
|
||||||
|
|
||||||
|
- Risk: 页面刷新时本地保存的任务已被删除或无权限访问。
|
||||||
|
- Mitigation: 清理失效任务引用,并按 403 或普通接口失败规则展示对应状态,不重新创建任务。
|
||||||
|
|
||||||
|
- Risk: 页面不可见期间任务已进入终态。
|
||||||
|
- Mitigation: 页面恢复可见后立即执行一次详情查询,并根据返回状态停止轮询。
|
||||||
|
|
||||||
|
## Migration Plan
|
||||||
|
|
||||||
|
1. 明确三类任务接口的 `task_id` 创建响应和详情查询契约。
|
||||||
|
2. 实现公共任务状态、进度模型和轮询/恢复逻辑。
|
||||||
|
3. 先接入设备批量分配、批量订购和导出页面,保留各业务原有提交参数。
|
||||||
|
4. 更新导出任务列表和详情类型,兼容旧字段并优先使用新增统一字段。
|
||||||
|
5. 验证状态、重试、权限、页面刷新、页面可见性和部分成功场景。
|
||||||
|
|
||||||
|
## Open Questions
|
||||||
|
|
||||||
|
- 批量分配和批量订购的任务详情接口路径及失败明细字段,需要以后端实际契约为准补入实施任务。
|
||||||
|
- `task_id` 的存储范围需要按业务入口区分,还是由统一任务中心集中管理,需要实施前确认。
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
# Change: 统一公共状态与异步任务交互
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
设备批量分配、批量订购和导出页面目前可能分别处理加载、失败、进度和任务恢复,容易产生不同的状态语义和重试行为。需要建立一套可复用的公共交互规则,让用户在不同批量操作页面获得一致的反馈,并避免页面刷新或切换后重复创建任务。
|
||||||
|
|
||||||
|
## What Changes
|
||||||
|
|
||||||
|
- 为设备批量分配、批量订购和导出页面统一加载中、空数据、无权限、接口失败和重试状态。
|
||||||
|
- 统一异步任务的五态语义:待处理、处理中、已完成、已失败、已取消。
|
||||||
|
- 统一任务进度数据展示:任务状态、总数、成功数、失败数和失败明细。
|
||||||
|
- 明确部分成功的表达方式:任务进入已完成状态,通过成功数和失败数表达部分成功,不新增部分成功状态。
|
||||||
|
- 创建任务成功后保存 `task_id`,页面刷新或重新进入时恢复原任务详情,不重复创建任务。
|
||||||
|
- 对待处理和处理中任务按 2 秒、3 秒、5 秒递增轮询,之后最大间隔 10 秒;进入终态后停止轮询。
|
||||||
|
- 页面不可见时暂停轮询,恢复可见后立即刷新一次。
|
||||||
|
- 统一 403、瞬时接口失败和任务失败的用户反馈及重试规则。
|
||||||
|
- 为 `GET /api/admin/export-tasks` 和 `GET /api/admin/export-tasks/{id}` 增加兼容性字段契约:`task_id`、`total_count`、`success_count`、`failed_count`、`error_code`、`error_summary`、`updated_at`;原字段不删除、不改名。
|
||||||
|
|
||||||
|
## Impact
|
||||||
|
|
||||||
|
- Affected specs:
|
||||||
|
- `async-task-interaction`
|
||||||
|
- `export-task-management`
|
||||||
|
- Affected code:
|
||||||
|
- 批量分配页面及其设备、IOT 卡任务提交逻辑
|
||||||
|
- 批量订购页面及其任务提交逻辑
|
||||||
|
- 导出任务 API 类型和导出任务列表/详情页面
|
||||||
|
- 可复用异步任务状态、轮询和任务恢复逻辑
|
||||||
|
- 统一错误、空数据、无权限和重试状态组件或页面状态配置
|
||||||
|
- Dependencies:
|
||||||
|
- 后端批量分配、批量订购和导出接口必须返回可关联的 `task_id`,并提供按 `task_id` 查询任务详情的能力。
|
||||||
|
- 后端导出接口按本提案新增兼容字段,且继续保留现有字段。
|
||||||
|
- Breaking changes:
|
||||||
|
- 无。导出接口仅新增兼容字段;前端统一交互规则不改变既有任务创建接口的必填参数。
|
||||||
@@ -0,0 +1,147 @@
|
|||||||
|
## ADDED Requirements
|
||||||
|
|
||||||
|
### Requirement: Unified Async Task States
|
||||||
|
|
||||||
|
The admin frontend SHALL use one state vocabulary for device batch allocation, batch ordering, and export tasks: `1=待处理`, `2=处理中`, `3=已完成`, `4=已失败`, and `5=已取消`.
|
||||||
|
|
||||||
|
#### Scenario: Render pending and processing states
|
||||||
|
|
||||||
|
- **GIVEN** 异步任务状态分别为待处理或处理中
|
||||||
|
- **WHEN** 页面展示任务
|
||||||
|
- **THEN** 页面 MUST 使用对应的统一状态文案和视觉状态
|
||||||
|
- **AND** 页面 MUST treat both states as active states that can be polled
|
||||||
|
|
||||||
|
#### Scenario: Render terminal states
|
||||||
|
|
||||||
|
- **GIVEN** 异步任务状态为已完成、已失败或已取消
|
||||||
|
- **WHEN** 页面展示任务
|
||||||
|
- **THEN** 页面 MUST 使用对应的统一终态文案和视觉状态
|
||||||
|
- **AND** 页面 MUST stop automatic polling for that task
|
||||||
|
|
||||||
|
#### Scenario: Represent partial success
|
||||||
|
|
||||||
|
- **GIVEN** 任务执行结束且成功数大于零、失败数大于零
|
||||||
|
- **WHEN** 页面展示任务结果
|
||||||
|
- **THEN** 页面 MUST show status as 已完成
|
||||||
|
- **AND** 页面 MUST show total count, success count, failed count, and available failure details
|
||||||
|
- **AND** 页面 MUST NOT introduce or display 部分成功 as a separate task status
|
||||||
|
|
||||||
|
### Requirement: Unified Common Page States
|
||||||
|
|
||||||
|
The admin frontend SHALL provide consistent loading, empty, forbidden, request failure, and retry interactions on the three supported async-task pages.
|
||||||
|
|
||||||
|
#### Scenario: Show loading state
|
||||||
|
|
||||||
|
- **GIVEN** 页面正在请求任务列表或任务详情
|
||||||
|
- **WHEN** 请求尚未完成
|
||||||
|
- **THEN** 页面 MUST show a loading state
|
||||||
|
- **AND** 页面 MUST prevent duplicate requests caused by repeated automatic triggers
|
||||||
|
|
||||||
|
#### Scenario: Show empty state
|
||||||
|
|
||||||
|
- **GIVEN** 任务查询成功但没有任务数据
|
||||||
|
- **WHEN** 页面完成渲染
|
||||||
|
- **THEN** 页面 MUST show the unified empty state
|
||||||
|
- **AND** 页面 MUST keep the page search or task creation entry available when the user has permission
|
||||||
|
|
||||||
|
#### Scenario: Handle forbidden response
|
||||||
|
|
||||||
|
- **GIVEN** 任务列表或详情接口 responds with HTTP 403
|
||||||
|
- **WHEN** 页面 handles the response
|
||||||
|
- **THEN** 页面 MUST show an explicit no-permission state
|
||||||
|
- **AND** 页面 MUST NOT automatically retry the request
|
||||||
|
|
||||||
|
#### Scenario: Retry transient request failure
|
||||||
|
|
||||||
|
- **GIVEN** a task list or detail request fails for a transient reason other than 403
|
||||||
|
- **WHEN** 页面 handles the response
|
||||||
|
- **THEN** 页面 MUST preserve already loaded task data and user input
|
||||||
|
- **AND** 页面 MUST provide an explicit retry action
|
||||||
|
- **AND** automatic polling MUST continue only after a successful retry or a subsequent successful refresh
|
||||||
|
|
||||||
|
### Requirement: Unified Task Progress Model
|
||||||
|
|
||||||
|
The admin frontend SHALL normalize task progress into task status, total count, success count, failed count, and failure details for device batch allocation, batch ordering, and export tasks.
|
||||||
|
|
||||||
|
#### Scenario: Display active task progress
|
||||||
|
|
||||||
|
- **GIVEN** a task is pending or processing
|
||||||
|
- **WHEN** task details are available
|
||||||
|
- **THEN** 页面 MUST display the current status and total count
|
||||||
|
- **AND** 页面 MUST display success count and failed count when returned
|
||||||
|
- **AND** 页面 MUST update the displayed values after each successful refresh
|
||||||
|
|
||||||
|
#### Scenario: Display failed task details
|
||||||
|
|
||||||
|
- **GIVEN** a task is failed or has failed items
|
||||||
|
- **WHEN** 页面 renders the task result
|
||||||
|
- **THEN** 页面 MUST display a safe failure summary when available
|
||||||
|
- **AND** 页面 MUST display failure details when the business detail API provides them
|
||||||
|
|
||||||
|
### Requirement: Task Creation And Recovery
|
||||||
|
|
||||||
|
The admin frontend SHALL persist the `task_id` returned by an async task creation request and use it to recover the task instead of creating a duplicate task after refresh or re-entry.
|
||||||
|
|
||||||
|
#### Scenario: Save task after creation
|
||||||
|
|
||||||
|
- **GIVEN** 用户确认设备批量分配、批量订购或导出操作
|
||||||
|
- **WHEN** task creation succeeds and returns `task_id`
|
||||||
|
- **THEN** 系统 MUST persist the task identifier for the corresponding business entry
|
||||||
|
- **AND** 系统 MUST start the unified task detail interaction for that task
|
||||||
|
|
||||||
|
#### Scenario: Recover task after page refresh
|
||||||
|
|
||||||
|
- **GIVEN** 当前业务入口存在已保存的 active `task_id`
|
||||||
|
- **WHEN** 用户刷新页面或重新进入该入口
|
||||||
|
- **THEN** 系统 MUST query the existing task detail using that `task_id`
|
||||||
|
- **AND** 系统 MUST NOT create another task automatically
|
||||||
|
|
||||||
|
#### Scenario: Clear task reference after terminal state
|
||||||
|
|
||||||
|
- **GIVEN** a recovered or newly created task reaches a terminal state
|
||||||
|
- **WHEN** 页面 handles the terminal task response
|
||||||
|
- **THEN** 系统 MUST stop polling
|
||||||
|
- **AND** 系统 MUST retain the result for display while allowing a later operation to create a new task
|
||||||
|
|
||||||
|
### Requirement: Visibility-Aware Incremental Polling
|
||||||
|
|
||||||
|
The admin frontend SHALL poll active async tasks at 2 seconds, 3 seconds, and 5 seconds after creation or refresh, then use an interval no longer than 10 seconds until the task reaches a terminal state.
|
||||||
|
|
||||||
|
#### Scenario: Poll active task with increasing delay
|
||||||
|
|
||||||
|
- **GIVEN** a task is in 待处理 or 处理中
|
||||||
|
- **WHEN** the previous task detail request succeeds and the task remains active
|
||||||
|
- **THEN** the next refresh MUST be scheduled after 2 seconds, then 3 seconds, then 5 seconds
|
||||||
|
- **AND** subsequent refreshes MUST NOT be more than 10 seconds apart
|
||||||
|
|
||||||
|
#### Scenario: Pause polling while page is hidden
|
||||||
|
|
||||||
|
- **GIVEN** an active task is being polled
|
||||||
|
- **WHEN** the browser page becomes not visible
|
||||||
|
- **THEN** the frontend MUST pause or cancel the pending poll
|
||||||
|
- **AND** the frontend MUST NOT issue automatic polling requests while the page remains hidden
|
||||||
|
|
||||||
|
#### Scenario: Refresh immediately when page becomes visible
|
||||||
|
|
||||||
|
- **GIVEN** an active task was paused because the page was hidden
|
||||||
|
- **WHEN** the page becomes visible again
|
||||||
|
- **THEN** the frontend MUST request the task detail immediately
|
||||||
|
- **AND** the frontend MUST resume the incremental polling schedule only if the task remains active
|
||||||
|
|
||||||
|
### Requirement: Safe Async Task Error Messaging
|
||||||
|
|
||||||
|
The admin frontend SHALL use a safe user-facing error summary for task failures and SHALL NOT expose a raw error code or low-level technical error as the primary user message.
|
||||||
|
|
||||||
|
#### Scenario: Show task failure summary
|
||||||
|
|
||||||
|
- **GIVEN** a failed task response contains `error_summary`
|
||||||
|
- **WHEN** 页面展示失败原因
|
||||||
|
- **THEN** 页面 MUST show `error_summary` as the primary failure message
|
||||||
|
- **AND** 页面 MUST NOT use `error_code` as the user-facing text
|
||||||
|
|
||||||
|
#### Scenario: Fallback when safe summary is absent
|
||||||
|
|
||||||
|
- **GIVEN** a failed task response does not contain a safe error summary
|
||||||
|
- **WHEN** 页面展示失败原因
|
||||||
|
- **THEN** 页面 MUST show a generic actionable failure message
|
||||||
|
- **AND** 页面 MUST keep the raw error code and technical error out of the primary user-facing message
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
## MODIFIED Requirements
|
||||||
|
|
||||||
|
### Requirement: Export Task API Integration
|
||||||
|
|
||||||
|
The admin frontend SHALL provide a typed API integration for unified export tasks using the existing REST contract and the following compatibility additions. Existing response fields MUST remain available and MUST NOT be renamed or removed.
|
||||||
|
|
||||||
|
#### Scenario: Query export tasks with unified fields
|
||||||
|
|
||||||
|
- **GIVEN** 用户打开任一导出任务页面
|
||||||
|
- **WHEN** 用户按页面固定场景、状态、分页或创建时间范围查询导出任务
|
||||||
|
- **THEN** 系统 MUST call `GET /api/admin/export-tasks`
|
||||||
|
- **AND** 每条任务 MUST support `task_id`, `total_count`, `success_count`, `failed_count`, `error_code`, `error_summary`, and `updated_at`
|
||||||
|
- **AND** 原有任务字段 MUST remain parseable by the frontend
|
||||||
|
|
||||||
|
#### Scenario: Fetch export task detail with unified fields
|
||||||
|
|
||||||
|
- **GIVEN** 用户查看或恢复一个导出任务
|
||||||
|
- **WHEN** 系统按 `task_id` 查询任务详情
|
||||||
|
- **THEN** 系统 MUST call `GET /api/admin/export-tasks/{id}`
|
||||||
|
- **AND** 详情 MUST support `task_id`, `total_count`, `success_count`, `failed_count`, `error_code`, `error_summary`, and `updated_at`
|
||||||
|
- **AND** 详情 MUST continue to support existing download and timestamp fields when returned
|
||||||
|
|
||||||
|
#### Scenario: Preserve compatibility with missing optional additions
|
||||||
|
|
||||||
|
- **GIVEN** 后端暂未返回某个新增兼容字段
|
||||||
|
- **WHEN** 前端解析导出任务列表或详情
|
||||||
|
- **THEN** 系统 MUST keep the response usable with stable empty or zero placeholders
|
||||||
|
- **AND** 系统 MUST NOT fail solely because an optional unified field is absent
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
## 1. Contract And Model
|
||||||
|
|
||||||
|
- [ ] 1.1 确认设备批量分配、批量订购和导出任务创建响应均返回稳定的 `task_id`。
|
||||||
|
- [ ] 1.2 确认三类任务按 `task_id` 查询详情的接口路径、状态字段和失败明细字段。
|
||||||
|
- [x] 1.3 新增统一任务状态、进度、错误摘要和任务恢复类型,兼容各业务字段别名。
|
||||||
|
- [x] 1.4 更新导出任务列表和详情类型,补充 `task_id`、`total_count`、`success_count`、`failed_count`、`error_code`、`error_summary`、`updated_at`。
|
||||||
|
|
||||||
|
## 2. Shared Interaction
|
||||||
|
|
||||||
|
- [ ] 2.1 实现统一加载中、空数据、无权限、接口失败和重试状态的展示规则。
|
||||||
|
- [x] 2.2 实现五态任务状态映射,并明确终态为已完成、已失败或已取消。
|
||||||
|
- [ ] 2.3 实现统一任务进度展示,支持总数、成功数、失败数和失败明细。
|
||||||
|
- [ ] 2.4 实现任务创建后的 `task_id` 持久化、刷新恢复和失效任务清理。
|
||||||
|
- [x] 2.5 实现 2 秒、3 秒、5 秒递增且最大 10 秒的轮询调度。
|
||||||
|
- [x] 2.6 实现页面不可见暂停轮询、恢复可见立即刷新和组件卸载清理。
|
||||||
|
|
||||||
|
## 3. Business Pages
|
||||||
|
|
||||||
|
- [ ] 3.1 接入设备批量分配页面,创建成功后进入统一任务交互流程。
|
||||||
|
- [ ] 3.2 接入批量订购页面,创建成功后进入统一任务交互流程。
|
||||||
|
- [x] 3.3 接入导出任务列表和详情页面,统一展示任务进度、失败摘要和更新时间。
|
||||||
|
- [ ] 3.4 保证部分成功任务仍展示为已完成,并显示成功数与失败数,不引入新状态。
|
||||||
|
- [ ] 3.5 保证页面刷新或重新进入时恢复任务,不重复提交创建请求。
|
||||||
|
|
||||||
|
## 4. Error And Permission Handling
|
||||||
|
|
||||||
|
- [x] 4.1 403 响应展示无权限状态并停止自动重试。
|
||||||
|
- [x] 4.2 瞬时接口失败保留已有任务数据和用户输入,并提供明确的手动重试入口。
|
||||||
|
- [x] 4.3 任务失败优先展示 `error_summary`,不直接展示 `error_code` 或底层技术错误。
|
||||||
|
- [ ] 4.4 验证无权限用户无法看到或触发对应批量操作、任务详情和重试操作。
|
||||||
|
|
||||||
|
## 5. Verification
|
||||||
|
|
||||||
|
- [ ] 5.1 覆盖五态及部分成功的单元测试。
|
||||||
|
- [ ] 5.2 覆盖轮询延迟、终态停止、页面隐藏暂停和恢复立即刷新测试。
|
||||||
|
- [ ] 5.3 覆盖页面刷新恢复任务及避免重复创建测试。
|
||||||
|
- [ ] 5.4 覆盖 403、瞬时失败、任务失败和安全错误文案测试。
|
||||||
|
- [x] 5.5 运行类型检查、lint,并对已接入的导出任务页面进行回归验证。
|
||||||
|
|
||||||
|
## Implementation Notes
|
||||||
|
|
||||||
|
- 设备批量分配当前仍由 `/api/admin/devices/allocate` 同步返回结果,未返回 `task_id`,因此未接入异步轮询。
|
||||||
|
- 当前订单页面仅提供单笔订单创建,仓库中未发现批量订购创建接口或任务详情接口,因此未新增虚构的批量任务流程。
|
||||||
|
- 设备批量分配和批量订购需待后端补充异步任务创建及详情契约后继续实施 1.1、1.2、3.1、3.2、3.4、3.5、4.4 及相关测试。
|
||||||
BIN
public/templates/bulk-purchase-template.xlsx
Normal file
BIN
public/templates/bulk-purchase-template.xlsx
Normal file
Binary file not shown.
@@ -6,6 +6,8 @@ import { BaseService } from '../BaseService'
|
|||||||
import type {
|
import type {
|
||||||
PlatformAccount,
|
PlatformAccount,
|
||||||
AccountQueryParams,
|
AccountQueryParams,
|
||||||
|
PlatformSalesperson,
|
||||||
|
PlatformSalespersonQueryParams,
|
||||||
CreatePlatformAccountParams,
|
CreatePlatformAccountParams,
|
||||||
BaseResponse,
|
BaseResponse,
|
||||||
PaginationResponse
|
PaginationResponse
|
||||||
@@ -23,6 +25,16 @@ export class AccountService extends BaseService {
|
|||||||
return this.getPage<PlatformAccount>('/api/admin/accounts', params)
|
return this.getPage<PlatformAccount>('/api/admin/accounts', params)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取启用的平台业务员候选
|
||||||
|
* GET /api/admin/accounts?account_type=platform&status=1
|
||||||
|
*/
|
||||||
|
static getPlatformSalespeople(
|
||||||
|
params: PlatformSalespersonQueryParams
|
||||||
|
): Promise<PaginationResponse<PlatformSalesperson>> {
|
||||||
|
return this.getPage<PlatformSalesperson>('/api/admin/accounts', params)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建账号
|
* 创建账号
|
||||||
* POST /api/admin/accounts
|
* POST /api/admin/accounts
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import type {
|
|||||||
AssetPackageParams,
|
AssetPackageParams,
|
||||||
AssetCurrentPackageResponse,
|
AssetCurrentPackageResponse,
|
||||||
DeviceStopResponse,
|
DeviceStopResponse,
|
||||||
|
AssetStartResponse,
|
||||||
AssetWalletTransactionListResponse,
|
AssetWalletTransactionListResponse,
|
||||||
AssetWalletTransactionParams,
|
AssetWalletTransactionParams,
|
||||||
AssetWalletResponse,
|
AssetWalletResponse,
|
||||||
@@ -34,14 +35,13 @@ import type {
|
|||||||
} from '@/types/api'
|
} from '@/types/api'
|
||||||
|
|
||||||
const runRateLimitedAssetAction = async <T>(
|
const runRateLimitedAssetAction = async <T>(
|
||||||
action: AssetRateLimitedAction,
|
action: Exclude<AssetRateLimitedAction, 'refresh'>,
|
||||||
identifier: string,
|
identifier: string,
|
||||||
request: () => Promise<T>
|
request: () => Promise<T>
|
||||||
): Promise<T> => {
|
): Promise<T> => {
|
||||||
assertAssetActionAllowed(action, identifier)
|
assertAssetActionAllowed(action, identifier)
|
||||||
markAssetActionCalled(action, identifier)
|
markAssetActionCalled(action, identifier)
|
||||||
const response = await request()
|
return request()
|
||||||
return response
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export class AssetService extends BaseService {
|
export class AssetService extends BaseService {
|
||||||
@@ -54,9 +54,14 @@ export class AssetService extends BaseService {
|
|||||||
*/
|
*/
|
||||||
static resolveAsset(
|
static resolveAsset(
|
||||||
identifier: string,
|
identifier: string,
|
||||||
params?: AssetResolveParams
|
params?: AssetResolveParams,
|
||||||
|
config?: Record<string, any>
|
||||||
): Promise<BaseResponse<AssetResolveResponse>> {
|
): Promise<BaseResponse<AssetResolveResponse>> {
|
||||||
return this.getOne<AssetResolveResponse>(`/api/admin/assets/resolve/${identifier}`, params)
|
return this.getOne<AssetResolveResponse>(
|
||||||
|
`/api/admin/assets/resolve/${identifier}`,
|
||||||
|
params,
|
||||||
|
config
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -79,17 +84,14 @@ export class AssetService extends BaseService {
|
|||||||
/**
|
/**
|
||||||
* 主动调网关拉取最新数据后返回
|
* 主动调网关拉取最新数据后返回
|
||||||
* POST /api/admin/assets/:identifier/refresh
|
* POST /api/admin/assets/:identifier/refresh
|
||||||
* 前端按资产标识限制 5 分钟内只能调用一次
|
|
||||||
* @param identifier 资产标识符(ICCID 或 VirtualNo)
|
* @param identifier 资产标识符(ICCID 或 VirtualNo)
|
||||||
*/
|
*/
|
||||||
static refreshAsset(identifier: string): Promise<BaseResponse<AssetRefreshResponse>> {
|
static refreshAsset(identifier: string): Promise<BaseResponse<AssetRefreshResponse>> {
|
||||||
return runRateLimitedAssetAction('refresh', identifier, () =>
|
return this.post<BaseResponse<AssetRefreshResponse>>(
|
||||||
this.post<BaseResponse<AssetRefreshResponse>>(
|
|
||||||
`/api/admin/assets/${identifier}/refresh`,
|
`/api/admin/assets/${identifier}/refresh`,
|
||||||
{},
|
{},
|
||||||
{ timeout: 60000 }
|
{ timeout: 60000 }
|
||||||
)
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -181,9 +183,16 @@ export class AssetService extends BaseService {
|
|||||||
* 前端按资产标识限制 5 分钟内只能调用一次
|
* 前端按资产标识限制 5 分钟内只能调用一次
|
||||||
* @param identifier 资产标识符(ICCID 或 VirtualNo)
|
* @param identifier 资产标识符(ICCID 或 VirtualNo)
|
||||||
*/
|
*/
|
||||||
static startAsset(identifier: string): Promise<BaseResponse<void>> {
|
static startAsset(
|
||||||
|
identifier: string,
|
||||||
|
config?: Record<string, any>
|
||||||
|
): Promise<BaseResponse<AssetStartResponse>> {
|
||||||
return runRateLimitedAssetAction('start', identifier, () =>
|
return runRateLimitedAssetAction('start', identifier, () =>
|
||||||
this.post<BaseResponse<void>>(`/api/admin/assets/${identifier}/start`, {})
|
this.post<BaseResponse<AssetStartResponse>>(
|
||||||
|
`/api/admin/assets/${identifier}/start`,
|
||||||
|
{},
|
||||||
|
config
|
||||||
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
31
src/api/modules/bulkPurchase.ts
Normal file
31
src/api/modules/bulkPurchase.ts
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
import request from '@/utils/http'
|
||||||
|
import type {
|
||||||
|
BulkPurchaseCreateApiResponse,
|
||||||
|
BulkPurchaseItemsApiResponse,
|
||||||
|
BulkPurchaseTaskApiResponse
|
||||||
|
} from '@/types/api'
|
||||||
|
|
||||||
|
export class BulkPurchaseService {
|
||||||
|
static createTask(data: FormData): Promise<BulkPurchaseCreateApiResponse> {
|
||||||
|
return request.post<BulkPurchaseCreateApiResponse>({
|
||||||
|
url: '/api/admin/bulk-purchases',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
static getTask(taskId: number): Promise<BulkPurchaseTaskApiResponse> {
|
||||||
|
return request.get<BulkPurchaseTaskApiResponse>({
|
||||||
|
url: `/api/admin/bulk-purchases/${taskId}`
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
static getItems(
|
||||||
|
taskId: number,
|
||||||
|
params?: { page?: number; size?: number; status?: string | number }
|
||||||
|
): Promise<BulkPurchaseItemsApiResponse> {
|
||||||
|
return request.get<BulkPurchaseItemsApiResponse>({
|
||||||
|
url: `/api/admin/bulk-purchases/${taskId}/items`,
|
||||||
|
params
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -35,7 +35,8 @@ import type {
|
|||||||
AssetAllocationRecord,
|
AssetAllocationRecord,
|
||||||
AssetAllocationRecordDetail,
|
AssetAllocationRecordDetail,
|
||||||
BatchSetCardSeriesBindingRequest,
|
BatchSetCardSeriesBindingRequest,
|
||||||
BatchSetCardSeriesBindingResponse
|
BatchSetCardSeriesBindingResponse,
|
||||||
|
BatchUpdateAssetRealnamePolicyRequest
|
||||||
} from '@/types/api'
|
} from '@/types/api'
|
||||||
|
|
||||||
type ApiQueryParams = PaginationParams & Record<string, unknown>
|
type ApiQueryParams = PaginationParams & Record<string, unknown>
|
||||||
@@ -411,6 +412,20 @@ export class CardService extends BaseService {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量更新卡实名认证策略
|
||||||
|
*/
|
||||||
|
static batchUpdateRealnamePolicy(
|
||||||
|
data: BatchUpdateAssetRealnamePolicyRequest,
|
||||||
|
config?: Record<string, any>
|
||||||
|
): Promise<BaseResponse<void>> {
|
||||||
|
return this.post<BaseResponse<void>>(
|
||||||
|
'/api/admin/iot-cards/batch-update-realname-policy',
|
||||||
|
data,
|
||||||
|
config
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// ========== IoT卡网关操作相关 ==========
|
// ========== IoT卡网关操作相关 ==========
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import type {
|
|||||||
RecallDevicesResponse,
|
RecallDevicesResponse,
|
||||||
BatchSetDeviceSeriesBindingRequest,
|
BatchSetDeviceSeriesBindingRequest,
|
||||||
BatchSetDeviceSeriesBindingResponse,
|
BatchSetDeviceSeriesBindingResponse,
|
||||||
|
BatchUpdateAssetRealnamePolicyRequest,
|
||||||
ImportDeviceRequest,
|
ImportDeviceRequest,
|
||||||
ImportDeviceResponse,
|
ImportDeviceResponse,
|
||||||
DeviceImportTaskQueryParams,
|
DeviceImportTaskQueryParams,
|
||||||
@@ -169,6 +170,20 @@ export class DeviceService extends BaseService {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量更新设备实名认证策略
|
||||||
|
*/
|
||||||
|
static batchUpdateRealnamePolicy(
|
||||||
|
data: BatchUpdateAssetRealnamePolicyRequest,
|
||||||
|
config?: Record<string, any>
|
||||||
|
): Promise<BaseResponse<void>> {
|
||||||
|
return this.post<BaseResponse<void>>(
|
||||||
|
'/api/admin/devices/batch-update-realname-policy',
|
||||||
|
data,
|
||||||
|
config
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// ========== 设备操作相关 ==========
|
// ========== 设备操作相关 ==========
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ export interface ExchangeQueryParams {
|
|||||||
page_size?: number
|
page_size?: number
|
||||||
status?: number // 换货状态
|
status?: number // 换货状态
|
||||||
flow_type?: string // 流程类型(shipping/direct)
|
flow_type?: string // 流程类型(shipping/direct)
|
||||||
identifier?: string // 资产标识符(模糊匹配,同时匹配旧资产、新资产)
|
old_asset_keyword?: string // 旧资产关键词(ICCID、接入号、虚拟号、IMEI、SN)
|
||||||
|
new_asset_keyword?: string // 新资产关键词(ICCID、接入号、虚拟号、IMEI、SN)
|
||||||
created_at_start?: string // 创建时间起始
|
created_at_start?: string // 创建时间起始
|
||||||
created_at_end?: string // 创建时间结束
|
created_at_end?: string // 创建时间结束
|
||||||
}
|
}
|
||||||
@@ -33,10 +34,13 @@ export interface ExchangeResponse {
|
|||||||
exchange_no: string
|
exchange_no: string
|
||||||
exchange_reason: string
|
exchange_reason: string
|
||||||
old_asset_type: string
|
old_asset_type: string
|
||||||
|
old_asset_id: number
|
||||||
old_asset_identifier: string
|
old_asset_identifier: string
|
||||||
new_asset_type: string
|
new_asset_type?: string | null
|
||||||
new_asset_identifier: string
|
new_asset_id?: number | null
|
||||||
|
new_asset_identifier?: string | null
|
||||||
status: number // 换货状态(1:待填写信息, 2:待发货, 3:已发货待确认, 4:已完成, 5:已取消)
|
status: number // 换货状态(1:待填写信息, 2:待发货, 3:已发货待确认, 4:已完成, 5:已取消)
|
||||||
|
status_name?: string
|
||||||
status_text: string
|
status_text: string
|
||||||
flow_type: string // 流程类型(shipping/direct)
|
flow_type: string // 流程类型(shipping/direct)
|
||||||
flow_type_name: string // 流程类型名称
|
flow_type_name: string // 流程类型名称
|
||||||
@@ -47,6 +51,15 @@ export interface ExchangeResponse {
|
|||||||
recipient_address?: string
|
recipient_address?: string
|
||||||
express_company?: string
|
express_company?: string
|
||||||
express_no?: string
|
express_no?: string
|
||||||
|
inherited_shop_id?: number | null
|
||||||
|
inherited_shop_name?: string | null
|
||||||
|
submitter_name?: string | null // 提交人名称
|
||||||
|
approval_source?: 'none' | 'legacy' | 'wecom' | null // 审批来源
|
||||||
|
approval_status?: string | null // 审批状态
|
||||||
|
approval_status_name?: string | null // 审批状态名称
|
||||||
|
current_approver_summary?: string | null // 当前审批人摘要
|
||||||
|
processing_status?: string | null // 业务处理状态
|
||||||
|
processing_status_name?: string | null // 业务处理状态名称
|
||||||
remark?: string
|
remark?: string
|
||||||
created_at: string
|
created_at: string
|
||||||
updated_at: string
|
updated_at: string
|
||||||
@@ -86,8 +99,11 @@ export class ExchangeService extends BaseService {
|
|||||||
* POST /api/admin/exchanges
|
* POST /api/admin/exchanges
|
||||||
* @param data 创建参数
|
* @param data 创建参数
|
||||||
*/
|
*/
|
||||||
static createExchange(data: CreateExchangeRequest): Promise<BaseResponse<ExchangeResponse>> {
|
static createExchange(
|
||||||
return this.create<ExchangeResponse>('/api/admin/exchanges', data)
|
data: CreateExchangeRequest,
|
||||||
|
config?: Record<string, any>
|
||||||
|
): Promise<BaseResponse<ExchangeResponse>> {
|
||||||
|
return this.post<BaseResponse<ExchangeResponse>>('/api/admin/exchanges', data, config)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -114,8 +130,8 @@ export class ExchangeService extends BaseService {
|
|||||||
* POST /api/admin/exchanges/{id}/complete
|
* POST /api/admin/exchanges/{id}/complete
|
||||||
* @param id 换货单ID
|
* @param id 换货单ID
|
||||||
*/
|
*/
|
||||||
static completeExchange(id: number): Promise<BaseResponse> {
|
static completeExchange(id: number): Promise<BaseResponse<ExchangeResponse>> {
|
||||||
return this.post<BaseResponse>(`/api/admin/exchanges/${id}/complete`, {})
|
return this.post<BaseResponse<ExchangeResponse>>(`/api/admin/exchanges/${id}/complete`, {})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export { CarrierService } from './carrier'
|
|||||||
export { PackageSeriesService } from './packageSeries'
|
export { PackageSeriesService } from './packageSeries'
|
||||||
export { PackageManageService } from './packageManage'
|
export { PackageManageService } from './packageManage'
|
||||||
export { ShopSeriesGrantService } from './shopSeriesGrant'
|
export { ShopSeriesGrantService } from './shopSeriesGrant'
|
||||||
|
export { ShopPackageAllocationService } from './shopPackageAllocation'
|
||||||
export { OrderService } from './order'
|
export { OrderService } from './order'
|
||||||
export { AssetService } from './asset'
|
export { AssetService } from './asset'
|
||||||
export { AgentRechargeService } from './agentRecharge'
|
export { AgentRechargeService } from './agentRecharge'
|
||||||
@@ -33,6 +34,8 @@ export { PollingMonitorService } from './pollingMonitor'
|
|||||||
export { SuperAdminService } from './superAdmin'
|
export { SuperAdminService } from './superAdmin'
|
||||||
export { ExportTaskService } from './exportTask'
|
export { ExportTaskService } from './exportTask'
|
||||||
export { OrderPackageInvalidateTaskService } from './orderPackageInvalidateTask'
|
export { OrderPackageInvalidateTaskService } from './orderPackageInvalidateTask'
|
||||||
|
export { BulkPurchaseService } from './bulkPurchase'
|
||||||
|
export { NotificationService } from './notification'
|
||||||
|
|
||||||
// TODO: 按需添加其他业务模块
|
// TODO: 按需添加其他业务模块
|
||||||
// export { SettingService } from './setting'
|
// export { SettingService } from './setting'
|
||||||
|
|||||||
41
src/api/modules/notification.ts
Normal file
41
src/api/modules/notification.ts
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
import { BaseService } from '../BaseService'
|
||||||
|
import type {
|
||||||
|
BaseResponse,
|
||||||
|
NotificationItem,
|
||||||
|
NotificationListResponse,
|
||||||
|
NotificationQueryParams,
|
||||||
|
NotificationSummary,
|
||||||
|
NotificationTarget
|
||||||
|
} from '@/types/api'
|
||||||
|
|
||||||
|
export class NotificationService extends BaseService {
|
||||||
|
static getUnreadCount(): Promise<
|
||||||
|
BaseResponse<number | { count?: number; unread_count?: number }>
|
||||||
|
> {
|
||||||
|
return this.get<BaseResponse<number | { count?: number; unread_count?: number }>>(
|
||||||
|
'/api/admin/notifications/unread-count'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
static getUnreadSummary(): Promise<BaseResponse<NotificationSummary>> {
|
||||||
|
return this.get<BaseResponse<NotificationSummary>>('/api/admin/notifications/unread-summary')
|
||||||
|
}
|
||||||
|
|
||||||
|
static getNotifications(
|
||||||
|
params?: NotificationQueryParams
|
||||||
|
): Promise<BaseResponse<NotificationListResponse>> {
|
||||||
|
return this.get<BaseResponse<NotificationListResponse>>('/api/admin/notifications', params)
|
||||||
|
}
|
||||||
|
|
||||||
|
static markRead(id: number | string): Promise<BaseResponse<NotificationItem>> {
|
||||||
|
return this.put<BaseResponse<NotificationItem>>(`/api/admin/notifications/${id}/read`, {})
|
||||||
|
}
|
||||||
|
|
||||||
|
static markAllRead(): Promise<BaseResponse> {
|
||||||
|
return this.put<BaseResponse>('/api/admin/notifications/read-all', {})
|
||||||
|
}
|
||||||
|
|
||||||
|
static getTarget(id: number | string): Promise<BaseResponse<NotificationTarget>> {
|
||||||
|
return this.get<BaseResponse<NotificationTarget>>(`/api/admin/notifications/${id}/target`)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,10 +8,7 @@ import type {
|
|||||||
RefundQueryParams,
|
RefundQueryParams,
|
||||||
RefundListResponse,
|
RefundListResponse,
|
||||||
CreateRefundRequest,
|
CreateRefundRequest,
|
||||||
ApproveRefundRequest,
|
|
||||||
RejectRefundRequest,
|
|
||||||
ResubmitRefundRequest,
|
ResubmitRefundRequest,
|
||||||
ReturnRefundRequest,
|
|
||||||
BaseResponse
|
BaseResponse
|
||||||
} from '@/types/api'
|
} from '@/types/api'
|
||||||
|
|
||||||
@@ -40,24 +37,6 @@ export class RefundService extends BaseService {
|
|||||||
return this.post<BaseResponse<Refund>>('/api/admin/refunds', data)
|
return this.post<BaseResponse<Refund>>('/api/admin/refunds', data)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 审批通过退款申请
|
|
||||||
* @param id 退款申请ID
|
|
||||||
* @param data 审批通过请求参数
|
|
||||||
*/
|
|
||||||
static approveRefund(id: number, data: ApproveRefundRequest): Promise<BaseResponse<void>> {
|
|
||||||
return this.post<BaseResponse<void>>(`/api/admin/refunds/${id}/approve`, data)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 审批拒绝退款申请
|
|
||||||
* @param id 退款申请ID
|
|
||||||
* @param data 审批拒绝请求参数
|
|
||||||
*/
|
|
||||||
static rejectRefund(id: number, data: RejectRefundRequest): Promise<BaseResponse<void>> {
|
|
||||||
return this.post<BaseResponse<void>>(`/api/admin/refunds/${id}/reject`, data)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 重新提交退款申请
|
* 重新提交退款申请
|
||||||
* @param id 退款申请ID
|
* @param id 退款申请ID
|
||||||
@@ -66,13 +45,4 @@ export class RefundService extends BaseService {
|
|||||||
static resubmitRefund(id: number, data: ResubmitRefundRequest): Promise<BaseResponse<void>> {
|
static resubmitRefund(id: number, data: ResubmitRefundRequest): Promise<BaseResponse<void>> {
|
||||||
return this.post<BaseResponse<void>>(`/api/admin/refunds/${id}/resubmit`, data)
|
return this.post<BaseResponse<void>>(`/api/admin/refunds/${id}/resubmit`, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 驳回申请
|
|
||||||
* @param id 退款申请ID
|
|
||||||
* @param data 退回请求参数
|
|
||||||
*/
|
|
||||||
static returnRefund(id: number, data: ReturnRefundRequest): Promise<BaseResponse<void>> {
|
|
||||||
return this.post<BaseResponse<void>>(`/api/admin/refunds/${id}/return`, data)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import type {
|
|||||||
PlatformRole,
|
PlatformRole,
|
||||||
RoleQueryParams,
|
RoleQueryParams,
|
||||||
PlatformRoleFormData,
|
PlatformRoleFormData,
|
||||||
PermissionTreeNode,
|
UpdateRoleDefaultCreditRequest,
|
||||||
BaseResponse,
|
BaseResponse,
|
||||||
PaginationResponse
|
PaginationResponse
|
||||||
} from '@/types/api'
|
} from '@/types/api'
|
||||||
@@ -51,6 +51,19 @@ export class RoleService extends BaseService {
|
|||||||
return this.update(`/api/admin/roles/${id}`, data)
|
return this.update(`/api/admin/roles/${id}`, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新客户角色默认信用
|
||||||
|
* PUT /api/admin/roles/{id}/default-credit
|
||||||
|
* @param id 角色ID
|
||||||
|
* @param data 默认信用配置
|
||||||
|
*/
|
||||||
|
static updateRoleDefaultCredit(
|
||||||
|
id: number,
|
||||||
|
data: UpdateRoleDefaultCreditRequest
|
||||||
|
): Promise<BaseResponse> {
|
||||||
|
return this.put<BaseResponse>(`/api/admin/roles/${id}/default-credit`, data)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除角色
|
* 删除角色
|
||||||
* DELETE /api/admin/roles/{id}
|
* DELETE /api/admin/roles/{id}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import type {
|
|||||||
UpdateShopParams,
|
UpdateShopParams,
|
||||||
ShopRolesResponse,
|
ShopRolesResponse,
|
||||||
AssignShopRolesRequest,
|
AssignShopRolesRequest,
|
||||||
|
UpdateShopCreditLimitRequest,
|
||||||
BaseResponse,
|
BaseResponse,
|
||||||
PaginationResponse
|
PaginationResponse
|
||||||
} from '@/types/api'
|
} from '@/types/api'
|
||||||
@@ -114,4 +115,17 @@ export class ShopService extends BaseService {
|
|||||||
static deleteShopRole(shopId: number, roleId: number): Promise<BaseResponse> {
|
static deleteShopRole(shopId: number, roleId: number): Promise<BaseResponse> {
|
||||||
return this.delete<BaseResponse>(`/api/admin/shops/${shopId}/roles/${roleId}`)
|
return this.delete<BaseResponse>(`/api/admin/shops/${shopId}/roles/${roleId}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新店铺实际信用额度
|
||||||
|
* PUT /api/admin/shops/{id}/credit-limit
|
||||||
|
* @param shopId 店铺ID
|
||||||
|
* @param data 实际信用额度配置
|
||||||
|
*/
|
||||||
|
static updateShopCreditLimit(
|
||||||
|
shopId: number,
|
||||||
|
data: UpdateShopCreditLimitRequest
|
||||||
|
): Promise<BaseResponse> {
|
||||||
|
return this.put<BaseResponse>(`/api/admin/shops/${shopId}/credit-limit`, data)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
40
src/api/modules/shopPackageAllocation.ts
Normal file
40
src/api/modules/shopPackageAllocation.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
/**
|
||||||
|
* 店铺套餐分配 API 服务
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { BaseService } from '../BaseService'
|
||||||
|
import type {
|
||||||
|
BaseResponse,
|
||||||
|
CreateShopPackageAllocationRequest,
|
||||||
|
ShopPackageAllocationResponse,
|
||||||
|
UpdateShopPackageAllocationExpiryBaseRequest
|
||||||
|
} from '@/types/api'
|
||||||
|
|
||||||
|
export class ShopPackageAllocationService extends BaseService {
|
||||||
|
/**
|
||||||
|
* 创建店铺套餐分配
|
||||||
|
* POST /api/admin/shop-package-allocations
|
||||||
|
*/
|
||||||
|
static createShopPackageAllocation(
|
||||||
|
data: CreateShopPackageAllocationRequest
|
||||||
|
): Promise<BaseResponse<ShopPackageAllocationResponse>> {
|
||||||
|
return this.post<BaseResponse<ShopPackageAllocationResponse>>(
|
||||||
|
'/api/admin/shop-package-allocations',
|
||||||
|
data
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新店铺套餐分配生效条件
|
||||||
|
* PATCH /api/admin/shop-package-allocations/{id}/expiry-base
|
||||||
|
*/
|
||||||
|
static updateShopPackageAllocationExpiryBase(
|
||||||
|
id: number,
|
||||||
|
data: UpdateShopPackageAllocationExpiryBaseRequest
|
||||||
|
): Promise<BaseResponse<ShopPackageAllocationResponse>> {
|
||||||
|
return this.patch<BaseResponse<ShopPackageAllocationResponse>>(
|
||||||
|
`/api/admin/shop-package-allocations/${id}/expiry-base`,
|
||||||
|
data
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
93
src/components/business/BatchRealnamePolicyDialog.vue
Normal file
93
src/components/business/BatchRealnamePolicyDialog.vue
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
<template>
|
||||||
|
<ElDialog v-model="visible" title="批量修改实名顺序" width="520px" @closed="resetPolicy">
|
||||||
|
<ElForm label-width="110px">
|
||||||
|
<ElFormItem label="已选数量">
|
||||||
|
<span class="selected-count">{{ selectedCount }} {{ assetUnit }}</span>
|
||||||
|
</ElFormItem>
|
||||||
|
<ElFormItem label="实名认证策略">
|
||||||
|
<ElRadioGroup v-model="policy" :disabled="loading">
|
||||||
|
<ElRadio value="none">无需实名</ElRadio>
|
||||||
|
<ElRadio value="before_order">先实名后购买</ElRadio>
|
||||||
|
<ElRadio value="after_order">先购买后实名</ElRadio>
|
||||||
|
</ElRadioGroup>
|
||||||
|
</ElFormItem>
|
||||||
|
<ElAlert
|
||||||
|
v-if="devicePolicyHint"
|
||||||
|
title="实际H5流程由设备策略决定"
|
||||||
|
type="info"
|
||||||
|
:closable="false"
|
||||||
|
show-icon
|
||||||
|
/>
|
||||||
|
<ElAlert
|
||||||
|
v-if="errorMessage"
|
||||||
|
:title="errorMessage"
|
||||||
|
type="error"
|
||||||
|
:closable="false"
|
||||||
|
show-icon
|
||||||
|
class="error-alert"
|
||||||
|
/>
|
||||||
|
</ElForm>
|
||||||
|
|
||||||
|
<template #footer>
|
||||||
|
<ElButton :disabled="loading" @click="visible = false">取消</ElButton>
|
||||||
|
<ElButton type="primary" :loading="loading" @click="emit('confirm', policy)">
|
||||||
|
确认修改
|
||||||
|
</ElButton>
|
||||||
|
</template>
|
||||||
|
</ElDialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, ref } from 'vue'
|
||||||
|
import {
|
||||||
|
ElAlert,
|
||||||
|
ElButton,
|
||||||
|
ElDialog,
|
||||||
|
ElForm,
|
||||||
|
ElFormItem,
|
||||||
|
ElRadio,
|
||||||
|
ElRadioGroup
|
||||||
|
} from 'element-plus'
|
||||||
|
import type { AssetRealnamePolicy } from '@/types/api'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
modelValue: boolean
|
||||||
|
selectedCount: number
|
||||||
|
assetUnit: string
|
||||||
|
loading?: boolean
|
||||||
|
errorMessage?: string
|
||||||
|
devicePolicyHint?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = withDefaults(defineProps<Props>(), {
|
||||||
|
loading: false,
|
||||||
|
errorMessage: '',
|
||||||
|
devicePolicyHint: false
|
||||||
|
})
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
'update:modelValue': [value: boolean]
|
||||||
|
confirm: [policy: AssetRealnamePolicy]
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const policy = ref<AssetRealnamePolicy>('none')
|
||||||
|
const visible = computed({
|
||||||
|
get: () => props.modelValue,
|
||||||
|
set: (value) => emit('update:modelValue', value)
|
||||||
|
})
|
||||||
|
|
||||||
|
const resetPolicy = () => {
|
||||||
|
policy.value = 'none'
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.selected-count {
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--el-color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-alert {
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -46,6 +46,16 @@
|
|||||||
placeholder="请输入退款原因"
|
placeholder="请输入退款原因"
|
||||||
/>
|
/>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
|
<ElFormItem label="备注">
|
||||||
|
<ElInput
|
||||||
|
v-model="formData.remark"
|
||||||
|
type="textarea"
|
||||||
|
:rows="2"
|
||||||
|
maxlength="500"
|
||||||
|
show-word-limit
|
||||||
|
placeholder="请输入备注"
|
||||||
|
/>
|
||||||
|
</ElFormItem>
|
||||||
<ElFormItem label="退款凭证" prop="refund_voucher_key">
|
<ElFormItem label="退款凭证" prop="refund_voucher_key">
|
||||||
<VoucherUpload
|
<VoucherUpload
|
||||||
ref="uploadRef"
|
ref="uploadRef"
|
||||||
@@ -53,6 +63,7 @@
|
|||||||
voucher-name="退款凭证"
|
voucher-name="退款凭证"
|
||||||
@uploading-change="voucherUploading = $event"
|
@uploading-change="voucherUploading = $event"
|
||||||
@change="formRef?.validateField('refund_voucher_key')"
|
@change="formRef?.validateField('refund_voucher_key')"
|
||||||
|
@files-change="formData.attachments = $event"
|
||||||
/>
|
/>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
</ElForm>
|
</ElForm>
|
||||||
@@ -77,7 +88,7 @@
|
|||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import type { FormInstance, FormRules } from 'element-plus'
|
import type { FormInstance, FormRules } from 'element-plus'
|
||||||
import { RefundService, OrderService } from '@/api/modules'
|
import { RefundService, OrderService } from '@/api/modules'
|
||||||
import type { CreateRefundRequest, Order } from '@/types/api'
|
import type { CreateRefundRequest, Order, RefundAttachment } from '@/types/api'
|
||||||
import { formatMoney, yuanToFen } from '@/utils/business/format'
|
import { formatMoney, yuanToFen } from '@/utils/business/format'
|
||||||
import { getErrorMessage } from '@/utils/business'
|
import { getErrorMessage } from '@/utils/business'
|
||||||
import VoucherUpload from '@/components/business/VoucherUpload.vue'
|
import VoucherUpload from '@/components/business/VoucherUpload.vue'
|
||||||
@@ -111,13 +122,17 @@
|
|||||||
requested_refund_amount?: number
|
requested_refund_amount?: number
|
||||||
actual_received_amount: number
|
actual_received_amount: number
|
||||||
refund_reason: string
|
refund_reason: string
|
||||||
|
remark: string
|
||||||
refund_voucher_key: string[]
|
refund_voucher_key: string[]
|
||||||
|
attachments: RefundAttachment[]
|
||||||
}>({
|
}>({
|
||||||
order_id: null,
|
order_id: null,
|
||||||
requested_refund_amount: undefined,
|
requested_refund_amount: undefined,
|
||||||
actual_received_amount: 0,
|
actual_received_amount: 0,
|
||||||
refund_reason: '',
|
refund_reason: '',
|
||||||
refund_voucher_key: []
|
remark: '',
|
||||||
|
refund_voucher_key: [],
|
||||||
|
attachments: []
|
||||||
})
|
})
|
||||||
|
|
||||||
const validateRefundAmount = (rule: any, value: number, callback: any) => {
|
const validateRefundAmount = (rule: any, value: number, callback: any) => {
|
||||||
@@ -201,7 +216,9 @@
|
|||||||
formData.requested_refund_amount = undefined
|
formData.requested_refund_amount = undefined
|
||||||
formData.actual_received_amount = 0
|
formData.actual_received_amount = 0
|
||||||
formData.refund_reason = ''
|
formData.refund_reason = ''
|
||||||
|
formData.remark = ''
|
||||||
formData.refund_voucher_key = []
|
formData.refund_voucher_key = []
|
||||||
|
formData.attachments = []
|
||||||
orderSearchOptions.value = []
|
orderSearchOptions.value = []
|
||||||
uploadRef.value?.clearFiles(false)
|
uploadRef.value?.clearFiles(false)
|
||||||
}
|
}
|
||||||
@@ -221,8 +238,9 @@
|
|||||||
order_id: formData.order_id!,
|
order_id: formData.order_id!,
|
||||||
requested_refund_amount: yuanToFen(formData.requested_refund_amount) ?? 0,
|
requested_refund_amount: yuanToFen(formData.requested_refund_amount) ?? 0,
|
||||||
actual_received_amount: formData.actual_received_amount,
|
actual_received_amount: formData.actual_received_amount,
|
||||||
refund_voucher_key: formData.refund_voucher_key,
|
attachments: formData.attachments,
|
||||||
refund_reason: formData.refund_reason || undefined
|
refund_reason: formData.refund_reason || undefined,
|
||||||
|
remark: formData.remark || undefined
|
||||||
}
|
}
|
||||||
await RefundService.createRefund(data)
|
await RefundService.createRefund(data)
|
||||||
ElMessage.success('退款申请创建成功')
|
ElMessage.success('退款申请创建成功')
|
||||||
|
|||||||
@@ -113,6 +113,9 @@
|
|||||||
|
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
ElMessage.success(res.data?.message || '导出任务已创建')
|
ElMessage.success(res.data?.message || '导出任务已创建')
|
||||||
|
if (res.data?.task_id) {
|
||||||
|
localStorage.setItem(`export-task-active:${props.scene}`, String(res.data.task_id))
|
||||||
|
}
|
||||||
emit('success', res.data)
|
emit('success', res.data)
|
||||||
visible.value = false
|
visible.value = false
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user