huang
18daeae65a
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m17s
## 变更概述 将统一钱包系统拆分为代理钱包和卡钱包两个独立系统，实现数据表和代码层面的完全隔离。 ## 数据库变更 - 新增 6 张表：tb_agent_wallet、tb_agent_wallet_transaction、tb_agent_recharge_record、tb_card_wallet、tb_card_wallet_transaction、tb_card_recharge_record - 删除 3 张旧表：tb_wallet、tb_wallet_transaction、tb_recharge_record - 代理钱包：按 (shop_id, wallet_type) 唯一标识，支持主钱包和分佣钱包 - 卡钱包：按 (resource_type, resource_id) 唯一标识，支持物联网卡和设备 ## 代码变更 - Model 层：新增 AgentWallet、AgentWalletTransaction、AgentRechargeRecord、CardWallet、CardWalletTransaction、CardRechargeRecord 模型 - Store 层：新增 6 个独立 Store，支持事务、乐观锁、Redis 缓存 - Service 层：重构 commission_calculation、commission_withdrawal、order、recharge 等 8 个服务 - Bootstrap 层：更新 Store 和 Service 依赖注入 - 常量层：按钱包类型重新组织常量和 Redis Key 生成函数 ## 技术特性 - 乐观锁：使用 version 字段防止并发冲突 - 多租户：支持 shop_id_tag 和 enterprise_id_tag 过滤 - 事务管理：所有余额变动使用事务保证 ACID - 缓存策略：Cache-Aside 模式，余额变动后删除缓存 ## 业务影响 - 代理钱包和卡钱包业务完全隔离，互不影响 - 为独立监控、优化、扩展打下基础 - 提升代理钱包的稳定性和独立性 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
158 lines
10 KiB
Go
158 lines
10 KiB
Go
package dto
|
||
|
||
import "time"
|
||
|
||
type ListStandaloneIotCardRequest 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" validate:"omitempty,min=1,max=4" minimum:"1" maximum:"4" description:"状态 (1:在库, 2:已分销, 3:已激活, 4:已停用)"`
|
||
CarrierID *uint `json:"carrier_id" query:"carrier_id" description:"运营商ID"`
|
||
ShopID *uint `json:"shop_id" query:"shop_id" description:"分销商ID"`
|
||
SeriesID *uint `json:"series_id" query:"series_id" description:"套餐系列ID"`
|
||
ICCID string `json:"iccid" query:"iccid" validate:"omitempty,max=20" maxLength:"20" description:"ICCID(模糊查询)"`
|
||
MSISDN string `json:"msisdn" query:"msisdn" validate:"omitempty,max=20" maxLength:"20" description:"卡接入号(模糊查询)"`
|
||
BatchNo string `json:"batch_no" query:"batch_no" validate:"omitempty,max=100" maxLength:"100" description:"批次号"`
|
||
PackageID *uint `json:"package_id" query:"package_id" description:"套餐ID"`
|
||
IsDistributed *bool `json:"is_distributed" query:"is_distributed" description:"是否已分销 (true:已分销, false:未分销)"`
|
||
IsReplaced *bool `json:"is_replaced" query:"is_replaced" description:"是否有换卡记录 (true:有换卡记录, false:无换卡记录)"`
|
||
ICCIDStart string `json:"iccid_start" query:"iccid_start" validate:"omitempty,max=20" maxLength:"20" description:"ICCID起始号"`
|
||
ICCIDEnd string `json:"iccid_end" query:"iccid_end" validate:"omitempty,max=20" maxLength:"20" description:"ICCID结束号"`
|
||
}
|
||
|
||
type StandaloneIotCardResponse struct {
|
||
ID uint `json:"id" description:"卡ID"`
|
||
ICCID string `json:"iccid" description:"ICCID"`
|
||
CardCategory string `json:"card_category" description:"卡业务类型 (normal:普通卡, industry:行业卡)"`
|
||
CarrierID uint `json:"carrier_id" description:"运营商ID"`
|
||
CarrierType string `json:"carrier_type,omitempty" description:"运营商类型 (CMCC:中国移动, CUCC:中国联通, CTCC:中国电信, CBN:中国广电)"`
|
||
CarrierName string `json:"carrier_name,omitempty" description:"运营商名称"`
|
||
IMSI string `json:"imsi,omitempty" description:"IMSI"`
|
||
MSISDN string `json:"msisdn,omitempty" description:"卡接入号"`
|
||
BatchNo string `json:"batch_no,omitempty" description:"批次号"`
|
||
Supplier string `json:"supplier,omitempty" description:"供应商"`
|
||
CostPrice int64 `json:"cost_price" description:"成本价(分)"`
|
||
DistributePrice int64 `json:"distribute_price" description:"分销价(分)"`
|
||
Status int `json:"status" description:"状态 (1:在库, 2:已分销, 3:已激活, 4:已停用)"`
|
||
ShopID *uint `json:"shop_id,omitempty" description:"店铺ID"`
|
||
ShopName string `json:"shop_name,omitempty" description:"店铺名称"`
|
||
ActivatedAt *time.Time `json:"activated_at,omitempty" description:"激活时间"`
|
||
ActivationStatus int `json:"activation_status" description:"激活状态 (0:未激活, 1:已激活)"`
|
||
RealNameStatus int `json:"real_name_status" description:"实名状态 (0:未实名, 1:已实名)"`
|
||
NetworkStatus int `json:"network_status" description:"网络状态 (0:停机, 1:开机)"`
|
||
DataUsageMB int64 `json:"data_usage_mb" description:"累计流量使用(MB)"`
|
||
CurrentMonthUsageMB float64 `json:"current_month_usage_mb" description:"本月已用流量(MB)"`
|
||
CurrentMonthStartDate *time.Time `json:"current_month_start_date,omitempty" description:"本月开始日期"`
|
||
LastMonthTotalMB float64 `json:"last_month_total_mb" description:"上月流量总量(MB)"`
|
||
LastDataCheckAt *time.Time `json:"last_data_check_at,omitempty" description:"最后流量检查时间"`
|
||
LastRealNameCheckAt *time.Time `json:"last_real_name_check_at,omitempty" description:"最后实名检查时间"`
|
||
EnablePolling bool `json:"enable_polling" description:"是否参与轮询"`
|
||
SeriesID *uint `json:"series_id,omitempty" description:"套餐系列ID"`
|
||
SeriesName string `json:"series_name,omitempty" description:"套餐系列名称"`
|
||
FirstCommissionPaid bool `json:"first_commission_paid" description:"一次性佣金是否已发放"`
|
||
AccumulatedRecharge int64 `json:"accumulated_recharge" description:"累计充值金额(分)"`
|
||
CreatedAt time.Time `json:"created_at" description:"创建时间"`
|
||
UpdatedAt time.Time `json:"updated_at" description:"更新时间"`
|
||
}
|
||
|
||
type ListStandaloneIotCardResponse struct {
|
||
List []*StandaloneIotCardResponse `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:"总页数"`
|
||
}
|
||
|
||
type ImportIotCardRequest struct {
|
||
CarrierID uint `json:"carrier_id" validate:"required,min=1" required:"true" minimum:"1" description:"运营商ID"`
|
||
BatchNo string `json:"batch_no" validate:"omitempty,max=100" maxLength:"100" description:"批次号"`
|
||
FileKey string `json:"file_key" validate:"required,min=1,max=500" required:"true" minLength:"1" maxLength:"500" description:"对象存储文件路径（通过 /storage/upload-url 获取）"`
|
||
}
|
||
|
||
type ImportIotCardResponse struct {
|
||
TaskID uint `json:"task_id" description:"导入任务ID"`
|
||
TaskNo string `json:"task_no" description:"任务编号"`
|
||
Message string `json:"message" description:"提示信息"`
|
||
}
|
||
|
||
type ListImportTaskRequest 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" validate:"omitempty,min=1,max=4" minimum:"1" maximum:"4" description:"任务状态 (1:待处理, 2:处理中, 3:已完成, 4:失败)"`
|
||
CarrierID *uint `json:"carrier_id" query:"carrier_id" description:"运营商ID"`
|
||
BatchNo string `json:"batch_no" query:"batch_no" validate:"omitempty,max=100" maxLength:"100" description:"批次号(模糊查询)"`
|
||
StartTime *time.Time `json:"start_time" query:"start_time" description:"创建时间起始"`
|
||
EndTime *time.Time `json:"end_time" query:"end_time" description:"创建时间结束"`
|
||
}
|
||
|
||
type ImportTaskResponse struct {
|
||
ID uint `json:"id" description:"任务ID"`
|
||
TaskNo string `json:"task_no" description:"任务编号"`
|
||
Status int `json:"status" description:"任务状态 (1:待处理, 2:处理中, 3:已完成, 4:失败)"`
|
||
StatusText string `json:"status_text" description:"任务状态文本"`
|
||
CarrierID uint `json:"carrier_id" description:"运营商ID"`
|
||
CarrierType string `json:"carrier_type,omitempty" description:"运营商类型 (CMCC:中国移动, CUCC:中国联通, CTCC:中国电信, CBN:中国广电)"`
|
||
CarrierName string `json:"carrier_name,omitempty" description:"运营商名称"`
|
||
BatchNo string `json:"batch_no,omitempty" description:"批次号"`
|
||
FileName string `json:"file_name,omitempty" description:"文件名"`
|
||
TotalCount int `json:"total_count" description:"总数"`
|
||
SuccessCount int `json:"success_count" description:"成功数"`
|
||
SkipCount int `json:"skip_count" description:"跳过数"`
|
||
FailCount int `json:"fail_count" description:"失败数"`
|
||
StartedAt *time.Time `json:"started_at,omitempty" description:"开始处理时间"`
|
||
CompletedAt *time.Time `json:"completed_at,omitempty" description:"完成时间"`
|
||
ErrorMessage string `json:"error_message,omitempty" description:"错误信息"`
|
||
CreatedAt time.Time `json:"created_at" description:"创建时间"`
|
||
}
|
||
|
||
type ListImportTaskResponse struct {
|
||
List []*ImportTaskResponse `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:"总页数"`
|
||
}
|
||
|
||
type ImportResultItemDTO struct {
|
||
Line int `json:"line" description:"行号"`
|
||
ICCID string `json:"iccid" description:"ICCID"`
|
||
MSISDN string `json:"msisdn,omitempty" description:"接入号"`
|
||
Reason string `json:"reason" description:"原因"`
|
||
}
|
||
|
||
type ImportTaskDetailResponse struct {
|
||
ImportTaskResponse
|
||
SkippedItems []*ImportResultItemDTO `json:"skipped_items" description:"跳过记录详情"`
|
||
FailedItems []*ImportResultItemDTO `json:"failed_items" description:"失败记录详情"`
|
||
}
|
||
|
||
type GetImportTaskRequest struct {
|
||
ID uint `path:"id" description:"任务ID" required:"true"`
|
||
}
|
||
|
||
type GetIotCardByICCIDRequest struct {
|
||
ICCID string `path:"iccid" description:"ICCID" required:"true"`
|
||
}
|
||
|
||
type IotCardDetailResponse struct {
|
||
StandaloneIotCardResponse
|
||
}
|
||
|
||
// BatchSetCardSeriesBindngRequest 批量设置卡的套餐系列绑定请求
|
||
type BatchSetCardSeriesBindngRequest struct {
|
||
ICCIDs []string `json:"iccids" validate:"required,min=1,max=500,dive,required" required:"true" minItems:"1" maxItems:"500" description:"ICCID列表"`
|
||
SeriesID uint `json:"series_id" validate:"required,min=0" required:"true" minimum:"0" description:"套餐系列ID（0表示清除关联）"`
|
||
}
|
||
|
||
// CardSeriesBindngFailedItem 卡系列绑定失败项
|
||
type CardSeriesBindngFailedItem struct {
|
||
ICCID string `json:"iccid" description:"ICCID"`
|
||
Reason string `json:"reason" description:"失败原因"`
|
||
}
|
||
|
||
// BatchSetCardSeriesBindngResponse 批量设置卡的套餐系列绑定响应
|
||
type BatchSetCardSeriesBindngResponse struct {
|
||
SuccessCount int `json:"success_count" description:"成功数量"`
|
||
FailCount int `json:"fail_count" description:"失败数量"`
|
||
FailedItems []CardSeriesBindngFailedItem `json:"failed_items" description:"失败详情列表"`
|
||
}
|