增加运营开支

2026-08-20 16:06:05 +08:00
parent 0b235d078d
commit 80e329a604
14 changed files with 1189 additions and 12 deletions
@@ -27,16 +27,34 @@ func (r *Repository) Dashboard(ctx context.Context, query DashboardQuery) (*Dash
 	if err != nil {
 		return nil, err
 	}
+	operatingExpense, err := r.operatingExpenseSummary(ctx, query)
+	if err != nil {
+		return nil, err
+	}
 	return &DashboardDTO{
-		Summary:             *summary,
-		DailyItems:          dailyItems,
-		PickupSummary:       *pickup,
-		MohongSummary:       *mohong,
-		DisbursementSummary: *disbursement,
-		GeneratedAt:         timeutil.ShanghaiNow(),
+		Summary:                 *summary,
+		DailyItems:              dailyItems,
+		PickupSummary:           *pickup,
+		MohongSummary:           *mohong,
+		DisbursementSummary:     *disbursement,
+		OperatingExpenseSummary: *operatingExpense,
+		GeneratedAt:             timeutil.ShanghaiNow(),
 	}, nil
 }

+func (r *Repository) operatingExpenseSummary(ctx context.Context, query DashboardQuery) (*OperatingExpenseSummaryDTO, error) {
+	var summary OperatingExpenseSummaryDTO
+	err := r.db.WithContext(ctx).Table("operating_expenses").
+		Select("COALESCE(SUM(amount_cent), 0) AS amount_cent, COUNT(id) AS count").
+		Where("status = ?", "paid").
+		Where("occurred_at >= ? AND occurred_at <= ?", query.StartDate, query.EndDate).
+		Scan(&summary).Error
+	if err != nil {
+		return nil, err
+	}
+	return &summary, nil
+}
+
 // pickupSummary 线下提号统计，独立查询 admin_pickups 表，不混入正常订单口径。
 func (r *Repository) pickupSummary(ctx context.Context, query DashboardQuery) (*PickupSummaryDTO, error) {
 	db := r.db.WithContext(ctx)
@@ -303,6 +321,10 @@ func (r *Repository) dailyItems(ctx context.Context, query DashboardQuery) ([]Fi
 	if err != nil {
 		return nil, err
 	}
+	operatingExpenses, err := r.dailyOperatingExpenses(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) {
@@ -392,6 +414,14 @@ func (r *Repository) dailyItems(ctx context.Context, query DashboardQuery) ([]Fi
 		item.DisbursementPaidCount = row.OfflineSettlementPaidCount + row.WithdrawalPaidCount + row.ManualPaidCount
 		itemsByDate[date] = item
 	}
+	for _, row := range operatingExpenses {
+		date := dailyDateKey(row.Date)
+		item := itemsByDate[date]
+		item.Date = date
+		item.OperatingExpenseAmountCent = row.AmountCent
+		item.OperatingExpenseCount = row.Count
+		itemsByDate[date] = item
+	}

 	items := make([]FinanceDailyDTO, 0, len(itemsByDate))
 	for day := dayStart(query.StartDate); !day.After(query.EndDate); day = day.AddDate(0, 0, 1) {