18278715334@163.com

2025-12-05 14:59:23 +08:00
parent bfedec249f
commit 05b6623e75
17 changed files with 677 additions and 37 deletions
--- a/internal/infrastructure/database/repositories/finance/gorm_recharge_record_repository.go
+++ b/internal/infrastructure/database/repositories/finance/gorm_recharge_record_repository.go
@@ -89,37 +89,86 @@ func (r *GormRechargeRecordRepository) UpdateStatus(ctx context.Context, id stri

 func (r *GormRechargeRecordRepository) Count(ctx context.Context, options interfaces.CountOptions) (int64, error) {
 	var count int64
-	query := r.GetDB(ctx).Model(&entities.RechargeRecord{})
+
+	// 检查是否有 company_name 筛选，如果有则需要 JOIN 表
+	hasCompanyNameFilter := false
+	if options.Filters != nil {
+		if companyName, ok := options.Filters["company_name"].(string); ok && companyName != "" {
+			hasCompanyNameFilter = true
+		}
+	}
+
+	var query *gorm.DB
+	if hasCompanyNameFilter {
+		// 使用 JOIN 查询以支持企业名称筛选
+		query = r.GetDB(ctx).Table("recharge_records rr").
+			Joins("LEFT JOIN users u ON rr.user_id = u.id").
+			Joins("LEFT JOIN enterprise_infos ei ON u.id = ei.user_id")
+	} else {
+		// 普通查询
+		query = r.GetDB(ctx).Model(&entities.RechargeRecord{})
+	}
+
 	if options.Filters != nil {
 		for key, value := range options.Filters {
 			// 特殊处理时间范围过滤器
 			if key == "start_time" {
 				if startTime, ok := value.(time.Time); ok {
-					query = query.Where("created_at >= ?", startTime)
+					if hasCompanyNameFilter {
+						query = query.Where("rr.created_at >= ?", startTime)
+					} else {
+						query = query.Where("created_at >= ?", startTime)
+					}
 				}
 			} else if key == "end_time" {
 				if endTime, ok := value.(time.Time); ok {
-					query = query.Where("created_at <= ?", endTime)
+					if hasCompanyNameFilter {
+						query = query.Where("rr.created_at <= ?", endTime)
+					} else {
+						query = query.Where("created_at <= ?", endTime)
+					}
+				}
+			} else if key == "company_name" {
+				// 处理企业名称筛选
+				if companyName, ok := value.(string); ok && companyName != "" {
+					query = query.Where("ei.company_name LIKE ?", "%"+companyName+"%")
 				}
 			} else if key == "min_amount" {
 				// 处理最小金额，支持string、int、int64类型
 				if amount, err := r.parseAmount(value); err == nil {
-					query = query.Where("amount >= ?", amount)
+					if hasCompanyNameFilter {
+						query = query.Where("rr.amount >= ?", amount)
+					} else {
+						query = query.Where("amount >= ?", amount)
+					}
 				}
 			} else if key == "max_amount" {
 				// 处理最大金额，支持string、int、int64类型
 				if amount, err := r.parseAmount(value); err == nil {
-					query = query.Where("amount <= ?", amount)
+					if hasCompanyNameFilter {
+						query = query.Where("rr.amount <= ?", amount)
+					} else {
+						query = query.Where("amount <= ?", amount)
+					}
 				}
 			} else {
 				// 其他过滤器使用等值查询
-				query = query.Where(key+" = ?", value)
+				if hasCompanyNameFilter {
+					query = query.Where("rr."+key+" = ?", value)
+				} else {
+					query = query.Where(key+" = ?", value)
+				}
 			}
 		}
 	}
 	if options.Search != "" {
-		query = query.Where("user_id LIKE ? OR transfer_order_id LIKE ? OR alipay_order_id LIKE ?",
-			"%"+options.Search+"%", "%"+options.Search+"%", "%"+options.Search+"%")
+		if hasCompanyNameFilter {
+			query = query.Where("rr.user_id LIKE ? OR rr.transfer_order_id LIKE ? OR rr.alipay_order_id LIKE ?",
+				"%"+options.Search+"%", "%"+options.Search+"%", "%"+options.Search+"%")
+		} else {
+			query = query.Where("user_id LIKE ? OR transfer_order_id LIKE ? OR alipay_order_id LIKE ?",
+				"%"+options.Search+"%", "%"+options.Search+"%", "%"+options.Search+"%")
+		}
 	}
 	return count, query.Count(&count).Error
 }
@@ -132,45 +181,98 @@ func (r *GormRechargeRecordRepository) Exists(ctx context.Context, id string) (b

 func (r *GormRechargeRecordRepository) List(ctx context.Context, options interfaces.ListOptions) ([]entities.RechargeRecord, error) {
 	var records []entities.RechargeRecord
-	query := r.GetDB(ctx).Model(&entities.RechargeRecord{})
+
+	// 检查是否有 company_name 筛选，如果有则需要 JOIN 表
+	hasCompanyNameFilter := false
+	if options.Filters != nil {
+		if companyName, ok := options.Filters["company_name"].(string); ok && companyName != "" {
+			hasCompanyNameFilter = true
+		}
+	}
+
+	var query *gorm.DB
+	if hasCompanyNameFilter {
+		// 使用 JOIN 查询以支持企业名称筛选
+		query = r.GetDB(ctx).Table("recharge_records rr").
+			Select("rr.*").
+			Joins("LEFT JOIN users u ON rr.user_id = u.id").
+			Joins("LEFT JOIN enterprise_infos ei ON u.id = ei.user_id")
+	} else {
+		// 普通查询
+		query = r.GetDB(ctx).Model(&entities.RechargeRecord{})
+	}

 	if options.Filters != nil {
 		for key, value := range options.Filters {
 			// 特殊处理 user_ids 过滤器
 			if key == "user_ids" {
 				if userIds, ok := value.(string); ok && userIds != "" {
-					query = query.Where("user_id IN ?", strings.Split(userIds, ","))
+					if hasCompanyNameFilter {
+						query = query.Where("rr.user_id IN ?", strings.Split(userIds, ","))
+					} else {
+						query = query.Where("user_id IN ?", strings.Split(userIds, ","))
+					}
+				}
+			} else if key == "company_name" {
+				// 处理企业名称筛选
+				if companyName, ok := value.(string); ok && companyName != "" {
+					query = query.Where("ei.company_name LIKE ?", "%"+companyName+"%")
 				}
 			} else if key == "start_time" {
 				// 处理开始时间范围
 				if startTime, ok := value.(time.Time); ok {
-					query = query.Where("created_at >= ?", startTime)
+					if hasCompanyNameFilter {
+						query = query.Where("rr.created_at >= ?", startTime)
+					} else {
+						query = query.Where("created_at >= ?", startTime)
+					}
 				}
 			} else if key == "end_time" {
 				// 处理结束时间范围
 				if endTime, ok := value.(time.Time); ok {
-					query = query.Where("created_at <= ?", endTime)
+					if hasCompanyNameFilter {
+						query = query.Where("rr.created_at <= ?", endTime)
+					} else {
+						query = query.Where("created_at <= ?", endTime)
+					}
 				}
 			} else if key == "min_amount" {
 				// 处理最小金额，支持string、int、int64类型
 				if amount, err := r.parseAmount(value); err == nil {
-					query = query.Where("amount >= ?", amount)
+					if hasCompanyNameFilter {
+						query = query.Where("rr.amount >= ?", amount)
+					} else {
+						query = query.Where("amount >= ?", amount)
+					}
 				}
 			} else if key == "max_amount" {
 				// 处理最大金额，支持string、int、int64类型
 				if amount, err := r.parseAmount(value); err == nil {
-					query = query.Where("amount <= ?", amount)
+					if hasCompanyNameFilter {
+						query = query.Where("rr.amount <= ?", amount)
+					} else {
+						query = query.Where("amount <= ?", amount)
+					}
 				}
 			} else {
 				// 其他过滤器使用等值查询
-				query = query.Where(key+" = ?", value)
+				if hasCompanyNameFilter {
+					query = query.Where("rr."+key+" = ?", value)
+				} else {
+					query = query.Where(key+" = ?", value)
+				}
 			}
 		}
 	}

 	if options.Search != "" {
-		query = query.Where("user_id LIKE ? OR transfer_order_id LIKE ? OR alipay_order_id LIKE ?",
-			"%"+options.Search+"%", "%"+options.Search+"%", "%"+options.Search+"%")
+		if hasCompanyNameFilter {
+			query = query.Where("rr.user_id LIKE ? OR rr.transfer_order_id LIKE ? OR rr.alipay_order_id LIKE ?",
+				"%"+options.Search+"%", "%"+options.Search+"%", "%"+options.Search+"%")
+		} else {
+			query = query.Where("user_id LIKE ? OR transfer_order_id LIKE ? OR alipay_order_id LIKE ?",
+				"%"+options.Search+"%", "%"+options.Search+"%", "%"+options.Search+"%")
+		}
 	}

 	if options.Sort != "" {
@@ -178,9 +280,17 @@ func (r *GormRechargeRecordRepository) List(ctx context.Context, options interfa
 		if options.Order == "desc" || options.Order == "DESC" {
 			order = "DESC"
 		}
-		query = query.Order(options.Sort + " " + order)
+		if hasCompanyNameFilter {
+			query = query.Order("rr." + options.Sort + " " + order)
+		} else {
+			query = query.Order(options.Sort + " " + order)
+		}
 	} else {
-		query = query.Order("created_at DESC")
+		if hasCompanyNameFilter {
+			query = query.Order("rr.created_at DESC")
+		} else {
+			query = query.Order("created_at DESC")
+		}
 	}

 	if options.Page > 0 && options.PageSize > 0 {
--- a/internal/infrastructure/database/repositories/finance/gorm_wallet_transaction_repository.go
+++ b/internal/infrastructure/database/repositories/finance/gorm_wallet_transaction_repository.go
@@ -382,12 +382,26 @@ func (r *GormWalletTransactionRepository) ListWithFiltersAndProductName(ctx cont

 	// 应用筛选条件
 	if filters != nil {
-		// 用户ID筛选
-		if userId, ok := filters["user_id"].(string); ok && userId != "" {
+		// 用户ID筛选（支持单个和多个）
+		if userIds, ok := filters["user_ids"].(string); ok && userIds != "" {
+			// 多个用户ID，逗号分隔
+			userIdsList := strings.Split(userIds, ",")
+			whereCondition += " AND wt.user_id IN ?"
+			whereArgs = append(whereArgs, userIdsList)
+		} else if userId, ok := filters["user_id"].(string); ok && userId != "" {
+			// 单个用户ID
 			whereCondition += " AND wt.user_id = ?"
 			whereArgs = append(whereArgs, userId)
 		}

+		// 产品ID筛选（支持多个）
+		if productIds, ok := filters["product_ids"].(string); ok && productIds != "" {
+			// 多个产品ID，逗号分隔
+			productIdsList := strings.Split(productIds, ",")
+			whereCondition += " AND wt.product_id IN ?"
+			whereArgs = append(whereArgs, productIdsList)
+		}
+
 		// 时间范围筛选
 		if startTime, ok := filters["start_time"].(time.Time); ok {
 			whereCondition += " AND wt.created_at >= ?"