feat: 实现账号与佣金管理模块
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 4m35s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 4m35s
新增功能: - 店铺佣金查询:店铺佣金统计、店铺佣金记录列表、店铺提现记录 - 佣金提现审批:提现申请列表、审批通过、审批拒绝 - 提现配置管理:配置列表、新增配置、获取当前生效配置 - 企业管理:企业列表、创建、更新、删除、获取详情 - 企业卡授权:授权列表、批量授权、批量取消授权、统计 - 客户账号管理:账号列表、创建、更新状态、重置密码 - 我的佣金:佣金统计、佣金记录、提现申请、提现记录 数据库变更: - 扩展 tb_commission_withdrawal_request 新增提现单号等字段 - 扩展 tb_account 新增 is_primary 字段 - 扩展 tb_commission_record 新增 shop_id、balance_after - 扩展 tb_commission_withdrawal_setting 新增每日提现次数限制 - 扩展 tb_iot_card、tb_device 新增 shop_id 冗余字段 - 新建 tb_enterprise_card_authorization 企业卡授权表 - 新建 tb_asset_allocation_record 资产分配记录表 - 数据迁移:owner_type 枚举值 agent 统一为 shop 测试: - 新增 7 个单元测试文件覆盖各服务 - 修复集成测试 Redis 依赖问题
This commit is contained in:
@@ -0,0 +1,71 @@
|
||||
# Change: 财务-我的账号模块(代理商端)
|
||||
|
||||
## Why
|
||||
|
||||
代理商需要查看和管理自己的佣金:
|
||||
1. 查看佣金概览(总佣金、已提现、未提现、冻结、可提现)
|
||||
2. 发起佣金提现申请
|
||||
3. 查看我的提现记录
|
||||
4. 查看我的佣金入账明细
|
||||
|
||||
这是代理商用户的自助功能模块。
|
||||
|
||||
## What Changes
|
||||
|
||||
### 新增 API 接口
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/api/admin/my/commission-summary` | 我的佣金概览 |
|
||||
| POST | `/api/admin/my/withdrawal-requests` | 发起提现 |
|
||||
| GET | `/api/admin/my/withdrawal-requests` | 我的提现记录 |
|
||||
| GET | `/api/admin/my/commission-records` | 我的佣金明细 |
|
||||
|
||||
### 技术实现
|
||||
|
||||
- 新增 Handler:`internal/handler/admin/my_commission.go`
|
||||
- 新增 Service:`internal/service/my_commission/service.go`
|
||||
- 新增 DTO:`internal/model/dto/my_commission_dto.go`
|
||||
|
||||
### 业务逻辑
|
||||
|
||||
**发起提现**:
|
||||
1. 从当前用户上下文获取 `shop_id` 和 `account_id`
|
||||
2. 获取当前生效的提现配置
|
||||
3. 验证:
|
||||
- 提现金额 >= 最低提现金额
|
||||
- 可提现余额 >= 提现金额
|
||||
- 今日提现次数 < 每日提现次数限制
|
||||
4. 计算手续费和实际到账金额
|
||||
5. 创建提现申请记录
|
||||
6. 冻结店铺佣金钱包中对应金额
|
||||
7. 记录钱包交易流水
|
||||
|
||||
## Impact
|
||||
|
||||
### 影响的规范
|
||||
- **新增 Capability**:`my-commission`
|
||||
|
||||
### 影响的代码
|
||||
|
||||
**新增文件**(约 300 行):
|
||||
- `internal/handler/admin/my_commission.go`(~80 行)
|
||||
- `internal/service/my_commission/service.go`(~150 行)
|
||||
- `internal/model/dto/my_commission_dto.go`(~70 行)
|
||||
|
||||
### 兼容性
|
||||
- ✅ 向后兼容:新增 API
|
||||
|
||||
## Dependencies
|
||||
|
||||
- 依赖提案:
|
||||
- `add-commission-model-changes`
|
||||
- `add-commission-withdrawal-approval`(共享提现记录查询)
|
||||
- `add-commission-withdrawal-settings`(获取提现配置)
|
||||
- 依赖现有模型:`Wallet`、`CommissionWithdrawalRequest`、`CommissionRecord`
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
1. **单元测试**:提现校验逻辑
|
||||
2. **集成测试**:完整提现流程
|
||||
3. **边界测试**:最低金额、次数限制、余额不足
|
||||
@@ -0,0 +1,137 @@
|
||||
## ADDED Requirements
|
||||
|
||||
### Requirement: 获取我的佣金概览
|
||||
系统 SHALL 提供代理商查看自己店铺佣金概览的接口。
|
||||
|
||||
**接口**:`GET /api/admin/my/commission-summary`
|
||||
|
||||
**响应字段**:
|
||||
- 店铺信息(shop_id, shop_name)
|
||||
- 佣金汇总(total_commission, withdrawn_commission, unwithdraw_commission, frozen_commission, withdrawing_commission, available_commission)
|
||||
|
||||
**访问权限**:仅代理商用户(UserType=3)
|
||||
|
||||
#### Scenario: 获取佣金概览
|
||||
- **WHEN** 代理商用户请求佣金概览
|
||||
- **THEN** 从当前用户上下文获取 shop_id
|
||||
- **AND** 计算并返回该店铺的佣金汇总
|
||||
|
||||
#### Scenario: 非代理商用户访问
|
||||
- **WHEN** 非代理商用户请求此接口
|
||||
- **THEN** 返回权限错误
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 发起佣金提现
|
||||
系统 SHALL 提供代理商发起佣金提现申请的接口。
|
||||
|
||||
**接口**:`POST /api/admin/my/withdrawal-requests`
|
||||
|
||||
**请求参数**:
|
||||
- `amount`:提现金额,分(必填)
|
||||
- `withdrawal_method`:收款类型(必填,目前支持 alipay)
|
||||
- `account_name`:收款人姓名(必填)
|
||||
- `account_number`:支付宝账号(必填)
|
||||
|
||||
**响应字段**:
|
||||
- 提现申请详情(id, withdrawal_no, amount, fee_rate, fee, actual_amount, status, created_at)
|
||||
|
||||
#### Scenario: 成功发起提现
|
||||
- **WHEN** 代理商发起符合条件的提现申请
|
||||
- **THEN** 创建提现申请记录(status=1 待审批)
|
||||
- **AND** 冻结店铺佣金钱包中对应金额
|
||||
- **AND** 创建钱包交易流水(冻结类型)
|
||||
- **AND** 记录申请人ID和当前手续费比率
|
||||
|
||||
#### Scenario: 验证最低提现金额
|
||||
- **WHEN** 提现金额低于配置的最低金额
|
||||
- **THEN** 返回错误:提现金额不能低于 X 元
|
||||
|
||||
#### Scenario: 验证可提现余额
|
||||
- **WHEN** 提现金额大于可提现余额
|
||||
- **THEN** 返回错误:可提现余额不足
|
||||
|
||||
#### Scenario: 验证每日提现次数
|
||||
- **WHEN** 今日提现次数已达限制
|
||||
- **THEN** 返回错误:今日提现次数已达上限
|
||||
|
||||
#### Scenario: 无提现配置时
|
||||
- **WHEN** 系统没有生效的提现配置
|
||||
- **THEN** 返回错误:暂未开放提现功能
|
||||
|
||||
#### Scenario: 计算手续费
|
||||
- **WHEN** 创建提现申请
|
||||
- **THEN** 按当前费率计算手续费:fee = amount * fee_rate / 10000
|
||||
- **AND** 计算实际到账金额:actual_amount = amount - fee
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 查询我的提现记录
|
||||
系统 SHALL 提供代理商查询自己提现记录的接口。
|
||||
|
||||
**接口**:`GET /api/admin/my/withdrawal-requests`
|
||||
|
||||
**请求参数**:
|
||||
- `page`、`page_size`:分页
|
||||
- `status`:状态筛选
|
||||
- `start_time`、`end_time`:申请时间范围
|
||||
|
||||
**响应字段**:
|
||||
- 与提现申请列表接口相同
|
||||
|
||||
#### Scenario: 查询我的提现记录
|
||||
- **WHEN** 代理商查询提现记录
|
||||
- **THEN** 只返回当前用户所属店铺的提现记录
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 查询我的佣金明细
|
||||
系统 SHALL 提供代理商查询自己佣金入账明细的接口。
|
||||
|
||||
**接口**:`GET /api/admin/my/commission-records`
|
||||
|
||||
**请求参数**:
|
||||
- `page`、`page_size`:分页
|
||||
- `commission_type`:佣金类型
|
||||
- `iccid`:ICCID(模糊查询)
|
||||
- `device_no`:设备号(模糊查询)
|
||||
- `order_no`:订单号(模糊查询)
|
||||
|
||||
**响应字段**:
|
||||
- 与佣金明细接口相同
|
||||
|
||||
#### Scenario: 查询我的佣金明细
|
||||
- **WHEN** 代理商查询佣金明细
|
||||
- **THEN** 只返回当前用户所属店铺的佣金记录
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 提现单号生成规则
|
||||
系统 SHALL 按以下规则生成提现单号。
|
||||
|
||||
**格式**:W + 年月日时分秒 + 4位随机数
|
||||
**示例**:W20260121143012345
|
||||
|
||||
#### Scenario: 生成唯一提现单号
|
||||
- **WHEN** 创建提现申请
|
||||
- **THEN** 自动生成唯一的提现单号
|
||||
- **AND** 格式为 W + 时间戳 + 随机数
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 提现钱包操作
|
||||
系统 SHALL 在提现申请时正确操作钱包。
|
||||
|
||||
#### Scenario: 冻结余额
|
||||
- **WHEN** 创建提现申请
|
||||
- **THEN** 从钱包可用余额(balance)扣除提现金额
|
||||
- **AND** 增加钱包冻结余额(frozen_balance)
|
||||
- **AND** 使用事务确保原子性
|
||||
|
||||
#### Scenario: 审批通过后扣除
|
||||
- **WHEN** 提现申请审批通过
|
||||
- **THEN** 从冻结余额扣除(由审批模块处理)
|
||||
|
||||
#### Scenario: 审批拒绝后解冻
|
||||
- **WHEN** 提现申请被拒绝
|
||||
- **THEN** 将冻结金额退回可用余额(由审批模块处理)
|
||||
120
openspec/changes/archive/2026-01-21-add-my-commission/tasks.md
Normal file
120
openspec/changes/archive/2026-01-21-add-my-commission/tasks.md
Normal file
@@ -0,0 +1,120 @@
|
||||
# 实现任务清单
|
||||
|
||||
**Change ID**: `add-my-commission`
|
||||
|
||||
---
|
||||
|
||||
## 阶段 1: DTO 定义 (20 分钟)
|
||||
|
||||
### Task 1.1: 创建 DTO 文件
|
||||
|
||||
**文件**: `internal/model/my_commission_dto.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 1.1.1 `MyCommissionSummaryResp` 佣金概览响应
|
||||
- [x] 1.1.2 `CreateMyWithdrawalReq` 发起提现请求
|
||||
- [x] 1.1.3 `CreateMyWithdrawalResp` 发起提现响应
|
||||
- [x] 1.1.4 `MyWithdrawalListReq` 提现记录查询请求
|
||||
- [x] 1.1.5 `MyCommissionRecordListReq` 佣金明细查询请求
|
||||
- [x] 1.1.6 `MyCommissionRecordItem` 佣金记录列表项
|
||||
- [x] 1.1.7 `MyCommissionRecordPageResult` 佣金记录分页响应
|
||||
|
||||
**验证**:
|
||||
- [x] 字段完整
|
||||
- [x] 验证标签正确
|
||||
|
||||
---
|
||||
|
||||
## 阶段 2: Service 层 (1.5 小时)
|
||||
|
||||
### Task 2.1: 创建 MyCommission Service
|
||||
|
||||
**文件**: `internal/service/my_commission/service.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 2.1.1 `GetCommissionSummary(ctx)` - 我的佣金概览
|
||||
- [x] 2.1.2 `CreateWithdrawalRequest(ctx, req)` - 发起提现
|
||||
- [x] 2.1.3 `ListMyWithdrawalRequests(ctx, req)` - 我的提现记录
|
||||
- [x] 2.1.4 `ListMyCommissionRecords(ctx, req)` - 我的佣金明细
|
||||
|
||||
**业务逻辑**:
|
||||
- [x] 2.1.5 从上下文获取当前用户的 shop_id
|
||||
- [x] 2.1.6 提现验证(金额、余额、次数限制)
|
||||
- [x] 2.1.7 计算手续费
|
||||
- [x] 2.1.8 冻结钱包余额
|
||||
- [x] 2.1.9 生成提现单号
|
||||
|
||||
**验证**:
|
||||
- [x] 提现验证逻辑正确
|
||||
- [x] 钱包操作正确
|
||||
|
||||
---
|
||||
|
||||
## 阶段 3: Handler 层 (45 分钟)
|
||||
|
||||
### Task 3.1: 创建 Handler
|
||||
|
||||
**文件**: `internal/handler/admin/my_commission.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 3.1.1 `GetSummary` - GET /api/admin/my/commission-summary
|
||||
- [x] 3.1.2 `CreateWithdrawal` - POST /api/admin/my/withdrawal-requests
|
||||
- [x] 3.1.3 `ListWithdrawals` - GET /api/admin/my/withdrawal-requests
|
||||
- [x] 3.1.4 `ListRecords` - GET /api/admin/my/commission-records
|
||||
|
||||
**验证**:
|
||||
- [x] 参数校验正确
|
||||
- [x] 仅代理商用户可访问(Service 层校验)
|
||||
|
||||
---
|
||||
|
||||
### Task 3.2: 路由注册
|
||||
|
||||
**文件**: `internal/routes/my_commission.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 3.2.1 注册四个 API 路由
|
||||
- [x] 3.2.2 配置权限(仅代理商用户,Service 层校验)
|
||||
|
||||
---
|
||||
|
||||
### Task 3.3: Bootstrap 注册
|
||||
|
||||
**实现内容**:
|
||||
- [x] 3.3.1 `internal/bootstrap/services.go` - 添加 MyCommission Service
|
||||
- [x] 3.3.2 `internal/bootstrap/handlers.go` - 添加 MyCommission Handler
|
||||
- [x] 3.3.3 `internal/bootstrap/types.go` - 添加 MyCommission Handler 类型
|
||||
- [x] 3.3.4 `internal/routes/admin.go` - 注册 MyCommission 路由
|
||||
|
||||
---
|
||||
|
||||
## 阶段 4: 测试 (45 分钟)
|
||||
|
||||
### Task 4.1: 功能测试
|
||||
|
||||
**实现内容**:
|
||||
- [x] 4.1.1 佣金概览测试
|
||||
- [x] 4.1.2 发起提现测试
|
||||
- [x] 4.1.3 提现记录查询测试
|
||||
- [x] 4.1.4 佣金明细查询测试
|
||||
|
||||
### Task 4.2: 边界测试
|
||||
|
||||
**实现内容**:
|
||||
- [x] 4.2.1 最低金额验证
|
||||
- [x] 4.2.2 每日次数限制验证
|
||||
- [x] 4.2.3 余额不足验证
|
||||
- [x] 4.2.4 无提现配置时的处理
|
||||
|
||||
---
|
||||
|
||||
## 完成标准
|
||||
|
||||
- [x] 所有 DTO 定义完成
|
||||
- [x] Service 层业务逻辑完成
|
||||
- [x] Handler 层 API 实现完成
|
||||
- [x] 提现验证逻辑正确
|
||||
- [x] 钱包冻结操作正确
|
||||
- [x] 仅代理商用户可访问
|
||||
- [x] 编译通过
|
||||
- [x] 功能测试通过
|
||||
Reference in New Issue
Block a user