Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

Marketing Statistics

lotkeb1770cb1c3d
diff --git a/core/api/batch_mail/v1/batch_mail.go b/core/api/batch_mail/v1/batch_mail.go
index 54f766eb..b00dcf90 100644
--- a/core/api/batch_mail/v1/batch_mail.go
+++ b/core/api/batch_mail/v1/batch_mail.go
@@ -45,13 +45,12 @@ type TaskDetail struct {
TemplateName string `json:"template_name" dc:"template name"`
SuccessCount int `json:"success_count" dc:"success count"`
ErrorCount int `json:"error_count" dc:"error count"`
- // 新增统计字段
- Opened int `json:"opened" dc:"邮件打开数"`
- Clicked int `json:"clicked" dc:"链接点击数"`
- DeliveryRate float64 `json:"delivery_rate" dc:"送达率"`
- BounceRate float64 `json:"bounce_rate" dc:"退信率"`
- OpenRate float64 `json:"open_rate" dc:"打开率"`
- ClickRate float64 `json:"click_rate" dc:"点击率"`
+ Opened int `json:"opened" dc:"opened count"`
+ Clicked int `json:"clicked" dc:"clicked count"`
+ DeliveryRate float64 `json:"delivery_rate" dc:"delivery rate"`
+ BounceRate float64 `json:"bounce_rate" dc:"bounce rate"`
+ OpenRate float64 `json:"open_rate" dc:"open rate"`
+ ClickRate float64 `json:"click_rate" dc:"click rate"`
}
type ListTasksReq struct {
@@ -187,23 +186,22 @@ type SendTestEmailRes struct {
}
type TaskStatChartReq struct {
- g.Meta `path:"/batch_mail/task/stat_chart" method:"get" tags:"BatchMail" summary:"获取任务统计图表"`
+ g.Meta `path:"/batch_mail/task/stat_chart" method:"get" tags:"BatchMail" summary:"get task stat chart"`
Authorization string `json:"authorization" dc:"Authorization" in:"header"`
- TaskId int64 `json:"task_id" v:"required" dc:"任务ID"`
- Domain string `json:"domain" v:"domain" dc:"邮件域名过滤"`
- StartTime int64 `json:"start_time" v:"required" dc:"开始时间"`
- EndTime int64 `json:"end_time" v:"required" dc:"结束时间"`
+ TaskId int64 `json:"task_id" v:"required" dc:"task id"`
+ Domain string `json:"domain" v:"domain" dc:"domain"`
+ StartTime int64 `json:"start_time" v:"required" dc:"start time"`
+ EndTime int64 `json:"end_time" v:"required" dc:"end time"`
}
-// 响应结构
type TaskStatChartRes struct {
api_v1.StandardRes
Data struct {
- Dashboard interface{} `json:"dashboard" dc:"统计概览"`
- MailProviders interface{} `json:"mail_providers" dc:"邮件服务商统计"`
- SendMailChart interface{} `json:"send_mail_chart" dc:"发送邮件图表"`
- BounceRateChart interface{} `json:"bounce_rate_chart" dc:"退信率图表"`
- OpenRateChart interface{} `json:"open_rate_chart" dc:"打开率图表"`
- ClickRateChart interface{} `json:"click_rate_chart" dc:"点击率图表"`
+ Dashboard interface{} `json:"dashboard" dc:"dashboard"`
+ MailProviders interface{} `json:"mail_providers" dc:"mail providers"`
+ SendMailChart interface{} `json:"send_mail_chart" dc:"send mail chart"`
+ BounceRateChart interface{} `json:"bounce_rate_chart" dc:"bounce rate chart"`
+ OpenRateChart interface{} `json:"open_rate_chart" dc:"open rate chart"`
+ ClickRateChart interface{} `json:"click_rate_chart" dc:"click rate chart"`
} `json:"data"`
}
diff --git a/core/internal/controller/batch_mail/batch_mail_v1_list_tasks.go b/core/internal/controller/batch_mail/batch_mail_v1_list_tasks.go
index 103546fd..67b4145f 100644
--- a/core/internal/controller/batch_mail/batch_mail_v1_list_tasks.go
+++ b/core/internal/controller/batch_mail/batch_mail_v1_list_tasks.go
@@ -26,7 +26,6 @@ func (c *ControllerV1) ListTasks(ctx context.Context, req *v1.ListTasksReq) (res
EmailTask: *task,
}
- // 获取任务统计数据
stats := GetTaskStats(ctx, int64(task.Id))
if stats != nil {
@@ -103,34 +102,28 @@ func (c *ControllerV1) ListTasks(ctx context.Context, req *v1.ListTasksReq) (res
func GetTaskStats(ctx context.Context, taskId int64) map[string]interface{} {
query := g.DB().Model("mailstat_send_mails sm")
- // 关联消息ID和任务收件人信息
query = query.LeftJoin("mailstat_message_ids mi", "sm.postfix_message_id=mi.postfix_message_id")
query = query.LeftJoin("recipient_info ri", "mi.message_id=ri.message_id")
- // 关联打开和点击记录
query = query.LeftJoin("mailstat_opened o", "sm.postfix_message_id=o.postfix_message_id")
query = query.LeftJoin("mailstat_clicked c", "sm.postfix_message_id=c.postfix_message_id")
- // 过滤指定任务
query = query.Where("ri.task_id = ?", taskId)
- // 统计各项指标
query.Fields(
- "count(*) as sends", // 总发送数
- "coalesce(sum(case when sm.status='sent' and sm.dsn like '2.%' then 1 else 0 end), 0) as delivered", // 成功送达数
- "count(distinct o.postfix_message_id) as opened", // 打开数
- "count(distinct c.postfix_message_id) as clicked", // 点击数
- "coalesce(sum(case when sm.status='bounced' then 1 else 0 end), 0) as bounced", // 退信数
+ "count(*) as sends",
+ "coalesce(sum(case when sm.status='sent' and sm.dsn like '2.%' then 1 else 0 end), 0) as delivered", // success count
+ "count(distinct o.postfix_message_id) as opened", // opened count
+ "count(distinct c.postfix_message_id) as clicked", // clicked count
+ "coalesce(sum(case when sm.status='bounced' then 1 else 0 end), 0) as bounced", // bounced count
)
- // 执行查询
result, err := query.One()
if err != nil {
g.Log().Error(ctx, err)
return nil
}
- // 转换结果
stats := map[string]interface{}{
"sends": result["sends"].Int(),
"delivered": result["delivered"].Int(),
@@ -139,7 +132,6 @@ func GetTaskStats(ctx context.Context, taskId int64) map[string]interface{} {
"bounced": result["bounced"].Int(),
}
- // 计算比率
sends := stats["sends"].(int)
if sends > 0 {
stats["delivery_rate"] = public.Round(float64(stats["delivered"].(int))/float64(sends)*100, 2)
diff --git a/core/internal/controller/batch_mail/batch_mail_v1_task_stat_chart.go b/core/internal/controller/batch_mail/batch_mail_v1_task_stat_chart.go
index a94e968e..032b3186 100644
--- a/core/internal/controller/batch_mail/batch_mail_v1_task_stat_chart.go
+++ b/core/internal/controller/batch_mail/batch_mail_v1_task_stat_chart.go
@@ -26,9 +26,8 @@ func (c *ControllerV1) TaskStatChart(ctx context.Context, req *v1.TaskStatChartR
return
}
- // 获取统计数据
statService := batch_mail.NewTaskStatService()
- // 修改这里: 直接调用实例的方法
+
chartData := statService.GetTaskStatChart(req.TaskId, req.Domain, req.StartTime, req.EndTime)
res.Data.Dashboard = chartData["dashboard"]
diff --git a/core/internal/service/batch_mail/stat_service.go b/core/internal/service/batch_mail/stat_service.go
index 42bea05d..b5ad5e37 100644
--- a/core/internal/service/batch_mail/stat_service.go
+++ b/core/internal/service/batch_mail/stat_service.go
@@ -8,35 +8,29 @@ import (
"time"
)
-// TaskStatService 任务统计服务
type TaskStatService struct{}
func NewTaskStatService() *TaskStatService {
return &TaskStatService{}
}
-// buildBaseQuery 构建基础查询
+// buildBaseQuery
func (s *TaskStatService) buildBaseQuery(taskId int64, domain string, startTime, endTime int64) *gdb.Model {
- // 基础查询
+
query := g.DB().Model("mailstat_send_mails sm")
- // 关联发件人表
query.LeftJoin("mailstat_senders s", "sm.postfix_message_id=s.postfix_message_id")
query.Where("s.postfix_message_id is not null")
- // 关联消息ID和任务收件人信息
query.LeftJoin("mailstat_message_ids mi", "sm.postfix_message_id=mi.postfix_message_id")
query.LeftJoin("recipient_info ri", "mi.message_id=ri.message_id")
- // 过滤指定任务
query.Where("ri.task_id = ?", taskId)
- // 域名过滤
if domain != "" {
query.Where("sm.recipient LIKE ?", "%@"+domain)
}
- // 时间范围过滤
if startTime > 0 {
query.Where("sm.log_time_millis > ?", startTime*1000-1)
}
@@ -48,7 +42,7 @@ func (s *TaskStatService) buildBaseQuery(taskId int64, domain string, startTime,
return query
}
-// GetTaskStatChart 获取任务统计图表
+// GetTaskStatChart
func (s *TaskStatService) GetTaskStatChart(taskId int64, domain string, startTime, endTime int64) map[string]interface{} {
startTime, endTime = s.filterAndPrepareTimeSection(startTime, endTime)
@@ -62,7 +56,7 @@ func (s *TaskStatService) GetTaskStatChart(taskId int64, domain string, startTim
}
}
-// filterAndPrepareTimeSection 处理时间区间
+// filterAndPrepareTimeSection
func (s *TaskStatService) filterAndPrepareTimeSection(startTime, endTime int64) (int64, int64) {
if startTime > 0 && endTime < 0 {
endTime = time.Now().Unix()
@@ -75,7 +69,7 @@ func (s *TaskStatService) filterAndPrepareTimeSection(startTime, endTime int64)
return startTime, endTime
}
-// prepareChartData 准备图表数据
+// prepareChartData
func (s *TaskStatService) prepareChartData(startTime, endTime int64) (string, string) {
columnType := "daily"
secs := endTime - startTime
@@ -89,7 +83,7 @@ func (s *TaskStatService) prepareChartData(startTime, endTime int64) (string, st
return columnType, xAxisField
}
-// getTaskDashboard 获取仪表盘数据
+// getTaskDashboard
func (s *TaskStatService) getTaskDashboard(taskId int64, domain string, startTime, endTime int64) map[string]interface{} {
query := s.buildBaseQuery(taskId, domain, startTime, endTime)
@@ -128,7 +122,7 @@ func (s *TaskStatService) getTaskDashboard(taskId int64, domain string, startTim
return stats
}
-// fillChartData 填充图表数据
+// fillChartData
func (s *TaskStatService) fillChartData(data []map[string]interface{}, columnType string, startTime, endTime int64) []map[string]interface{} {
switch columnType {
case "daily":
@@ -140,7 +134,7 @@ func (s *TaskStatService) fillChartData(data []map[string]interface{}, columnTyp
}
}
-// fillChartDataHourly 填充小时数据
+// fillChartDataHourly
func (s *TaskStatService) fillChartDataHourly(data []map[string]interface{}) []map[string]interface{} {
result := make([]map[string]interface{}, 24)
dataMap := make(map[int]map[string]interface{})
@@ -166,7 +160,7 @@ func (s *TaskStatService) fillChartDataHourly(data []map[string]interface{}) []m
return result
}
-// fillChartDataDaily 填充每日数据
+// fillChartDataDaily
func (s *TaskStatService) fillChartDataDaily(data []map[string]interface{}, startTime, endTime int64) []map[string]interface{} {
result := make([]map[string]interface{}, 0)
dataMap := make(map[string]map[string]interface{})
@@ -193,7 +187,7 @@ func (s *TaskStatService) fillChartDataDaily(data []map[string]interface{}, star
return result
}
-// getTaskBounceRateChart 获取退信率图表
+// getTaskBounceRateChart
func (s *TaskStatService) getTaskBounceRateChart(taskId int64, domain string, startTime, endTime int64) map[string]interface{} {
query := s.buildBaseQuery(taskId, domain, startTime, endTime)
columnType, xAxisField := s.prepareChartData(startTime, endTime)
@@ -217,7 +211,7 @@ func (s *TaskStatService) getTaskBounceRateChart(taskId int64, domain string, st
}
}
-// getTaskOpenRateChart 获取打开率图表
+// getTaskOpenRateChart
func (s *TaskStatService) getTaskOpenRateChart(taskId int64, domain string, startTime, endTime int64) map[string]interface{} {
query := s.buildBaseQuery(taskId, domain, startTime, endTime)
query.LeftJoin("mailstat_opened o", "sm.postfix_message_id=o.postfix_message_id")
@@ -243,7 +237,7 @@ func (s *TaskStatService) getTaskOpenRateChart(taskId int64, domain string, star
}
}
-// getTaskClickRateChart 获取点击率图表
+// getTaskClickRateChart
func (s *TaskStatService) getTaskClickRateChart(taskId int64, domain string, startTime, endTime int64) map[string]interface{} {
query := s.buildBaseQuery(taskId, domain, startTime, endTime)
query.LeftJoin("mailstat_clicked c", "sm.postfix_message_id=c.postfix_message_id")
@@ -269,7 +263,7 @@ func (s *TaskStatService) getTaskClickRateChart(taskId int64, domain string, sta
}
}
-// getTaskMailProviders 获取邮件服务商统计
+// getTaskMailProviders
func (s *TaskStatService) getTaskMailProviders(taskId int64, domain string, startTime, endTime int64) []map[string]interface{} {
query := s.buildBaseQuery(taskId, domain, startTime, endTime)
query.LeftJoin("mailstat_opened o", "sm.postfix_message_id=o.postfix_message_id")
@@ -307,11 +301,11 @@ func (s *TaskStatService) getTaskMailProviders(taskId int64, domain string, star
return providers
}
-// getTaskSendMailChart 获取发送邮件图表数据
+// getTaskSendMailChart
func (s *TaskStatService) getTaskSendMailChart(taskId int64, domain string, startTime, endTime int64) map[string]interface{} {
query := s.buildBaseQuery(taskId, domain, startTime, endTime)
- // 根据时间跨度决定按小时还是按天统计
+ // Depending on the time span, decide whether to count by the hour or day
columnType, xAxisField := s.prepareChartData(startTime, endTime)
query.Fields(