csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects 1 Releases Wiki Activity

feat: 实现一次性佣金功能
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 5m41s
Details

Browse Source 
- 新增佣金计算服务，支持一次性佣金和返佣计算
- 新增 ShopSeriesOneTimeCommissionTier 模型和存储层
- 新增两个数据库迁移：一次性佣金表和订单佣金字段
- 更新 Commission 模型，新增佣金来源和关联字段
- 更新 CommissionRecord 存储层，支持一次性佣金查询
- 更新 MyCommission 服务，集成一次性佣金计算逻辑
- 更新 ShopCommission 服务，支持一次性佣金统计
- 新增佣金计算异步任务处理器
- 更新 API 路由，新增一次性佣金相关端点
- 归档 OpenSpec 变更文档，同步规范到主规范库
This commit is contained in:
huang
2026-01-29 09:36:12 +08:00
parent dfcf16f548
commit e87513541b
33 changed files with 1668 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
internal/model/dto/commission.go Normal file
View File

@@ -0,0 +1,78 @@
package dto
// CommissionRecordResponse 佣金记录响应
type CommissionRecordResponse struct {
ID uint `json:"id" description:"佣金记录ID"`
ShopID uint `json:"shop_id" description:"店铺ID"`
ShopName string `json:"shop_name" description:"店铺名称"`
OrderID uint `json:"order_id" description:"订单ID"`
OrderNo string `json:"order_no" description:"订单号"`
IotCardID *uint `json:"iot_card_id" description:"关联卡ID"`
IotCardICCID string `json:"iot_card_iccid" description:"卡ICCID"`
DeviceID *uint `json:"device_id" description:"关联设备ID"`
DeviceNo string `json:"device_no" description:"设备号"`
CommissionSource string `json:"commission_source" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金, tier_bonus:梯度奖励)"`
Amount int64 `json:"amount" description:"佣金金额（分）"`
BalanceAfter int64 `json:"balance_after" description:"入账后钱包余额（分）"`
Status int `json:"status" description:"状态 (1:已入账, 2:已失效)"`
ReleasedAt string `json:"released_at" description:"入账时间"`
Remark string `json:"remark" description:"备注"`
CreatedAt string `json:"created_at" description:"创建时间"`
}
// CommissionRecordListRequest 佣金记录列表请求
type CommissionRecordListRequest struct {
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码"`
PageSize int `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页数量"`
ShopID *uint `json:"shop_id" query:"shop_id" validate:"omitempty" description:"店铺ID"`
CommissionSource *string `json:"commission_source" query:"commission_source" validate:"omitempty,oneof=cost_diff one_time tier_bonus" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金, tier_bonus:梯度奖励)"`
StartTime *string `json:"start_time" query:"start_time" validate:"omitempty" description:"开始时间"`
EndTime *string `json:"end_time" query:"end_time" validate:"omitempty" description:"结束时间"`
Status *int `json:"status" query:"status" validate:"omitempty,oneof=1 2" description:"状态 (1:已入账, 2:已失效)"`
}
// CommissionRecordPageResult 佣金记录分页结果
type CommissionRecordPageResult struct {
List []*CommissionRecordResponse `json:"list" description:"佣金记录列表"`
Total int64 `json:"total" description:"总数"`
Page int `json:"page" description:"当前页"`
PageSize int `json:"page_size" description:"每页数量"`
TotalPages int `json:"total_pages" description:"总页数"`
}
// CommissionStatsResponse 佣金统计响应
type CommissionStatsResponse struct {
TotalAmount int64 `json:"total_amount" description:"总收入（分）"`
CostDiffAmount int64 `json:"cost_diff_amount" description:"成本价差收入（分）"`
OneTimeAmount int64 `json:"one_time_amount" description:"一次性佣金收入（分）"`
TierBonusAmount int64 `json:"tier_bonus_amount" description:"梯度奖励收入（分）"`
CostDiffPercent int64 `json:"cost_diff_percent" description:"成本价差占比（千分比）"`
OneTimePercent int64 `json:"one_time_percent" description:"一次性佣金占比（千分比）"`
TierBonusPercent int64 `json:"tier_bonus_percent" description:"梯度奖励占比（千分比）"`
TotalCount int64 `json:"total_count" description:"总笔数"`
CostDiffCount int64 `json:"cost_diff_count" description:"成本价差笔数"`
OneTimeCount int64 `json:"one_time_count" description:"一次性佣金笔数"`
TierBonusCount int64 `json:"tier_bonus_count" description:"梯度奖励笔数"`
}
// DailyCommissionStatsResponse 每日佣金统计响应
type DailyCommissionStatsResponse struct {
Date string `json:"date" description:"日期（YYYY-MM-DD）"`
TotalAmount int64 `json:"total_amount" description:"当日总收入（分）"`
TotalCount int64 `json:"total_count" description:"当日总笔数"`
}
// CommissionStatsRequest 佣金统计请求
type CommissionStatsRequest struct {
ShopID *uint `json:"shop_id" query:"shop_id" validate:"omitempty" description:"店铺ID"`
StartTime *string `json:"start_time" query:"start_time" validate:"omitempty" description:"开始时间"`
EndTime *string `json:"end_time" query:"end_time" validate:"omitempty" description:"结束时间"`
}
// DailyCommissionStatsRequest 每日佣金统计请求
type DailyCommissionStatsRequest struct {
ShopID *uint `json:"shop_id" query:"shop_id" validate:"omitempty" description:"店铺ID"`
StartDate *string `json:"start_date" query:"start_date" validate:"omitempty" description:"开始日期（YYYY-MM-DD）"`
EndDate *string `json:"end_date" query:"end_date" validate:"omitempty" description:"结束日期（YYYY-MM-DD）"`
Days *int `json:"days" query:"days" validate:"omitempty,min=1,max=365" minimum:"1" maximum:"365" description:"查询天数（默认30天）"`
}

28
internal/model/dto/my_commission_dto.go
View File

@@ -39,23 +39,23 @@ type MyWithdrawalListReq struct {
}
type MyCommissionRecordListReq struct {
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码"`
PageSize int `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页数量"`
CommissionType *string `json:"commission_type" query:"commission_type" description:"佣金类型"`
ICCID string `json:"iccid" query:"iccid" description:"ICCID（模糊查询）"`
DeviceNo string `json:"device_no" query:"device_no" description:"设备号（模糊查询）"`
OrderNo string `json:"order_no" query:"order_no" description:"订单号（模糊查询）"`
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码"`
PageSize int `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页数量"`
CommissionSource *string `json:"commission_source" query:"commission_source" validate:"omitempty,oneof=cost_diff one_time tier_bonus" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金, tier_bonus:梯度奖励)"`
ICCID string `json:"iccid" query:"iccid" description:"ICCID（模糊查询）"`
DeviceNo string `json:"device_no" query:"device_no" description:"设备号（模糊查询）"`
OrderNo string `json:"order_no" query:"order_no" description:"订单号（模糊查询）"`
}
type MyCommissionRecordItem struct {
ID uint `json:"id" description:"佣金记录ID"`
ShopID uint `json:"shop_id" description:"店铺ID"`
OrderID uint `json:"order_id" description:"订单ID"`
CommissionType string `json:"commission_type" description:"佣金类型 (one_time:一次性, long_term:长期)"`
Amount int64 `json:"amount" description:"佣金金额（分）"`
Status int `json:"status" description:"状态 (1:已冻结, 2:解冻中, 3:已发放, 4:已失效)"`
StatusName string `json:"status_name" description:"状态名称"`
CreatedAt string `json:"created_at" description:"创建时间"`
ID uint `json:"id" description:"佣金记录ID"`
ShopID uint `json:"shop_id" description:"店铺ID"`
OrderID uint `json:"order_id" description:"订单ID"`
CommissionSource string `json:"commission_source" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金, tier_bonus:梯度奖励)"`
Amount int64 `json:"amount" description:"佣金金额（分）"`
Status int `json:"status" description:"状态 (1:已入账, 2:已失效)"`
StatusName string `json:"status_name" description:"状态名称"`
CreatedAt string `json:"created_at" description:"创建时间"`
}
type MyCommissionRecordPageResult struct {

38
internal/model/dto/shop_commission_dto.go
View File

@@ -93,29 +93,29 @@ type ShopWithdrawalRequestPageResult struct {
// ShopCommissionRecordListReq 代理商佣金明细查询请求
type ShopCommissionRecordListReq struct {
ShopID uint `json:"-" params:"shop_id" path:"shop_id" validate:"required" description:"店铺ID"`
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码（默认1）"`
PageSize int `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页数量（默认20，最大100）"`
CommissionType string `json:"commission_type" query:"commission_type" validate:"omitempty,oneof=one_time long_term" description:"佣金类型 (one_time:一次性, long_term:长期)"`
ICCID string `json:"iccid" query:"iccid" validate:"omitempty,max=50" maxLength:"50" description:"ICCID（模糊查询）"`
DeviceNo string `json:"device_no" query:"device_no" validate:"omitempty,max=50" maxLength:"50" description:"设备号（模糊查询）"`
OrderNo string `json:"order_no" query:"order_no" validate:"omitempty,max=50" maxLength:"50" description:"订单号（模糊查询）"`
ShopID uint `json:"-" params:"shop_id" path:"shop_id" validate:"required" description:"店铺ID"`
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码（默认1）"`
PageSize int `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页数量（默认20，最大100）"`
CommissionSource string `json:"commission_source" query:"commission_source" validate:"omitempty,oneof=cost_diff one_time tier_bonus" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金, tier_bonus:梯度奖励)"`
ICCID string `json:"iccid" query:"iccid" validate:"omitempty,max=50" maxLength:"50" description:"ICCID（模糊查询）"`
DeviceNo string `json:"device_no" query:"device_no" validate:"omitempty,max=50" maxLength:"50" description:"设备号（模糊查询）"`
OrderNo string `json:"order_no" query:"order_no" validate:"omitempty,max=50" maxLength:"50" description:"订单号（模糊查询）"`
}
// ShopCommissionRecordItem 代理商佣金明细项
type ShopCommissionRecordItem struct {
ID uint `json:"id" description:"佣金记录ID"`
Amount int64 `json:"amount" description:"佣金金额（分）"`
BalanceAfter int64 `json:"balance_after" description:"入账后佣金余额（分）"`
CommissionType string `json:"commission_type" description:"佣金类型 (one_time:一次性, long_term:长期)"`
Status int `json:"status" description:"状态 (1:已冻结, 2:解冻中, 3:已发放, 4:已失效)"`
StatusName string `json:"status_name" description:"状态名称"`
OrderID uint `json:"order_id" description:"订单ID"`
OrderNo string `json:"order_no" description:"订单号"`
DeviceNo string `json:"device_no,omitempty" description:"设备号"`
ICCID string `json:"iccid,omitempty" description:"ICCID"`
OrderCreatedAt string `json:"order_created_at" description:"订单创建时间"`
CreatedAt string `json:"created_at" description:"佣金入账时间"`
ID uint `json:"id" description:"佣金记录ID"`
Amount int64 `json:"amount" description:"佣金金额（分）"`
BalanceAfter int64 `json:"balance_after" description:"入账后佣金余额（分）"`
CommissionSource string `json:"commission_source" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金, tier_bonus:梯度奖励)"`
Status int `json:"status" description:"状态 (1:已入账, 2:已失效)"`
StatusName string `json:"status_name" description:"状态名称"`
OrderID uint `json:"order_id" description:"订单ID"`
OrderNo string `json:"order_no" description:"订单号"`
DeviceNo string `json:"device_no,omitempty" description:"设备号"`
ICCID string `json:"iccid,omitempty" description:"ICCID"`
OrderCreatedAt string `json:"order_created_at" description:"订单创建时间"`
CreatedAt string `json:"created_at" description:"佣金入账时间"`
}
// ShopCommissionRecordPageResult 代理商佣金明细分页响应

64
internal/model/dto/shop_series_allocation.go
View File

@@ -20,20 +20,42 @@ type TierEntry struct {
Value int64 `json:"value" validate:"required,min=1" required:"true" minimum:"1" description:"达标后返佣值（分或千分比）"`
}
// OneTimeCommissionConfig 一次性佣金配置
type OneTimeCommissionConfig struct {
Type string `json:"type" validate:"required,oneof=fixed tiered" required:"true" description:"一次性佣金类型 (fixed:固定, tiered:梯度)"`
Trigger string `json:"trigger" validate:"required,oneof=single_recharge accumulated_recharge" required:"true" description:"触发条件 (single_recharge:单次充值, accumulated_recharge:累计充值)"`
Threshold int64 `json:"threshold" validate:"required,min=1" required:"true" minimum:"1" description:"最低阈值（分）"`
Mode string `json:"mode" validate:"omitempty,oneof=fixed percent" description:"返佣模式 (fixed:固定金额, percent:百分比) - 固定类型时必填"`
Value int64 `json:"value" validate:"omitempty,min=1" minimum:"1" description:"佣金金额（分）或比例（千分比）- 固定类型时必填"`
Tiers []OneTimeCommissionTierEntry `json:"tiers" validate:"omitempty,dive" description:"梯度档位列表 - 梯度类型时必填"`
}
// OneTimeCommissionTierEntry 一次性佣金梯度档位条目
type OneTimeCommissionTierEntry struct {
TierType string `json:"tier_type" validate:"required,oneof=sales_count sales_amount" required:"true" description:"梯度类型 (sales_count:销量, sales_amount:销售额)"`
Threshold int64 `json:"threshold" validate:"required,min=1" required:"true" minimum:"1" description:"梯度阈值（销量或销售额分）"`
Mode string `json:"mode" validate:"required,oneof=fixed percent" required:"true" description:"返佣模式 (fixed:固定金额, percent:百分比)"`
Value int64 `json:"value" validate:"required,min=1" required:"true" minimum:"1" description:"返佣值（分或千分比）"`
}
// CreateShopSeriesAllocationRequest 创建套餐系列分配请求
type CreateShopSeriesAllocationRequest struct {
ShopID uint `json:"shop_id" validate:"required" required:"true" description:"被分配的店铺ID"`
SeriesID uint `json:"series_id" validate:"required" required:"true" description:"套餐系列ID"`
BaseCommission BaseCommissionConfig `json:"base_commission" validate:"required" required:"true" description:"基础返佣配置"`
EnableTierCommission bool `json:"enable_tier_commission" description:"是否启用梯度返佣"`
TierConfig *TierCommissionConfig `json:"tier_config" validate:"omitempty" description:"梯度返佣配置（启用梯度返佣时必填）"`
ShopID uint `json:"shop_id" validate:"required" required:"true" description:"被分配的店铺ID"`
SeriesID uint `json:"series_id" validate:"required" required:"true" description:"套餐系列ID"`
BaseCommission BaseCommissionConfig `json:"base_commission" validate:"required" required:"true" description:"基础返佣配置"`
EnableTierCommission bool `json:"enable_tier_commission" description:"是否启用梯度返佣"`
TierConfig *TierCommissionConfig `json:"tier_config" validate:"omitempty" description:"梯度返佣配置（启用梯度返佣时必填）"`
EnableOneTimeCommission bool `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
OneTimeCommissionConfig *OneTimeCommissionConfig `json:"one_time_commission_config" validate:"omitempty" description:"一次性佣金配置（启用一次性佣金时必填）"`
}
// UpdateShopSeriesAllocationRequest 更新套餐系列分配请求
type UpdateShopSeriesAllocationRequest struct {
BaseCommission *BaseCommissionConfig `json:"base_commission" validate:"omitempty" description:"基础返佣配置"`
EnableTierCommission *bool `json:"enable_tier_commission" description:"是否启用梯度返佣"`
TierConfig *TierCommissionConfig `json:"tier_config" validate:"omitempty" description:"梯度返佣配置"`
BaseCommission *BaseCommissionConfig `json:"base_commission" validate:"omitempty" description:"基础返佣配置"`
EnableTierCommission *bool `json:"enable_tier_commission" description:"是否启用梯度返佣"`
TierConfig *TierCommissionConfig `json:"tier_config" validate:"omitempty" description:"梯度返佣配置"`
EnableOneTimeCommission *bool `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
OneTimeCommissionConfig *OneTimeCommissionConfig `json:"one_time_commission_config" validate:"omitempty" description:"一次性佣金配置"`
}
// ShopSeriesAllocationListRequest 套餐系列分配列表请求
@@ -52,18 +74,20 @@ type UpdateShopSeriesAllocationStatusRequest struct {
// ShopSeriesAllocationResponse 套餐系列分配响应
type ShopSeriesAllocationResponse struct {
ID uint `json:"id" description:"分配ID"`
ShopID uint `json:"shop_id" description:"被分配的店铺ID"`
ShopName string `json:"shop_name" description:"被分配的店铺名称"`
SeriesID uint `json:"series_id" description:"套餐系列ID"`
SeriesName string `json:"series_name" description:"套餐系列名称"`
AllocatorShopID uint `json:"allocator_shop_id" description:"分配者店铺ID"`
AllocatorShopName string `json:"allocator_shop_name" description:"分配者店铺名称"`
BaseCommission BaseCommissionConfig `json:"base_commission" description:"基础返佣配置"`
EnableTierCommission bool `json:"enable_tier_commission" description:"是否启用梯度返佣"`
Status int `json:"status" description:"状态 (1:启用, 2:禁用)"`
CreatedAt string `json:"created_at" description:"创建时间"`
UpdatedAt string `json:"updated_at" description:"更新时间"`
ID uint `json:"id" description:"分配ID"`
ShopID uint `json:"shop_id" description:"被分配的店铺ID"`
ShopName string `json:"shop_name" description:"被分配的店铺名称"`
SeriesID uint `json:"series_id" description:"套餐系列ID"`
SeriesName string `json:"series_name" description:"套餐系列名称"`
AllocatorShopID uint `json:"allocator_shop_id" description:"分配者店铺ID"`
AllocatorShopName string `json:"allocator_shop_name" description:"分配者店铺名称"`
BaseCommission BaseCommissionConfig `json:"base_commission" description:"基础返佣配置"`
EnableTierCommission bool `json:"enable_tier_commission" description:"是否启用梯度返佣"`
EnableOneTimeCommission bool `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
OneTimeCommissionConfig *OneTimeCommissionConfig `json:"one_time_commission_config,omitempty" description:"一次性佣金配置"`
Status int `json:"status" description:"状态 (1:启用, 2:禁用)"`
CreatedAt string `json:"created_at" description:"创建时间"`
UpdatedAt string `json:"updated_at" description:"更新时间"`
}
// ShopSeriesAllocationPageResult 套餐系列分配分页结果