优化提号详情

backend/internal/modules/adminfinance/dashboard.go

@@ -32,10 +32,11 @@ func (r *Repository) pickupSummary(ctx context.Context, query DashboardQuery) (*
 	db := r.db.WithContext(ctx)
 	var row struct {
 		SettledAmountCent int64
+		ProfitAmountCent  int64
 		CompletedCount    int64
 	}
 	if err := db.Table("admin_pickups").
-		Select(`COALESCE(SUM(settle_amount_cent), 0) AS settled_amount_cent, COUNT(id) AS completed_count`).
+		Select(`COALESCE(SUM(settle_amount_cent), 0) AS settled_amount_cent, COALESCE(SUM(profit_amount_cent), 0) AS profit_amount_cent, COUNT(id) AS completed_count`).
 		Where("status = ?", "completed").
 		Where("completed_at >= ? AND completed_at <= ?", query.StartDate, query.EndDate).
 		Scan(&row).Error; err != nil {
@@ -47,6 +48,7 @@ func (r *Repository) pickupSummary(ctx context.Context, query DashboardQuery) (*
 	}
 	return &PickupSummaryDTO{
 		SettledAmountCent: row.SettledAmountCent,
+		ProfitAmountCent:  row.ProfitAmountCent,
 		CompletedCount:    row.CompletedCount,
 		InProgressCount:   inProgress,
 	}, nil

backend/internal/modules/adminfinance/dto.go

@@ -20,15 +20,16 @@ type DetailQuery struct {
 }
 
 type DashboardDTO struct {
-	Summary       FinanceSummaryDTO  `json:"summary"`
-	DailyItems    []FinanceDailyDTO  `json:"daily_items"`
-	PickupSummary PickupSummaryDTO   `json:"pickup_summary"`
-	GeneratedAt   time.Time          `json:"generated_at"`
+	Summary       FinanceSummaryDTO `json:"summary"`
+	DailyItems    []FinanceDailyDTO `json:"daily_items"`
+	PickupSummary PickupSummaryDTO  `json:"pickup_summary"`
+	GeneratedAt   time.Time         `json:"generated_at"`
 }
 
 // PickupSummaryDTO 线下提号统计，独立于正常订单口径，数据来自 admin_pickups 表。
 type PickupSummaryDTO struct {
 	SettledAmountCent int64 `json:"settled_amount_cent"` // 区间内已完成提号的结算金额合计
+	ProfitAmountCent  int64 `json:"profit_amount_cent"`  // 区间内已完成提号的线下利润合计
 	CompletedCount    int64 `json:"completed_count"`     // 区间内已完成提号笔数
 	InProgressCount   int64 `json:"in_progress_count"`   // 当前提号中笔数（不按时间）
 }