huang
91c9bbfeb8
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 依赖问题
67 lines
4.2 KiB
Go
67 lines
4.2 KiB
Go
package model
|
||
|
||
type MyCommissionSummaryResp struct {
|
||
ShopID uint `json:"shop_id" description:"店铺ID"`
|
||
ShopName string `json:"shop_name" description:"店铺名称"`
|
||
TotalCommission int64 `json:"total_commission" description:"累计佣金（分）"`
|
||
WithdrawnCommission int64 `json:"withdrawn_commission" description:"已提现佣金（分）"`
|
||
UnwithdrawCommission int64 `json:"unwithdraw_commission" description:"未提现佣金（分）"`
|
||
FrozenCommission int64 `json:"frozen_commission" description:"冻结佣金（分）"`
|
||
WithdrawingCommission int64 `json:"withdrawing_commission" description:"提现中佣金（分）"`
|
||
AvailableCommission int64 `json:"available_commission" description:"可提现佣金（分）"`
|
||
}
|
||
|
||
type CreateMyWithdrawalReq struct {
|
||
Amount int64 `json:"amount" validate:"required,min=1" required:"true" minimum:"1" description:"提现金额（分）"`
|
||
WithdrawalMethod string `json:"withdrawal_method" validate:"required,oneof=alipay" required:"true" enum:"alipay" description:"收款类型"`
|
||
AccountName string `json:"account_name" validate:"required,max=50" required:"true" maximum:"50" description:"收款人姓名"`
|
||
AccountNumber string `json:"account_number" validate:"required,max=100" required:"true" maximum:"100" description:"收款账号"`
|
||
}
|
||
|
||
type CreateMyWithdrawalResp struct {
|
||
ID uint `json:"id" description:"提现申请ID"`
|
||
WithdrawalNo string `json:"withdrawal_no" description:"提现单号"`
|
||
Amount int64 `json:"amount" description:"提现金额（分）"`
|
||
FeeRate int64 `json:"fee_rate" description:"手续费比率（基点）"`
|
||
Fee int64 `json:"fee" description:"手续费（分）"`
|
||
ActualAmount int64 `json:"actual_amount" description:"实际到账金额（分）"`
|
||
Status int `json:"status" description:"状态"`
|
||
StatusName string `json:"status_name" description:"状态名称"`
|
||
CreatedAt string `json:"created_at" description:"申请时间"`
|
||
}
|
||
|
||
type MyWithdrawalListReq 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:"每页数量"`
|
||
Status *int `json:"status" query:"status" description:"状态（1=待审批, 2=已通过, 3=已拒绝）"`
|
||
StartTime string `json:"start_time" query:"start_time" description:"申请开始时间"`
|
||
EndTime string `json:"end_time" query:"end_time" description:"申请结束时间"`
|
||
}
|
||
|
||
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:"订单号（模糊查询）"`
|
||
}
|
||
|
||
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:"创建时间"`
|
||
}
|
||
|
||
type MyCommissionRecordPageResult struct {
|
||
Items []MyCommissionRecordItem `json:"items" description:"佣金记录列表"`
|
||
Total int64 `json:"total" description:"总记录数"`
|
||
Page int `json:"page" description:"当前页码"`
|
||
Size int `json:"size" description:"每页数量"`
|
||
}
|