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,80 @@
|
||||
# Change: 佣金提现审批模块
|
||||
|
||||
## Why
|
||||
|
||||
平台需要对代理商的佣金提现申请进行审批管理:
|
||||
1. 查看所有待处理的提现申请列表
|
||||
2. 审批通过提现申请(扣除佣金、记录流水)
|
||||
3. 拒绝提现申请(解冻佣金)
|
||||
|
||||
这是账号管理-佣金提现模块的核心功能。
|
||||
|
||||
## What Changes
|
||||
|
||||
### 新增 API 接口
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/api/admin/commission/withdrawal-requests` | 提现申请列表(审批视图) |
|
||||
| POST | `/api/admin/commission/withdrawal-requests/:id/approve` | 审批通过 |
|
||||
| POST | `/api/admin/commission/withdrawal-requests/:id/reject` | 拒绝 |
|
||||
|
||||
### 技术实现
|
||||
|
||||
- 新增 Handler:`internal/handler/admin/commission_withdrawal.go`
|
||||
- 新增 Service:`internal/service/commission_withdrawal/service.go`
|
||||
- 新增 DTO:`internal/model/dto/commission_withdrawal_dto.go`
|
||||
- 扩展 Store:钱包操作、流水记录
|
||||
|
||||
### 业务逻辑
|
||||
|
||||
**审批通过流程**:
|
||||
1. 验证提现申请存在且状态为待审批
|
||||
2. 验证当前用户有审批权限
|
||||
3. 如果修正了金额,重新计算手续费和实际到账金额
|
||||
4. 更新状态为已通过(status=2)
|
||||
5. 从店铺佣金钱包扣除对应金额(解冻并扣除)
|
||||
6. 记录钱包交易流水
|
||||
7. 记录处理人和处理时间
|
||||
|
||||
**拒绝流程**:
|
||||
1. 验证提现申请存在且状态为待审批
|
||||
2. 更新状态为已拒绝(status=3)
|
||||
3. 解冻店铺佣金钱包中的冻结金额
|
||||
4. 记录钱包交易流水
|
||||
5. 记录处理人、处理时间和拒绝原因
|
||||
|
||||
**审批状态**:
|
||||
- 1:待审批
|
||||
- 2:已通过
|
||||
- 3:已拒绝
|
||||
|
||||
## Impact
|
||||
|
||||
### 影响的规范
|
||||
- **新增 Capability**:`commission-withdrawal-approval`
|
||||
|
||||
### 影响的代码
|
||||
|
||||
**新增文件**(约 350 行):
|
||||
- `internal/handler/admin/commission_withdrawal.go`(~100 行)
|
||||
- `internal/service/commission_withdrawal/service.go`(~200 行)
|
||||
- `internal/model/dto/commission_withdrawal_dto.go`(~50 行)
|
||||
|
||||
**修改文件**(约 50 行):
|
||||
- `internal/store/postgres/wallet_store.go`(扣款、解冻方法)
|
||||
- `internal/store/postgres/wallet_transaction_store.go`(创建流水)
|
||||
|
||||
### 兼容性
|
||||
- ✅ 向后兼容:新增 API,不影响现有功能
|
||||
|
||||
## Dependencies
|
||||
|
||||
- 依赖提案:`add-commission-model-changes`
|
||||
- 依赖现有模型:`CommissionWithdrawalRequest`、`Wallet`、`WalletTransaction`
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
1. **单元测试**:审批流程、钱包操作
|
||||
2. **集成测试**:完整审批流程(申请→通过/拒绝)
|
||||
3. **并发测试**:同一申请的并发审批处理
|
||||
@@ -0,0 +1,123 @@
|
||||
## ADDED Requirements
|
||||
|
||||
### Requirement: 提现申请列表查询
|
||||
系统 SHALL 提供提现申请列表查询接口,用于审批管理。
|
||||
|
||||
**接口**:`GET /api/admin/commission/withdrawal-requests`
|
||||
|
||||
**请求参数**:
|
||||
- `page`、`page_size`:分页
|
||||
- `status`:状态筛选(1=待审批, 2=已通过, 3=已拒绝)
|
||||
- `withdrawal_no`:提现单号(精确查询)
|
||||
- `shop_name`:店铺名称(模糊查询)
|
||||
- `start_time`、`end_time`:申请时间范围
|
||||
|
||||
**响应字段**:
|
||||
- 提现申请详情(id, withdrawal_no, amount, fee_rate, fee, actual_amount)
|
||||
- 店铺信息(shop_id, shop_name, shop_hierarchy)
|
||||
- 申请人信息(applicant_id, applicant_name)
|
||||
- 状态信息(status, status_name)
|
||||
- 收款信息(withdrawal_method, account_name, account_number)
|
||||
- 处理信息(processor_id, processor_name, processed_at, remark)
|
||||
|
||||
#### Scenario: 查询待审批的提现申请
|
||||
- **WHEN** 请求 `status=1` 的提现申请
|
||||
- **THEN** 返回所有待审批的申请
|
||||
- **AND** 按申请时间倒序排列
|
||||
|
||||
#### Scenario: 平台用户查看所有申请
|
||||
- **WHEN** 平台用户请求提现申请列表
|
||||
- **THEN** 返回所有店铺的提现申请
|
||||
|
||||
#### Scenario: 代理商用户查看下级申请
|
||||
- **WHEN** 代理商用户请求提现申请列表
|
||||
- **THEN** 只返回自己店铺及下级店铺的申请
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 审批通过提现申请
|
||||
系统 SHALL 提供审批通过提现申请的接口。
|
||||
|
||||
**接口**:`POST /api/admin/commission/withdrawal-requests/:id/approve`
|
||||
|
||||
**请求参数**:
|
||||
- `id`:提现申请ID(路径参数)
|
||||
- `payment_type`:放款类型(必填,目前只支持 manual)
|
||||
- `amount`:修正后的提现金额(可选)
|
||||
- `withdrawal_method`:修正后的收款类型(可选)
|
||||
- `account_name`:修正后的收款人姓名(可选)
|
||||
- `account_number`:修正后的收款账号(可选)
|
||||
- `remark`:备注(可选)
|
||||
|
||||
**响应字段**:
|
||||
- `id`、`withdrawal_no`、`status`、`status_name`、`processed_at`
|
||||
|
||||
#### Scenario: 审批通过待审批的申请
|
||||
- **WHEN** 管理员审批通过一个待审批的提现申请
|
||||
- **THEN** 申请状态变为已通过(status=2)
|
||||
- **AND** 记录处理人ID和处理时间
|
||||
- **AND** 从店铺佣金钱包扣除提现金额(从冻结余额扣除)
|
||||
- **AND** 创建钱包交易流水记录
|
||||
|
||||
#### Scenario: 修正提现金额后审批
|
||||
- **WHEN** 管理员修正提现金额后审批通过
|
||||
- **THEN** 重新计算手续费和实际到账金额
|
||||
- **AND** 按修正后的金额扣款
|
||||
- **AND** 如果修正金额小于原金额,退回差额到可用余额
|
||||
|
||||
#### Scenario: 审批非待审批状态的申请
|
||||
- **WHEN** 尝试审批非待审批状态的申请
|
||||
- **THEN** 返回错误:申请状态不允许此操作
|
||||
|
||||
#### Scenario: 钱包余额不足
|
||||
- **WHEN** 店铺佣金钱包冻结余额不足
|
||||
- **THEN** 返回错误:钱包余额不足
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 拒绝提现申请
|
||||
系统 SHALL 提供拒绝提现申请的接口。
|
||||
|
||||
**接口**:`POST /api/admin/commission/withdrawal-requests/:id/reject`
|
||||
|
||||
**请求参数**:
|
||||
- `id`:提现申请ID(路径参数)
|
||||
- `remark`:拒绝原因(必填)
|
||||
|
||||
**响应字段**:
|
||||
- `id`、`withdrawal_no`、`status`、`status_name`、`processed_at`
|
||||
|
||||
#### Scenario: 拒绝待审批的申请
|
||||
- **WHEN** 管理员拒绝一个待审批的提现申请
|
||||
- **THEN** 申请状态变为已拒绝(status=3)
|
||||
- **AND** 记录处理人ID、处理时间和拒绝原因
|
||||
- **AND** 解冻店铺佣金钱包中的冻结金额
|
||||
- **AND** 创建钱包交易流水记录(解冻类型)
|
||||
|
||||
#### Scenario: 拒绝时必须填写原因
|
||||
- **WHEN** 拒绝申请时未填写 remark
|
||||
- **THEN** 返回错误:拒绝原因不能为空
|
||||
|
||||
#### Scenario: 拒绝非待审批状态的申请
|
||||
- **WHEN** 尝试拒绝非待审批状态的申请
|
||||
- **THEN** 返回错误:申请状态不允许此操作
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 审批事务一致性
|
||||
系统 SHALL 确保审批操作的事务一致性。
|
||||
|
||||
#### Scenario: 审批通过事务
|
||||
- **WHEN** 审批通过提现申请
|
||||
- **THEN** 状态更新、钱包扣款、流水记录在同一事务中完成
|
||||
- **AND** 任一步骤失败则全部回滚
|
||||
|
||||
#### Scenario: 拒绝事务
|
||||
- **WHEN** 拒绝提现申请
|
||||
- **THEN** 状态更新、解冻余额、流水记录在同一事务中完成
|
||||
- **AND** 任一步骤失败则全部回滚
|
||||
|
||||
#### Scenario: 并发审批防护
|
||||
- **WHEN** 多个管理员同时审批同一申请
|
||||
- **THEN** 只有一个操作成功
|
||||
- **AND** 其他操作返回状态冲突错误
|
||||
@@ -0,0 +1,155 @@
|
||||
# 实现任务清单
|
||||
|
||||
**Change ID**: `add-commission-withdrawal-approval`
|
||||
|
||||
---
|
||||
|
||||
## 阶段 1: DTO 定义 (20 分钟)
|
||||
|
||||
### Task 1.1: 创建 DTO 文件
|
||||
|
||||
**文件**: `internal/model/commission_withdrawal_dto.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 1.1.1 `WithdrawalRequestListReq` 请求结构(分页、状态、时间范围等)
|
||||
- [x] 1.1.2 `WithdrawalRequestItem` 响应结构
|
||||
- [x] 1.1.3 `ApproveWithdrawalReq` 审批通过请求
|
||||
- [x] 1.1.4 `RejectWithdrawalReq` 拒绝请求
|
||||
- [x] 1.1.5 `WithdrawalApprovalResp` 审批响应
|
||||
|
||||
**验证**:
|
||||
- [x] DTO 字段完整
|
||||
- [x] 验证标签正确(remark 必填等)
|
||||
|
||||
---
|
||||
|
||||
## 阶段 2: Store 层扩展 (1 小时)
|
||||
|
||||
### Task 2.1: 扩展 CommissionWithdrawalRequest Store
|
||||
|
||||
**文件**: `internal/store/postgres/commission_withdrawal_request_store.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 2.1.1 `List(req)` - 分页查询提现申请
|
||||
- [x] 2.1.2 `GetByID(id)` - 获取单条记录(已有)
|
||||
- [x] 2.1.3 `UpdateStatusWithTx(id, updates)` - 事务中更新状态
|
||||
|
||||
**验证**:
|
||||
- [x] 关联查询正确(店铺、申请人、处理人)
|
||||
- [x] 乐观锁/版本控制(状态检查防止并发问题)
|
||||
|
||||
---
|
||||
|
||||
### Task 2.2: 扩展 Wallet Store
|
||||
|
||||
**文件**: `internal/store/postgres/wallet_store.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 2.2.1 `GetByID(walletID)` - 获取钱包
|
||||
- [x] 2.2.2 `DeductFrozenBalanceWithTx(walletID, amount)` - 从冻结中扣除
|
||||
- [x] 2.2.3 `UnfreezeBalanceWithTx(walletID, amount)` - 解冻余额到可用
|
||||
|
||||
**验证**:
|
||||
- [x] 事务处理正确
|
||||
- [x] 余额不能为负(通过 WHERE 条件保证)
|
||||
|
||||
---
|
||||
|
||||
### Task 2.3: WalletTransaction Store
|
||||
|
||||
**文件**: `internal/store/postgres/wallet_transaction_store.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 2.3.1 `CreateWithTx(transaction)` - 事务中创建交易流水
|
||||
- [x] 2.3.2 `Create(transaction)` - 创建交易流水
|
||||
|
||||
**验证**:
|
||||
- [x] 流水类型正确
|
||||
- [x] 关联信息完整
|
||||
|
||||
---
|
||||
|
||||
## 阶段 3: Service 层 (1.5 小时)
|
||||
|
||||
### Task 3.1: 创建 CommissionWithdrawal Service
|
||||
|
||||
**文件**: `internal/service/commission_withdrawal/service.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 3.1.1 `ListWithdrawalRequests(ctx, req)` - 查询提现申请列表
|
||||
- [x] 3.1.2 `Approve(ctx, id, req)` - 审批通过
|
||||
- [x] 3.1.3 `Reject(ctx, id, req)` - 拒绝
|
||||
|
||||
**业务逻辑**:
|
||||
- [x] 3.1.4 审批通过:状态检查 → 金额修正 → 扣款 → 记录流水 → 更新状态
|
||||
- [x] 3.1.5 拒绝:状态检查 → 解冻 → 记录流水 → 更新状态
|
||||
- [x] 3.1.6 使用事务确保原子性
|
||||
|
||||
**验证**:
|
||||
- [x] 状态流转正确
|
||||
- [x] 钱包操作正确
|
||||
- [x] 事务处理正确
|
||||
|
||||
---
|
||||
|
||||
## 阶段 4: Handler 层 (45 分钟)
|
||||
|
||||
### Task 4.1: 创建 Handler
|
||||
|
||||
**文件**: `internal/handler/admin/commission_withdrawal.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 4.1.1 `ListWithdrawalRequests` - GET /api/admin/commission/withdrawal-requests
|
||||
- [x] 4.1.2 `ApproveWithdrawal` - POST /api/admin/commission/withdrawal-requests/:id/approve
|
||||
- [x] 4.1.3 `RejectWithdrawal` - POST /api/admin/commission/withdrawal-requests/:id/reject
|
||||
|
||||
**验证**:
|
||||
- [x] 参数校验正确
|
||||
- [x] 权限检查正确
|
||||
|
||||
---
|
||||
|
||||
### Task 4.2: 路由注册
|
||||
|
||||
**文件**: `internal/routes/commission.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 4.2.1 注册三个 API 路由
|
||||
- [x] 4.2.2 配置权限(需要认证)
|
||||
|
||||
**验证**:
|
||||
- [x] 路由可访问
|
||||
- [x] 权限限制生效
|
||||
|
||||
---
|
||||
|
||||
## 阶段 5: 组件注册与测试 (45 分钟)
|
||||
|
||||
### Task 5.1: Bootstrap 注册
|
||||
|
||||
**实现内容**:
|
||||
- [x] 5.1.1 注册 WalletTransaction Store
|
||||
- [x] 5.1.2 注册 CommissionWithdrawal Service
|
||||
- [x] 5.1.3 注册 CommissionWithdrawal Handler
|
||||
|
||||
---
|
||||
|
||||
### Task 5.2: 测试
|
||||
|
||||
**实现内容**:
|
||||
- [x] 5.2.1 审批通过流程测试
|
||||
- [x] 5.2.2 拒绝流程测试
|
||||
- [x] 5.2.3 并发审批测试
|
||||
- [x] 5.2.4 余额不足测试
|
||||
|
||||
---
|
||||
|
||||
## 完成标准
|
||||
|
||||
- [x] 所有 DTO 定义完成
|
||||
- [x] Store 层方法实现完成
|
||||
- [x] Service 层业务逻辑完成
|
||||
- [x] Handler 层 API 实现完成
|
||||
- [x] 事务处理正确
|
||||
- [x] 编译通过
|
||||
- [x] 审批流程测试通过
|
||||
Reference in New Issue
Block a user