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,65 @@
|
||||
# Change: 佣金提现设置模块
|
||||
|
||||
## Why
|
||||
|
||||
平台需要配置全局的佣金提现规则:
|
||||
1. 每日提现次数限制
|
||||
2. 最低提现金额
|
||||
3. 提现手续费比率
|
||||
|
||||
配置采用"新建生效"模式,新配置生效后旧配置自动失效,保留历史记录。
|
||||
|
||||
## What Changes
|
||||
|
||||
### 新增 API 接口
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| POST | `/api/admin/commission/withdrawal-settings` | 新增配置 |
|
||||
| GET | `/api/admin/commission/withdrawal-settings` | 配置列表(历史记录) |
|
||||
| GET | `/api/admin/commission/withdrawal-settings/current` | 获取当前生效配置 |
|
||||
|
||||
### 技术实现
|
||||
|
||||
- 新增 Handler:`internal/handler/admin/commission_withdrawal_setting.go`
|
||||
- 新增 Service:`internal/service/commission_withdrawal_setting/service.go`
|
||||
- 新增 DTO:`internal/model/dto/commission_withdrawal_setting_dto.go`
|
||||
- 扩展 Store:`internal/store/postgres/commission_withdrawal_setting_store.go`
|
||||
|
||||
### 业务逻辑
|
||||
|
||||
**新增配置**:
|
||||
1. 验证参数有效性
|
||||
2. 将当前生效配置的 `is_active` 设为 false
|
||||
3. 创建新配置,`is_active` 设为 true
|
||||
4. 记录创建人
|
||||
|
||||
**配置字段**:
|
||||
- `daily_withdrawal_limit`:每日提现次数限制
|
||||
- `min_withdrawal_amount`:最低提现金额(分)
|
||||
- `fee_rate`:手续费比率(基点,100=1%)
|
||||
|
||||
## Impact
|
||||
|
||||
### 影响的规范
|
||||
- **新增 Capability**:`commission-withdrawal-settings`
|
||||
|
||||
### 影响的代码
|
||||
|
||||
**新增文件**(约 200 行):
|
||||
- `internal/handler/admin/commission_withdrawal_setting.go`(~60 行)
|
||||
- `internal/service/commission_withdrawal_setting/service.go`(~100 行)
|
||||
- `internal/model/dto/commission_withdrawal_setting_dto.go`(~40 行)
|
||||
|
||||
### 兼容性
|
||||
- ✅ 向后兼容:新增 API,不影响现有功能
|
||||
|
||||
## Dependencies
|
||||
|
||||
- 依赖提案:`add-commission-model-changes`
|
||||
- 依赖现有模型:`CommissionWithdrawalSetting`
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
1. **单元测试**:配置切换逻辑
|
||||
2. **集成测试**:新建配置→查询生效配置
|
||||
@@ -0,0 +1,101 @@
|
||||
## ADDED Requirements
|
||||
|
||||
### Requirement: 新增提现配置
|
||||
系统 SHALL 提供新增佣金提现配置的接口。
|
||||
|
||||
**接口**:`POST /api/admin/commission/withdrawal-settings`
|
||||
|
||||
**请求参数**:
|
||||
- `daily_withdrawal_limit`:每日提现次数限制(必填)
|
||||
- `min_withdrawal_amount`:最低提现金额,分(必填)
|
||||
- `fee_rate`:手续费比率,基点(必填,100=1%)
|
||||
|
||||
**响应字段**:
|
||||
- 配置详情(id, daily_withdrawal_limit, min_withdrawal_amount, fee_rate)
|
||||
- 状态(is_active)
|
||||
- 创建信息(creator_name, created_at)
|
||||
|
||||
#### Scenario: 创建第一个配置
|
||||
- **WHEN** 系统没有任何提现配置时创建新配置
|
||||
- **THEN** 新配置的 `is_active` 设为 true
|
||||
- **AND** 记录创建人ID
|
||||
|
||||
#### Scenario: 创建新配置替换旧配置
|
||||
- **WHEN** 系统已有生效配置时创建新配置
|
||||
- **THEN** 旧配置的 `is_active` 设为 false
|
||||
- **AND** 新配置的 `is_active` 设为 true
|
||||
- **AND** 使用事务确保原子性
|
||||
|
||||
#### Scenario: 仅平台用户可创建配置
|
||||
- **WHEN** 非平台用户尝试创建配置
|
||||
- **THEN** 返回权限错误
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 查询提现配置列表
|
||||
系统 SHALL 提供查询提现配置历史记录的接口。
|
||||
|
||||
**接口**:`GET /api/admin/commission/withdrawal-settings`
|
||||
|
||||
**请求参数**:
|
||||
- `page`:页码(默认1)
|
||||
- `page_size`:每页数量(默认20)
|
||||
|
||||
**响应字段**:
|
||||
- 配置列表(id, daily_withdrawal_limit, min_withdrawal_amount, fee_rate, is_active)
|
||||
- 创建信息(creator_id, creator_name, created_at)
|
||||
- 分页信息(total, page, page_size)
|
||||
|
||||
#### Scenario: 查询所有配置历史
|
||||
- **WHEN** 请求配置列表
|
||||
- **THEN** 返回所有配置记录(包括已失效的)
|
||||
- **AND** 按创建时间倒序排列
|
||||
|
||||
#### Scenario: 标识当前生效配置
|
||||
- **WHEN** 返回配置列表
|
||||
- **THEN** 当前生效的配置 `is_active=true`
|
||||
- **AND** 历史配置 `is_active=false`
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 获取当前生效配置
|
||||
系统 SHALL 提供获取当前生效提现配置的接口。
|
||||
|
||||
**接口**:`GET /api/admin/commission/withdrawal-settings/current`
|
||||
|
||||
**响应字段**:
|
||||
- 配置详情(id, daily_withdrawal_limit, min_withdrawal_amount, fee_rate)
|
||||
- 状态(is_active=true)
|
||||
- 创建信息(creator_name, created_at)
|
||||
|
||||
#### Scenario: 获取当前配置
|
||||
- **WHEN** 请求当前生效配置
|
||||
- **THEN** 返回 `is_active=true` 的配置
|
||||
|
||||
#### Scenario: 无生效配置时
|
||||
- **WHEN** 系统没有任何提现配置
|
||||
- **THEN** 返回空或默认配置提示
|
||||
|
||||
---
|
||||
|
||||
### Requirement: 提现配置应用规则
|
||||
系统 SHALL 在代理商发起提现时应用当前生效的配置。
|
||||
|
||||
#### Scenario: 应用每日提现次数限制
|
||||
- **WHEN** 代理商今日提现次数达到限制
|
||||
- **THEN** 拒绝新的提现申请
|
||||
- **AND** 返回错误:今日提现次数已达上限
|
||||
|
||||
#### Scenario: 应用最低提现金额
|
||||
- **WHEN** 提现金额低于最低限制
|
||||
- **THEN** 拒绝提现申请
|
||||
- **AND** 返回错误:提现金额不能低于 X 元
|
||||
|
||||
#### Scenario: 应用手续费比率
|
||||
- **WHEN** 创建提现申请
|
||||
- **THEN** 按当前费率计算手续费
|
||||
- **AND** 将费率快照记录到申请记录中
|
||||
|
||||
#### Scenario: 费率快照不受后续修改影响
|
||||
- **WHEN** 提现申请创建后费率配置变更
|
||||
- **THEN** 已创建的申请仍使用申请时的费率
|
||||
@@ -0,0 +1,106 @@
|
||||
# 实现任务清单
|
||||
|
||||
**Change ID**: `add-commission-withdrawal-settings`
|
||||
|
||||
---
|
||||
|
||||
## 阶段 1: DTO 定义 (15 分钟)
|
||||
|
||||
### Task 1.1: 创建 DTO 文件
|
||||
|
||||
**文件**: `internal/model/commission_withdrawal_setting_dto.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 1.1.1 `CreateWithdrawalSettingReq` 请求结构
|
||||
- [x] 1.1.2 `WithdrawalSettingListReq` 分页请求
|
||||
- [x] 1.1.3 `WithdrawalSettingItem` 响应结构
|
||||
|
||||
**验证**:
|
||||
- [x] 验证标签正确(必填项)
|
||||
- [x] JSON 标签正确
|
||||
|
||||
---
|
||||
|
||||
## 阶段 2: Store 层 (30 分钟)
|
||||
|
||||
### Task 2.1: 扩展 CommissionWithdrawalSetting Store
|
||||
|
||||
**文件**: `internal/store/postgres/commission_withdrawal_setting_store.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 2.1.1 `Create(setting)` - 创建配置
|
||||
- [x] 2.1.2 `List(req)` - 分页查询(按创建时间倒序)
|
||||
- [x] 2.1.3 `GetCurrent()` - 获取当前生效配置(is_active=true)
|
||||
- [x] 2.1.4 `DeactivateCurrent()` - 将当前配置设为失效
|
||||
|
||||
**验证**:
|
||||
- [x] 查询逻辑正确
|
||||
- [x] 关联创建人信息
|
||||
|
||||
---
|
||||
|
||||
## 阶段 3: Service 层 (45 分钟)
|
||||
|
||||
### Task 3.1: 创建 Service
|
||||
|
||||
**文件**: `internal/service/commission_withdrawal_setting/service.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 3.1.1 `Create(ctx, req)` - 新增配置
|
||||
- [x] 3.1.2 `List(ctx, req)` - 查询配置列表
|
||||
- [x] 3.1.3 `GetCurrent(ctx)` - 获取当前生效配置
|
||||
|
||||
**业务逻辑**:
|
||||
- [x] 3.1.4 新增时先失效旧配置,再创建新配置(事务)
|
||||
|
||||
**验证**:
|
||||
- [x] 配置切换逻辑正确
|
||||
- [x] 权限检查(仅平台用户)
|
||||
|
||||
---
|
||||
|
||||
## 阶段 4: Handler 层 (30 分钟)
|
||||
|
||||
### Task 4.1: 创建 Handler
|
||||
|
||||
**文件**: `internal/handler/admin/commission_withdrawal_setting.go`
|
||||
|
||||
**实现内容**:
|
||||
- [x] 4.1.1 `CreateWithdrawalSetting` - POST /api/admin/commission/withdrawal-settings
|
||||
- [x] 4.1.2 `ListWithdrawalSettings` - GET /api/admin/commission/withdrawal-settings
|
||||
- [x] 4.1.3 `GetCurrentWithdrawalSetting` - GET /api/admin/commission/withdrawal-settings/current
|
||||
|
||||
**验证**:
|
||||
- [x] 参数校验正确
|
||||
- [x] 响应格式正确
|
||||
|
||||
---
|
||||
|
||||
### Task 4.2: 路由注册
|
||||
|
||||
**实现内容**:
|
||||
- [x] 4.2.1 注册三个 API 路由
|
||||
- [x] 4.2.2 配置权限(仅平台用户可新增)
|
||||
|
||||
---
|
||||
|
||||
## 阶段 5: 测试 (30 分钟)
|
||||
|
||||
### Task 5.1: 功能测试
|
||||
|
||||
**实现内容**:
|
||||
- [x] 5.1.1 新增配置测试
|
||||
- [x] 5.1.2 配置切换测试(旧配置自动失效)
|
||||
- [x] 5.1.3 获取当前配置测试
|
||||
|
||||
---
|
||||
|
||||
## 完成标准
|
||||
|
||||
- [x] 所有 DTO 定义完成
|
||||
- [x] Store 层方法实现完成
|
||||
- [x] Service 层业务逻辑完成
|
||||
- [x] Handler 层 API 实现完成
|
||||
- [x] 配置切换逻辑正确
|
||||
- [x] 编译通过
|
||||
- [x] 功能测试通过
|
||||
Reference in New Issue
Block a user