新增字段

internal/service/asset/service.go

@@ -145,7 +145,7 @@ func (s *Service) buildDeviceResolveResponse(ctx context.Context, device *model.
 		AssetID:           device.ID,
 		VirtualNo:         device.VirtualNo,
 		Status:            device.Status,
-		StatusName:        constants.GetIotCardStatusName(device.Status),
+		StatusName:        constants.GetDeviceStatusName(device.Status),
 		BatchNo:           device.BatchNo,
 		ShopID:            device.ShopID,
 		SeriesID:          device.SeriesID,
@@ -226,6 +226,13 @@ func (s *Service) buildDeviceResolveResponse(ctx context.Context, device *model.
 	// 查当前主套餐
 	s.fillPackageInfo(ctx, resp, "device", device.ID)
 
+	activationStatuses, err := s.deviceStore.GetActivationStatusMap(ctx, []uint{device.ID})
+	if err != nil {
+		return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询设备激活状态失败")
+	}
+	resp.ActivationStatus = activationStatuses[device.ID]
+	resp.ActivationStatusName = constants.GetActivationStatusName(resp.ActivationStatus)
+
 	// 查 shop 名称
 	s.fillShopName(ctx, resp)
 
@@ -241,32 +248,33 @@ func (s *Service) buildDeviceResolveResponse(ctx context.Context, device *model.
 // buildCardResolveResponse 构建卡类型的资产解析响应
 func (s *Service) buildCardResolveResponse(ctx context.Context, card *model.IotCard) (*dto.AssetResolveResponse, error) {
 	resp := &dto.AssetResolveResponse{
-		AssetType:        "card",
-		AssetID:          card.ID,
-		VirtualNo:        card.VirtualNo,
-		Status:           card.Status,
-		StatusName:       constants.GetIotCardStatusName(card.Status),
-		BatchNo:          card.BatchNo,
-		ShopID:           card.ShopID,
-		SeriesID:         card.SeriesID,
-		ActivatedAt:      card.ActivatedAt,
-		CreatedAt:        card.CreatedAt,
-		UpdatedAt:        card.UpdatedAt,
-		RealNameStatus:   card.RealNameStatus,
-		RealNameAt:       card.FirstRealnameAt,
-		RealnamePolicy:   card.RealnamePolicy,
-		NetworkStatus:    card.NetworkStatus,
-		GatewayExtend:    card.GatewayExtend,
-		ICCID:            card.ICCID,
-		CarrierID:        card.CarrierID,
-		CarrierType:      card.CarrierType,
-		CarrierName:      card.CarrierName,
-		MSISDN:           card.MSISDN,
-		IMSI:             card.IMSI,
-		CardCategory:     card.CardCategory,
-		Supplier:         card.Supplier,
-		ActivationStatus: card.ActivationStatus,
-		EnablePolling:    card.EnablePolling,
+		AssetType:            "card",
+		AssetID:              card.ID,
+		VirtualNo:            card.VirtualNo,
+		Status:               card.Status,
+		StatusName:           constants.GetIotCardStatusName(card.Status),
+		BatchNo:              card.BatchNo,
+		ShopID:               card.ShopID,
+		SeriesID:             card.SeriesID,
+		ActivatedAt:          card.ActivatedAt,
+		CreatedAt:            card.CreatedAt,
+		UpdatedAt:            card.UpdatedAt,
+		RealNameStatus:       card.RealNameStatus,
+		RealNameAt:           card.FirstRealnameAt,
+		RealnamePolicy:       card.RealnamePolicy,
+		NetworkStatus:        card.NetworkStatus,
+		GatewayExtend:        card.GatewayExtend,
+		ICCID:                card.ICCID,
+		CarrierID:            card.CarrierID,
+		CarrierType:          card.CarrierType,
+		CarrierName:          card.CarrierName,
+		MSISDN:               card.MSISDN,
+		IMSI:                 card.IMSI,
+		CardCategory:         card.CardCategory,
+		Supplier:             card.Supplier,
+		ActivationStatus:     card.ActivationStatus,
+		ActivationStatusName: constants.GetActivationStatusName(card.ActivationStatus),
+		EnablePolling:        card.EnablePolling,
 	}
 
 	// 查绑定设备