实现资产预计最终到期时间

internal/service/iot_card/service.go

@@ -9,6 +9,7 @@ import (
 	"github.com/break/junhong_cmp_fiber/internal/gateway"
 	"github.com/break/junhong_cmp_fiber/internal/model"
 	"github.com/break/junhong_cmp_fiber/internal/model/dto"
+	packageexpiry "github.com/break/junhong_cmp_fiber/internal/query/packageexpiry"
 	assetAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_audit"
 	"github.com/break/junhong_cmp_fiber/internal/store"
 	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
@@ -73,6 +74,12 @@ type Service struct {
 	assetAuditService          AssetAuditService
 	enterpriseCardAuthStore    *postgres.EnterpriseCardAuthorizationStore
 	enterpriseStore            *postgres.EnterpriseStore
+	packageExpiryQuery         *packageexpiry.Query
+}
+
+// SetPackageExpiryQuery 注入套餐最终到期查询，供列表使用批量投影。
+func (s *Service) SetPackageExpiryQuery(query *packageexpiry.Query) {
+	s.packageExpiryQuery = query
 }
 
 func New(
@@ -98,6 +105,7 @@ func New(
 		gatewayClient:              gatewayClient,
 		logger:                     logger,
 		assetAuditService:          assetAuditService,
+		packageExpiryQuery:         packageexpiry.NewQuery(db),
 	}
 }
 
@@ -278,6 +286,14 @@ func (s *Service) ListStandalone(ctx context.Context, req *dto.ListStandaloneIot
 	if err != nil {
 		return nil, err
 	}
+	cardIDs := make([]uint, 0, len(cards))
+	for _, card := range cards {
+		cardIDs = append(cardIDs, card.ID)
+	}
+	expiryEstimates, err := s.packageExpiryQuery.ResolveBatch(ctx, constants.AssetTypeIotCard, cardIDs)
+	if err != nil {
+		return nil, err
+	}
 
 	shopMap := s.loadShopNames(ctx, cards)
 	//TODO 这里不对,现在已经快照了,这里如果还这样处理明显是浪费的
@@ -318,6 +334,7 @@ func (s *Service) ListStandalone(ctx context.Context, req *dto.ListStandaloneIot
 	list := make([]*dto.StandaloneIotCardResponse, 0, len(cards))
 	for _, card := range cards {
 		item := s.toStandaloneResponse(card, shopMap, seriesMap)
+		item.PackageExpiryEstimate = expiryEstimates[card.ID]
 		if eid, ok := cardAuthMap[card.ID]; ok {
 			item.AuthorizedEnterpriseID = &eid
 			item.AuthorizedEnterpriseName = enterpriseNameMap[eid]