七月迭代短暂完结,还有很多后端的关键东西没有弄,这是一版赶时间做的东西

internal/exporter/iot_card_scene.go

@@ -2,6 +2,7 @@ package exporter
 
 import (
 	"context"
+	"strconv"
 	"time"
 
 	"gorm.io/gorm"
@@ -36,7 +37,7 @@ func (s *IotCardDataSource) Count(ctx context.Context, params ExportParams) (int
 
 // Headers 返回 IoT 卡导出表头。
 func (s *IotCardDataSource) Headers(ctx context.Context, params ExportParams) ([]string, error) {
-	return []string{"ICCID", "MSISDN", "绑定设备虚拟号", "运营商", "店铺名称", "绑定设备名称", "是否实名", "实名时间", "网络状态"}, nil
+	return []string{"ICCID", "MSISDN", "绑定设备虚拟号", "运营商", "店铺名称", "绑定设备名称", "是否实名", "实名时间", "网络状态", "套餐名称", "使用流量(MB)", "剩余流量(MB)"}, nil
 }
 
 // Fetch 按 offset/limit 查询 IoT 卡导出数据。
@@ -56,7 +57,10 @@ func (s *IotCardDataSource) Fetch(ctx context.Context, params ExportParams, offs
 			COALESCE(d.device_name, '') AS device_name,
 			c.real_name_status,
 			c.first_realname_at,
-			c.network_status
+			c.network_status,
+			COALESCE(pkg.package_name, '') AS package_name,
+			COALESCE(pkg.data_usage_mb, 0) AS data_usage_mb,
+			COALESCE(pkg.data_limit_mb, 0) AS data_limit_mb
 		`).
 		Order("c.id ASC").
 		Limit(limit).
@@ -77,6 +81,9 @@ func (s *IotCardDataSource) Fetch(ctx context.Context, params ExportParams, offs
 			formatRealNameVerified(item.RealNameStatus),
 			formatOptionalTime(item.FirstRealnameAt),
 			constants.GetNetworkStatusName(item.NetworkStatus),
+			item.PackageName,
+			strconv.FormatInt(item.DataUsageMB, 10),
+			strconv.FormatInt(remainingPackageDataMB(item.DataLimitMB, item.DataUsageMB), 10),
 		})
 	}
 	return rows, nil
@@ -100,6 +107,22 @@ func (s *IotCardDataSource) baseQuery(ctx context.Context) *gorm.DB {
 				LIMIT 1
 			) AS d ON TRUE
 		`, constants.BindStatusBound).
+		Joins(`
+			LEFT JOIN LATERAL (
+				SELECT
+					COALESCE(NULLIF(pu.package_name, ''), p.package_name, '') AS package_name,
+					pu.data_usage_mb,
+					pu.data_limit_mb
+				FROM tb_package_usage AS pu
+				LEFT JOIN tb_package AS p ON p.id = pu.package_id AND p.deleted_at IS NULL
+				WHERE pu.iot_card_id = c.id
+					AND pu.status = ?
+					AND pu.master_usage_id IS NULL
+					AND pu.deleted_at IS NULL
+				ORDER BY pu.priority ASC, pu.activated_at ASC, pu.id ASC
+				LIMIT 1
+			) AS pkg ON TRUE
+		`, constants.PackageUsageStatusActive).
 		Where("c.deleted_at IS NULL")
 }
 
@@ -206,6 +229,17 @@ type iotCardExportRow struct {
 	RealNameStatus  int        `gorm:"column:real_name_status"`
 	FirstRealnameAt *time.Time `gorm:"column:first_realname_at"`
 	NetworkStatus   int        `gorm:"column:network_status"`
+	PackageName     string     `gorm:"column:package_name"`
+	DataUsageMB     int64      `gorm:"column:data_usage_mb"`
+	DataLimitMB     int64      `gorm:"column:data_limit_mb"`
+}
+
+func remainingPackageDataMB(limit, used int64) int64 {
+	remaining := limit - used
+	if remaining < 0 {
+		return 0
+	}
+	return remaining
 }
 
 func formatRealNameVerified(status int) string {