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

开放接口已用完流量查询错误的问题

Browse Source
This commit is contained in:
Break
2026-06-08 10:10:10 +08:00
parent 0ae8148689
commit 4ccbf13197
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/service/agent_open_api/service.go
View File

@@ -108,11 +108,18 @@ func (s *Service) GetCardTraffic(ctx context.Context, req *dto.AgentOpenAPICardQ
// buildCardTrafficResponse 统一构造卡流量响应，支持卡和设备两种载体维度 // buildCardTrafficResponse 统一构造卡流量响应，支持卡和设备两种载体维度
func (s *Service) buildCardTrafficResponse(ctx context.Context, cardNo, carrierType string, carrierID uint, deviceNo string) (*dto.AgentOpenAPICardTrafficResponse, error) { func (s *Service) buildCardTrafficResponse(ctx context.Context, cardNo, carrierType string, carrierID uint, deviceNo string) (*dto.AgentOpenAPICardTrafficResponse, error) {
activeStatus := constants.PackageUsageStatusActive activeStatus := constants.PackageUsageStatusActive
depletedStatus := constants.PackageUsageStatusDepleted
pendingStatus := constants.PackageUsageStatusPending pendingStatus := constants.PackageUsageStatusPending
activeUsages, err := s.packageUsageStore.ListByCarrier(ctx, carrierType, carrierID, &activeStatus) activeUsages, err := s.packageUsageStore.ListByCarrier(ctx, carrierType, carrierID, &activeStatus)
if err != nil { if err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "查询生效套餐失败") return nil, errors.Wrap(errors.CodeInternalError, err, "查询生效套餐失败")
} }
// 已用完的套餐仍在有效期内，与生效中套餐一并展示
depletedUsages, err := s.packageUsageStore.ListByCarrier(ctx, carrierType, carrierID, &depletedStatus)
if err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "查询已用完套餐失败")
}
activeUsages = append(activeUsages, depletedUsages...)
pendingUsages, err := s.packageUsageStore.ListByCarrier(ctx, carrierType, carrierID, &pendingStatus) pendingUsages, err := s.packageUsageStore.ListByCarrier(ctx, carrierType, carrierID, &pendingStatus)
if err != nil { if err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "查询待生效套餐失败") return nil, errors.Wrap(errors.CodeInternalError, err, "查询待生效套餐失败")