18278715334@163.com

internal/infrastructure/database/repositories/finance/gorm_recharge_record_repository.go

@@ -426,10 +426,11 @@ func (r *GormRechargeRecordRepository) GetSystemTotalAmount(ctx context.Context)
 }
 
 // GetSystemAmountByDateRange 获取系统指定时间范围内的充值金额（排除赠送）
+// endDate 应该是结束日期当天的次日00:00:00（日统计）或下个月1号00:00:00（月统计），使用 < 而不是 <=
 func (r *GormRechargeRecordRepository) GetSystemAmountByDateRange(ctx context.Context, startDate, endDate time.Time) (float64, error) {
 	var total float64
 	err := r.GetDB(ctx).Model(&entities.RechargeRecord{}).
-		Where("status = ? AND recharge_type != ? AND created_at >= ? AND created_at <= ?", entities.RechargeStatusSuccess, entities.RechargeTypeGift, startDate, endDate).
+		Where("status = ? AND recharge_type != ? AND created_at >= ? AND created_at < ?", entities.RechargeStatusSuccess, entities.RechargeTypeGift, startDate, endDate).
 		Select("COALESCE(SUM(amount), 0)").
 		Scan(&total).Error
 	return total, err
@@ -472,7 +473,7 @@ func (r *GormRechargeRecordRepository) GetSystemMonthlyStats(ctx context.Context
 		WHERE status = ?
 			AND recharge_type != ?
 			AND created_at >= ?
-			AND created_at <= ?
+			AND created_at < ?
 		GROUP BY TO_CHAR(created_at, 'YYYY-MM')
 		ORDER BY month ASC
 	`

internal/infrastructure/database/repositories/finance/gorm_wallet_transaction_repository.go

@@ -586,10 +586,11 @@ func (r *GormWalletTransactionRepository) GetSystemTotalAmount(ctx context.Conte
 }
 
 // GetSystemAmountByDateRange 获取系统指定时间范围内的消费金额
+// endDate 应该是结束日期当天的次日00:00:00（日统计）或下个月1号00:00:00（月统计），使用 < 而不是 <=
 func (r *GormWalletTransactionRepository) GetSystemAmountByDateRange(ctx context.Context, startDate, endDate time.Time) (float64, error) {
 	var total float64
 	err := r.GetDB(ctx).Model(&entities.WalletTransaction{}).
-		Where("created_at >= ? AND created_at <= ?", startDate, endDate).
+		Where("created_at >= ? AND created_at < ?", startDate, endDate).
 		Select("COALESCE(SUM(amount), 0)").
 		Scan(&total).Error
 	return total, err
@@ -628,7 +629,7 @@ func (r *GormWalletTransactionRepository) GetSystemMonthlyStats(ctx context.Cont
 			COALESCE(SUM(amount), 0) as amount
 		FROM wallet_transactions 
 		WHERE created_at >= ?
-			AND created_at <= ?
+			AND created_at < ?
 		GROUP BY TO_CHAR(created_at, 'YYYY-MM')
 		ORDER BY month ASC
 	`