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

internal/service/device/service.go

@@ -11,6 +11,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"
 	"github.com/break/junhong_cmp_fiber/internal/store"
 	"github.com/break/junhong_cmp_fiber/internal/store/postgres"
 	"github.com/break/junhong_cmp_fiber/pkg/constants"
@@ -20,21 +21,27 @@ import (
 )
 
 type Service struct {
-	db                             *gorm.DB
-	redis                          *redis.Client
-	deviceStore                    *postgres.DeviceStore
-	deviceSimBindingStore          *postgres.DeviceSimBindingStore
-	iotCardStore                   *postgres.IotCardStore
-	shopStore                      *postgres.ShopStore
-	assetAllocationRecordStore     *postgres.AssetAllocationRecordStore
-	shopPackageAllocationStore     *postgres.ShopPackageAllocationStore
-	shopSeriesAllocationStore      *postgres.ShopSeriesAllocationStore
-	packageSeriesStore             *postgres.PackageSeriesStore
-	gatewayClient                  *gateway.Client
-	assetIdentifierStore           *postgres.AssetIdentifierStore
-	assetAuditService              AssetAuditService
-	enterpriseDeviceAuthStore      *postgres.EnterpriseDeviceAuthorizationStore
-	enterpriseStore                *postgres.EnterpriseStore
+	db                         *gorm.DB
+	redis                      *redis.Client
+	deviceStore                *postgres.DeviceStore
+	deviceSimBindingStore      *postgres.DeviceSimBindingStore
+	iotCardStore               *postgres.IotCardStore
+	shopStore                  *postgres.ShopStore
+	assetAllocationRecordStore *postgres.AssetAllocationRecordStore
+	shopPackageAllocationStore *postgres.ShopPackageAllocationStore
+	shopSeriesAllocationStore  *postgres.ShopSeriesAllocationStore
+	packageSeriesStore         *postgres.PackageSeriesStore
+	gatewayClient              *gateway.Client
+	assetIdentifierStore       *postgres.AssetIdentifierStore
+	assetAuditService          AssetAuditService
+	enterpriseDeviceAuthStore  *postgres.EnterpriseDeviceAuthorizationStore
+	enterpriseStore            *postgres.EnterpriseStore
+	packageExpiryQuery         *packageexpiry.Query
+}
+
+// SetPackageExpiryQuery 注入套餐最终到期查询，供列表使用批量投影。
+func (s *Service) SetPackageExpiryQuery(query *packageexpiry.Query) {
+	s.packageExpiryQuery = query
 }
 
 func New(
@@ -55,21 +62,22 @@ func New(
 	enterpriseStore *postgres.EnterpriseStore,
 ) *Service {
 	return &Service{
-		db:                             db,
-		redis:                          rds,
-		deviceStore:                    deviceStore,
-		deviceSimBindingStore:          deviceSimBindingStore,
-		iotCardStore:                   iotCardStore,
-		shopStore:                      shopStore,
-		assetAllocationRecordStore:     assetAllocationRecordStore,
-		shopPackageAllocationStore:     shopPackageAllocationStore,
-		shopSeriesAllocationStore:      shopSeriesAllocationStore,
-		packageSeriesStore:             packageSeriesStore,
-		gatewayClient:                  gatewayClient,
-		assetIdentifierStore:           assetIdentifierStore,
-		assetAuditService:              assetAuditService,
-		enterpriseDeviceAuthStore:      enterpriseDeviceAuthStore,
-		enterpriseStore:                enterpriseStore,
+		db:                         db,
+		redis:                      rds,
+		deviceStore:                deviceStore,
+		deviceSimBindingStore:      deviceSimBindingStore,
+		iotCardStore:               iotCardStore,
+		shopStore:                  shopStore,
+		assetAllocationRecordStore: assetAllocationRecordStore,
+		shopPackageAllocationStore: shopPackageAllocationStore,
+		shopSeriesAllocationStore:  shopSeriesAllocationStore,
+		packageSeriesStore:         packageSeriesStore,
+		gatewayClient:              gatewayClient,
+		assetIdentifierStore:       assetIdentifierStore,
+		assetAuditService:          assetAuditService,
+		enterpriseDeviceAuthStore:  enterpriseDeviceAuthStore,
+		enterpriseStore:            enterpriseStore,
+		packageExpiryQuery:         packageexpiry.NewQuery(db),
 	}
 }
 
@@ -150,10 +158,14 @@ func (s *Service) List(ctx context.Context, req *dto.ListDeviceRequest) (*dto.Li
 	if err != nil {
 		return nil, err
 	}
+	deviceIDs := s.extractDeviceIDs(devices)
+	expiryEstimates, err := s.packageExpiryQuery.ResolveBatch(ctx, constants.AssetTypeDevice, deviceIDs)
+	if err != nil {
+		return nil, err
+	}
 
 	shopMap := s.loadShopData(ctx, devices)
 	seriesMap := s.loadSeriesNames(ctx, devices)
-	deviceIDs := s.extractDeviceIDs(devices)
 	bindingCounts, err := s.getBindingCounts(ctx, deviceIDs)
 	if err != nil {
 		return nil, err
@@ -184,6 +196,7 @@ func (s *Service) List(ctx context.Context, req *dto.ListDeviceRequest) (*dto.Li
 	list := make([]*dto.DeviceResponse, 0, len(devices))
 	for _, device := range devices {
 		item := s.toDeviceResponse(device, shopMap, seriesMap, bindingCounts, activationStatuses)
+		item.PackageExpiryEstimate = expiryEstimates[device.ID]
 		if eid, ok := deviceEnterpriseMap[device.ID]; ok {
 			item.AuthorizedEnterpriseID = &eid
 			item.AuthorizedEnterpriseName = enterpriseNameMap[eid]