18278715334@163.com

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

@@ -179,7 +179,7 @@ func (r *GormWalletTransactionRepository) GetTotalAmountByUserIdAndDateRange(ctx
 // GetDailyStatsByUserId 获取用户每日消费统计
 func (r *GormWalletTransactionRepository) GetDailyStatsByUserId(ctx context.Context, userId string, startDate, endDate time.Time) ([]map[string]interface{}, error) {
 	var results []map[string]interface{}
-	
+
 	// 构建SQL查询 - 使用PostgreSQL语法，使用具体的日期范围
 	sql := `
 		SELECT 
@@ -192,19 +192,19 @@ func (r *GormWalletTransactionRepository) GetDailyStatsByUserId(ctx context.Cont
 		GROUP BY DATE(created_at)
 		ORDER BY date ASC
 	`
-	
+
 	err := r.GetDB(ctx).Raw(sql, userId, startDate.Format("2006-01-02"), endDate.Format("2006-01-02")).Scan(&results).Error
 	if err != nil {
 		return nil, err
 	}
-	
+
 	return results, nil
 }
 
 // GetMonthlyStatsByUserId 获取用户每月消费统计
 func (r *GormWalletTransactionRepository) GetMonthlyStatsByUserId(ctx context.Context, userId string, startDate, endDate time.Time) ([]map[string]interface{}, error) {
 	var results []map[string]interface{}
-	
+
 	// 构建SQL查询 - 使用PostgreSQL语法，使用具体的日期范围
 	sql := `
 		SELECT 
@@ -217,12 +217,12 @@ func (r *GormWalletTransactionRepository) GetMonthlyStatsByUserId(ctx context.Co
 		GROUP BY TO_CHAR(created_at, 'YYYY-MM')
 		ORDER BY month ASC
 	`
-	
+
 	err := r.GetDB(ctx).Raw(sql, userId, startDate, endDate).Scan(&results).Error
 	if err != nil {
 		return nil, err
 	}
-	
+
 	return results, nil
 }
 
@@ -358,7 +358,7 @@ func (r *GormWalletTransactionRepository) ListByUserIdWithFiltersAndProductName(
 	// 转换为entities.WalletTransaction并构建产品名称映射
 	var transactions []*entities.WalletTransaction
 	productNameMap := make(map[string]string)
-	
+
 	for _, t := range transactionsWithProduct {
 		transaction := t.WalletTransaction
 		transactions = append(transactions, &transaction)
@@ -410,6 +410,12 @@ func (r *GormWalletTransactionRepository) ListWithFiltersAndProductName(ctx cont
 			whereArgs = append(whereArgs, "%"+productName+"%")
 		}
 
+		// 企业名称筛选
+		if companyName, ok := filters["company_name"].(string); ok && companyName != "" {
+			whereCondition += " AND ei.company_name LIKE ?"
+			whereArgs = append(whereArgs, "%"+companyName+"%")
+		}
+
 		// 金额范围筛选
 		if minAmount, ok := filters["min_amount"].(string); ok && minAmount != "" {
 			whereCondition += " AND wt.amount >= ?"
@@ -422,9 +428,12 @@ func (r *GormWalletTransactionRepository) ListWithFiltersAndProductName(ctx cont
 	}
 
 	// 构建JOIN查询
+	// 需要JOIN product表获取产品名称，JOIN users和enterprise_infos表获取企业名称
 	query := r.GetDB(ctx).Table("wallet_transactions wt").
 		Select("wt.*, p.name as product_name").
 		Joins("LEFT JOIN product p ON wt.product_id = p.id").
+		Joins("LEFT JOIN users u ON wt.user_id = u.id").
+		Joins("LEFT JOIN enterprise_infos ei ON u.id = ei.user_id").
 		Where(whereCondition, whereArgs...)
 
 	// 获取总数
@@ -456,7 +465,7 @@ func (r *GormWalletTransactionRepository) ListWithFiltersAndProductName(ctx cont
 	// 转换为entities.WalletTransaction并构建产品名称映射
 	var transactions []*entities.WalletTransaction
 	productNameMap := make(map[string]string)
-	
+
 	for _, t := range transactionsWithProduct {
 		transaction := t.WalletTransaction
 		transactions = append(transactions, &transaction)
@@ -575,7 +584,7 @@ func (r *GormWalletTransactionRepository) GetSystemAmountByDateRange(ctx context
 // GetSystemDailyStats 获取系统每日消费统计
 func (r *GormWalletTransactionRepository) GetSystemDailyStats(ctx context.Context, startDate, endDate time.Time) ([]map[string]interface{}, error) {
 	var results []map[string]interface{}
-	
+
 	sql := `
 		SELECT 
 			DATE(created_at) as date,
@@ -586,19 +595,19 @@ func (r *GormWalletTransactionRepository) GetSystemDailyStats(ctx context.Contex
 		GROUP BY DATE(created_at)
 		ORDER BY date ASC
 	`
-	
+
 	err := r.GetDB(ctx).Raw(sql, startDate.Format("2006-01-02"), endDate.Format("2006-01-02")).Scan(&results).Error
 	if err != nil {
 		return nil, err
 	}
-	
+
 	return results, nil
 }
 
 // GetSystemMonthlyStats 获取系统每月消费统计
 func (r *GormWalletTransactionRepository) GetSystemMonthlyStats(ctx context.Context, startDate, endDate time.Time) ([]map[string]interface{}, error) {
 	var results []map[string]interface{}
-	
+
 	sql := `
 		SELECT 
 			TO_CHAR(created_at, 'YYYY-MM') as month,
@@ -609,11 +618,11 @@ func (r *GormWalletTransactionRepository) GetSystemMonthlyStats(ctx context.Cont
 		GROUP BY TO_CHAR(created_at, 'YYYY-MM')
 		ORDER BY month ASC
 	`
-	
+
 	err := r.GetDB(ctx).Raw(sql, startDate, endDate).Scan(&results).Error
 	if err != nil {
 		return nil, err
 	}
-	
+
 	return results, nil
-}
+}