From 4ccbf13197c2a9276fcf49bcd34d6805a0c591f2 Mon Sep 17 00:00:00 2001 From: Break Date: Mon, 8 Jun 2026 10:10:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=8E=A5=E5=8F=A3=E5=B7=B2?= =?UTF-8?q?=E7=94=A8=E5=AE=8C=E6=B5=81=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/service/agent_open_api/service.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/internal/service/agent_open_api/service.go b/internal/service/agent_open_api/service.go index b10c8b9..6b340d7 100644 --- a/internal/service/agent_open_api/service.go +++ b/internal/service/agent_open_api/service.go @@ -108,11 +108,18 @@ func (s *Service) GetCardTraffic(ctx context.Context, req *dto.AgentOpenAPICardQ // buildCardTrafficResponse 统一构造卡流量响应，支持卡和设备两种载体维度 func (s *Service) buildCardTrafficResponse(ctx context.Context, cardNo, carrierType string, carrierID uint, deviceNo string) (*dto.AgentOpenAPICardTrafficResponse, error) { activeStatus := constants.PackageUsageStatusActive + depletedStatus := constants.PackageUsageStatusDepleted pendingStatus := constants.PackageUsageStatusPending activeUsages, err := s.packageUsageStore.ListByCarrier(ctx, carrierType, carrierID, &activeStatus) if err != nil { 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) if err != nil { return nil, errors.Wrap(errors.CodeInternalError, err, "查询待生效套餐失败")