新增资金出款查询与财务统计

backend/internal/modules/adminfinance/dashboard.go

@@ -19,11 +19,16 @@ func (r *Repository) Dashboard(ctx context.Context, query DashboardQuery) (*Dash
 	if err != nil {
 		return nil, err
 	}
+	disbursement, err := r.disbursementSummary(ctx, query)
+	if err != nil {
+		return nil, err
+	}
 	return &DashboardDTO{
-		Summary:       *summary,
-		DailyItems:    dailyItems,
-		PickupSummary: *pickup,
-		GeneratedAt:   timeutil.ShanghaiNow(),
+		Summary:             *summary,
+		DailyItems:          dailyItems,
+		PickupSummary:       *pickup,
+		DisbursementSummary: *disbursement,
+		GeneratedAt:         timeutil.ShanghaiNow(),
 	}, nil
 }
 
@@ -230,6 +235,11 @@ func (r *Repository) dailyItems(ctx context.Context, query DashboardQuery) ([]Fi
 		return nil, err
 	}
 
+	disbursements, err := r.dailyDisbursements(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+
 	itemsByDate := make(map[string]FinanceDailyDTO)
 	for day := dayStart(query.StartDate); !day.After(query.EndDate); day = day.AddDate(0, 0, 1) {
 		date := day.Format("2006-01-02")
@@ -272,6 +282,18 @@ func (r *Repository) dailyItems(ctx context.Context, query DashboardQuery) ([]Fi
 		item.EstimatedIncomeAmountCent = row.EstimatedIncomeAmountCent
 		itemsByDate[date] = item
 	}
+	for _, row := range disbursements {
+		date := dailyDateKey(row.Date)
+		item := itemsByDate[date]
+		item.Date = date
+		item.OfflineSettlementPaidAmountCent = row.OfflineSettlementPaidAmountCent
+		item.OfflineSettlementPaidCount = row.OfflineSettlementPaidCount
+		item.WithdrawalPaidAmountCent = row.WithdrawalPaidAmountCent
+		item.WithdrawalPaidCount = row.WithdrawalPaidCount
+		item.DisbursementPaidAmountCent = row.OfflineSettlementPaidAmountCent + row.WithdrawalPaidAmountCent
+		item.DisbursementPaidCount = row.OfflineSettlementPaidCount + row.WithdrawalPaidCount
+		itemsByDate[date] = item
+	}
 
 	items := make([]FinanceDailyDTO, 0, len(itemsByDate))
 	for day := dayStart(query.StartDate); !day.After(query.EndDate); day = day.AddDate(0, 0, 1) {