优化提号详情

2026-07-08 00:16:07 +08:00
parent 2935e16753
commit 8a5c9ab0be
16 changed files with 1083 additions and 119 deletions
@@ -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