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

废除激活时间
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m57s
Details

Browse Source
This commit is contained in:
huang
2026-04-29 12:04:23 +08:00
parent 74c7b27327
commit 6b3b33b2f0
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/model/dto/asset_dto.go
View File

@@ -15,7 +15,7 @@ type AssetResolveResponse struct {
ShopName string `json:"shop_name,omitempty" description:"所属店铺名称"` ShopName string `json:"shop_name,omitempty" description:"所属店铺名称"`
SeriesID *uint `json:"series_id,omitempty" description:"套餐系列ID"` SeriesID *uint `json:"series_id,omitempty" description:"套餐系列ID"`
SeriesName string `json:"series_name,omitempty" description:"套餐系列名称"` SeriesName string `json:"series_name,omitempty" description:"套餐系列名称"`
ActivatedAt *time.Time `json:"activated_at,omitempty" description:"激活时间"` ActivatedAt *time.Time `json:"activated_at,omitempty" description:"激活时间（未来准备移除，请勿依赖）"`
CreatedAt time.Time `json:"created_at" description:"创建时间"` CreatedAt time.Time `json:"created_at" description:"创建时间"`
UpdatedAt time.Time `json:"updated_at" description:"更新时间"` UpdatedAt time.Time `json:"updated_at" description:"更新时间"`
// 状态聚合字段 // 状态聚合字段

26
internal/model/dto/device_dto.go
View File

@@ -72,18 +72,20 @@ type ListDeviceCardsRequest struct {
} }
type DeviceCardBindingResponse struct { type DeviceCardBindingResponse struct {
ID uint `json:"id" description:"绑定记录ID"` ID uint `json:"id" description:"绑定记录ID"`
SlotPosition int `json:"slot_position" description:"插槽位置 (1-4)"` SlotPosition int `json:"slot_position" description:"插槽位置 (1-4)"`
IotCardID uint `json:"iot_card_id" description:"IoT卡ID"` IotCardID uint `json:"iot_card_id" description:"IoT卡ID"`
ICCID string `json:"iccid" description:"ICCID"` ICCID string `json:"iccid" description:"ICCID"`
MSISDN string `json:"msisdn" description:"接入号"` MSISDN string `json:"msisdn" description:"接入号"`
CarrierName string `json:"carrier_name" description:"运营商名称"` CarrierName string `json:"carrier_name" description:"运营商名称"`
Status int `json:"status" description:"卡状态 (1:在库, 2:已分销, 3:已激活, 4:已停用)"` Status int `json:"status" description:"卡状态 (1:在库, 2:已分销, 3:已激活, 4:已停用)"`
StatusName string `json:"status_name" description:"卡状态名称（中文）"` StatusName string `json:"status_name" description:"卡状态名称（中文）"`
BindTime *time.Time `json:"bind_time" description:"绑定时间"` RealNameStatus int `json:"real_name_status" description:"实名状态 (0:未实名, 1:已实名)"`
IsCurrent bool `json:"is_current" description:"是否为当前使用的卡"` RealNameStatusName string `json:"real_name_status_name" description:"实名状态名称（中文）"`
RealnamePolicy string `json:"realname_policy" description:"实名认证策略 (none:无需实名, before_order:先实名后充值/购买, after_order:先充值/购买后实名)"` BindTime *time.Time `json:"bind_time" description:"绑定时间"`
NetworkStatus int `json:"network_status" description:"网络状态：0停机 1开机（asset_type=card时有效）"` IsCurrent bool `json:"is_current" description:"是否为当前使用的卡"`
RealnamePolicy string `json:"realname_policy" description:"实名认证策略 (none:无需实名, before_order:先实名后充值/购买, after_order:先充值/购买后实名)"`
NetworkStatus int `json:"network_status" description:"网络状态：0停机 1开机（asset_type=card时有效）"`
} }
type ListDeviceCardsResponse struct { type ListDeviceCardsResponse struct {

26
internal/service/device/binding.go
View File

@@ -52,18 +52,20 @@ func (s *Service) ListBindings(ctx context.Context, deviceID uint) (*dto.ListDev
} }
resp := &dto.DeviceCardBindingResponse{ resp := &dto.DeviceCardBindingResponse{
ID: binding.ID, ID: binding.ID,
SlotPosition: binding.SlotPosition, SlotPosition: binding.SlotPosition,
IotCardID: binding.IotCardID, IotCardID: binding.IotCardID,
ICCID: card.ICCID, ICCID: card.ICCID,
MSISDN: card.MSISDN, MSISDN: card.MSISDN,
CarrierName: card.CarrierName, CarrierName: card.CarrierName,
Status: card.Status, Status: card.Status,
StatusName: constants.GetIotCardStatusName(card.Status), StatusName: constants.GetIotCardStatusName(card.Status),
BindTime: binding.BindTime, RealNameStatus: card.RealNameStatus,
IsCurrent: binding.IsCurrent, RealNameStatusName: constants.GetRealNameStatusName(card.RealNameStatus),
RealnamePolicy: card.RealnamePolicy, BindTime: binding.BindTime,
NetworkStatus: card.NetworkStatus, IsCurrent: binding.IsCurrent,
RealnamePolicy: card.RealnamePolicy,
NetworkStatus: card.NetworkStatus,
} }
responses = append(responses, resp) responses = append(responses, resp)
} }