x

internal/logic/public/user/getAgentRealtimeLogic.go

@@ -37,6 +37,10 @@ func (l *GetAgentRealtimeLogic) GetAgentRealtime(req *types.GetAgentRealtimeRequ
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
 
+	now := time.Now()
+	currentMonthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
+	lastMonthStart := currentMonthStart.AddDate(0, -1, 0)
+
 	var views, lastMonthViews int64
 	var installs int64
 	var paidCount int64
@@ -45,7 +49,7 @@ func (l *GetAgentRealtimeLogic) GetAgentRealtime(req *types.GetAgentRealtimeRequ
 	lokiCfg := l.svcCtx.Config.Loki
 	if lokiCfg.Enable && lokiCfg.URL != "" && u.ReferCode != "" {
 		lokiClient := loki.NewClient(lokiCfg.URL)
-		lokiStats, err := lokiClient.GetInviteCodeStats(l.ctx, u.ReferCode, 30)
+		lokiStats, err := lokiClient.GetInviteCodeMonthlyStats(l.ctx, u.ReferCode, now)
 		if err != nil {
 			l.Errorw("[GetAgentRealtime] Failed to fetch Loki stats",
 				logger.Field("error", err.Error()),
@@ -66,7 +70,7 @@ func (l *GetAgentRealtimeLogic) GetAgentRealtime(req *types.GetAgentRealtimeRequ
 	// 3. 从数据库获取安装量（被邀请注册用户数）
 	err = l.svcCtx.DB.WithContext(l.ctx).
 		Model(&user.User{}).
-		Where("referer_id = ?", u.Id).
+		Where("referer_id = ? AND created_at >= ? AND created_at < ?", u.Id, currentMonthStart, now).
 		Count(&installs).Error
 	if err != nil {
 		l.Errorw("[GetAgentRealtime] Failed to count installs",
@@ -79,7 +83,8 @@ func (l *GetAgentRealtimeLogic) GetAgentRealtime(req *types.GetAgentRealtimeRequ
 	err = l.svcCtx.DB.WithContext(l.ctx).
 		Table("`order`").
 		Joins("LEFT JOIN user ON user.id = `order`.user_id").
-		Where("user.referer_id = ? AND `order`.status IN ?", u.Id, []int{2, 5}).
+		Where("user.referer_id = ? AND `order`.status IN ? AND `order`.updated_at >= ? AND `order`.updated_at < ?",
+			u.Id, []int{2, 5}, currentMonthStart, now).
 		Distinct("`order`.user_id").
 		Count(&paidCount).Error
 	if err != nil {
@@ -93,7 +98,7 @@ func (l *GetAgentRealtimeLogic) GetAgentRealtime(req *types.GetAgentRealtimeRequ
 	growthRate := calculateGrowthRate([]int{int(lastMonthViews), int(views)})
 
 	// 6. 计算付费用户环比增长率
-	paidGrowthRate := l.calculatePaidGrowthRate(u.Id)
+	paidGrowthRate := l.calculatePaidGrowthRate(u.Id, currentMonthStart, lastMonthStart)
 
 	return &types.GetAgentRealtimeResponse{
 		Total:          views,
@@ -107,19 +112,14 @@ func (l *GetAgentRealtimeLogic) GetAgentRealtime(req *types.GetAgentRealtimeRequ
 }
 
 // calculatePaidGrowthRate 计算付费用户的环比增长率
-func (l *GetAgentRealtimeLogic) calculatePaidGrowthRate(userId int64) string {
+func (l *GetAgentRealtimeLogic) calculatePaidGrowthRate(userId int64, currentMonthStart, lastMonthStart time.Time) string {
 	db := l.svcCtx.DB
 
-	// 获取本月第一天和上月第一天
-	now := time.Now()
-	currentMonthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
-	lastMonthStart := currentMonthStart.AddDate(0, -1, 0)
-
 	// 查询本月付费用户数（本月有新订单的）
 	var currentMonthCount int64
 	err := db.Table("`order` o").
 		Joins("JOIN user u ON o.user_id = u.id").
-		Where("u.referer_id = ? AND o.status IN (?, ?) AND o.created_at >= ?",
+		Where("u.referer_id = ? AND o.status IN (?, ?) AND o.updated_at >= ?",
 			userId, 2, 5, currentMonthStart).
 		Distinct("o.user_id").
 		Count(&currentMonthCount).Error
@@ -135,7 +135,7 @@ func (l *GetAgentRealtimeLogic) calculatePaidGrowthRate(userId int64) string {
 	var lastMonthCount int64
 	err = db.Table("`order` o").
 		Joins("JOIN user u ON o.user_id = u.id").
-		Where("u.referer_id = ? AND o.status IN (?, ?) AND o.created_at >= ? AND o.created_at < ?",
+		Where("u.referer_id = ? AND o.status IN (?, ?) AND o.updated_at >= ? AND o.updated_at < ?",
 			userId, 2, 5, lastMonthStart, currentMonthStart).
 		Distinct("o.user_id").
 		Count(&lastMonthCount).Error