🎨 优化文章和支付回调，新增返回分享用接口

service/app/user.go

@@ -250,36 +250,6 @@ func (u *AppUserService) GetTeacherList(p common.PageInfo) (list []vo.TeacherInf
 		return nil, 0, err
 	}
 
-	// 批量查询所有教师的粉丝数
-	var teacherIDs []uint
-	for _, t := range list {
-		teacherIDs = append(teacherIDs, t.ID)
-	}
-	type FansCount struct {
-		TeacherId uint
-		Count     int64
-	}
-	var fansCounts []FansCount
-	if len(teacherIDs) > 0 {
-		err = global.GVA_DB.Model(&app.Follow{}).
-			Select("teacher_id, count(*) as count").
-			Where("teacher_id IN ?", teacherIDs).
-			Group("teacher_id").
-			Scan(&fansCounts).Error
-		if err != nil {
-			global.GVA_LOG.Error("批量查询教师粉丝数失败", zap.Error(err))
-			return nil, 0, err
-		}
-	}
-	// 映射粉丝数
-	fansMap := make(map[uint]int64)
-	for _, fc := range fansCounts {
-		fansMap[fc.TeacherId] = fc.Count
-	}
-	for i := range list {
-		list[i].Follow = fansMap[list[i].ID]
-	}
-
 	return
 }
 
@@ -320,16 +290,6 @@ func (u *AppUserService) GetFollowTeacherList(id uint, p common.PageInfo) (list
 		return
 	}
 
-	// 获取每个教师的粉丝数
-	for i := range list {
-		followCount, err := u.GetTeacherFansCount(list[i].ID)
-		if err != nil {
-			global.GVA_LOG.Error("查询教师粉丝数失败", zap.Error(err))
-			return nil, 0, err
-		}
-		list[i].Follow = followCount
-	}
-
 	return
 }
 
@@ -407,6 +367,12 @@ func (u *AppUserService) GetVipTeacherList(p common.PageInfo, userId uint) (list
 		global.GVA_LOG.Error("获取用户讲师包月信息失败：", zap.Error(err))
 		return nil, 0, err
 	}
+	var TeacherVipIds []uint
+	err = global.GVA_DB.Model(&app.UserTeacherVip{}).Where("user_id = ? and is_expire = 1", userId).Select("teacher_vip_id").Scan(&TeacherVipIds).Error
+	if len(vipTeacherIds) == 0 {
+		global.GVA_LOG.Error("获取讲师包月信息失败：", zap.Error(err))
+		return nil, 0, nil
+	}
 
 	db := global.GVA_DB.Model(&user.User{}).Where("user_type = ? and id in ?", 2, vipTeacherIds)
 
@@ -425,14 +391,26 @@ func (u *AppUserService) GetVipTeacherList(p common.PageInfo, userId uint) (list
 		return nil, 0, err
 	}
 
-	// 获取每个教师的粉丝数
+	// 获取用户包月信息
+	var vipInfos []vo.TeacherVipInfo
+	err = global.GVA_DB.Table("user_teacher_vip AS u").
+		Select("u.teacher_id, a.title, u.expire_at").
+		Joins("LEFT JOIN app_teacher_vip AS a ON u.teacher_vip_id = a.id").
+		Where("u.user_id = ?", userId).
+		Scan(&vipInfos).Error
+	if err != nil {
+		global.GVA_LOG.Error("查询用户包月信息失败", zap.Error(err))
+		return nil, 0, err
+	}
+	// 1. 按TeacherId分组
+	vipInfoMap := make(map[uint][]vo.TeacherVipInfo)
+	for _, v := range vipInfos {
+		vipInfoMap[v.TeacherId] = append(vipInfoMap[v.TeacherId], v)
+	}
+
+	// 2. 给每个讲师赋值自己的VIPInfo
 	for i := range list {
-		followCount, err := u.GetTeacherFansCount(list[i].ID)
-		if err != nil {
-			global.GVA_LOG.Error("查询教师粉丝数失败", zap.Error(err))
-			return nil, 0, err
-		}
-		list[i].Follow = followCount
+		list[i].VIPInfo = vipInfoMap[list[i].ID]
 	}
 
 	return