All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 5m46s
- 移除 Model 层:删除 ShopSeriesCommissionTier 模型及相关字段 - 更新 DTO:删除 TierCommissionConfig、TierEntry 类型及相关请求/响应字段 - 删除 Store 层:移除 ShopSeriesCommissionTierStore 及相关查询逻辑 - 简化 Service 层:删除梯度返佣处理逻辑,统计查询移除 tier_bonus 字段 - 数据库迁移:创建 000034_remove_tier_commission 移除相关表和字段 - 更新测试:移除梯度返佣相关测试用例,更新集成测试 - OpenAPI 文档:删除梯度返佣相关 schema 和枚举值 - 归档变更:归档 remove-tier-commission-redundancy 到 archive/2026-01-30- - 同步规范:更新 4 个主 specs,标记废弃功能并添加迁移指引 原因:梯度返佣功能与一次性梯度佣金功能重复,且从未实现实际计算逻辑 迁移:使用一次性佣金的梯度模式 (OneTimeCommissionConfig.type = "tiered") 替代
76 lines
4.8 KiB
Go
76 lines
4.8 KiB
Go
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:一次性佣金)"`
|
||
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" description:"佣金来源 (cost_diff:成本价差, one_time:一次性佣金)"`
|
||
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:"一次性佣金收入(分)"`
|
||
CostDiffPercent int64 `json:"cost_diff_percent" description:"成本价差占比(千分比)"`
|
||
OneTimePercent int64 `json:"one_time_percent" description:"一次性佣金占比(千分比)"`
|
||
TotalCount int64 `json:"total_count" description:"总笔数"`
|
||
CostDiffCount int64 `json:"cost_diff_count" description:"成本价差笔数"`
|
||
OneTimeCount int64 `json:"one_time_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天)"`
|
||
}
|