feat: 补齐五块缺失功能(记录丢数据/文章正文/提醒管理/我的页入口/分享/关注)
P0 修数据问题 - 记录弹层有 5 个输入框从未绑定,用户填的便便备注、饮食内容、药品名称、 剂量、消费备注全部丢弃;用药记录因此只存下「用药记录」四个字。已全部绑定并入库 - 异常观察保存时写死「风险中」,AI 实际判定的等级被丢掉。改为使用 riskData 的真实 risk_level,并把成因与建议存进备注 文章正文 - 早期 seed 的 4 篇文章 Content 全空,点开只是打开关联记录弹层,内容运营等于白做 - 补写 4 篇真实正文(疫苗驱虫/软便判断/换粮方案/养宠花销),遵循不诊断、 异常必提就医的护栏;对已存在的空正文做幂等回填 - 新增文章详情页,学习页与首页卡片改为打开正文 提醒管理 - 后端 CRUD 早已具备但小程序只读,用户改不了疫苗驱虫日期。提醒弹层支持增删改 - 修复后端 UpdateReminder 漏掉 type 字段导致改类型不生效 「我的」页 7 个死入口接活 - 提醒设置、健康记录、多宠物管理、会员权益分别落到对应功能 - 数据导出:汇总档案与记录为文本,可复制发给医生 - 意见反馈:新增 feedback 表与提交接口,后台加「意见反馈」管理页 - 关于我们:应用说明与免责声明 分享 - 各页面补 onShareAppMessage/onShareTimeline - 帖子分享按钮改用微信原生 open-type="share",删除原来点了没反应的空壳弹层 社区关注 - 新增 follows 表与关注/取关接口,「关注」tab 此前等同「推荐」, 现只显示已关注用户的帖子;帖子头部可直接关注,标记 followed / is_self Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -58,12 +58,20 @@ func tabTag(tab string) string {
|
||||
}
|
||||
}
|
||||
|
||||
// ListPosts 帖子分页列表
|
||||
func (s *Service) ListPosts(tab string, offset, limit int) ([]model.Post, int64, error) {
|
||||
// ListPosts 帖子分页列表。userID 用于「关注」tab 过滤和标记关注状态(可为空)。
|
||||
func (s *Service) ListPosts(userID, tab string, offset, limit int) ([]model.Post, int64, error) {
|
||||
q := s.db.Model(&model.Post{}).Where("status = ?", model.PostPublished)
|
||||
if tag := tabTag(tab); tag != "" {
|
||||
q = q.Where("JSON_CONTAINS(tags, ?)", `"`+tag+`"`)
|
||||
}
|
||||
if tab == "关注" {
|
||||
ids := s.followeeIDs(userID)
|
||||
if len(ids) == 0 {
|
||||
// 一个都没关注:返回空列表,而不是退化成「推荐」
|
||||
return []model.Post{}, 0, nil
|
||||
}
|
||||
q = q.Where("user_id IN ?", ids)
|
||||
}
|
||||
var total int64
|
||||
if err := q.Count(&total).Error; err != nil {
|
||||
return nil, 0, err
|
||||
@@ -73,6 +81,7 @@ func (s *Service) ListPosts(tab string, offset, limit int) ([]model.Post, int64,
|
||||
return nil, 0, err
|
||||
}
|
||||
s.attachPostImages(posts)
|
||||
s.markFollowed(userID, posts)
|
||||
return posts, total, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"strings"
|
||||
|
||||
"github.com/sundynix/pets-be/internal/model"
|
||||
)
|
||||
|
||||
// CreateFeedback 提交意见反馈
|
||||
func (s *Service) CreateFeedback(userID, content, contact string) (*model.Feedback, error) {
|
||||
content = strings.TrimSpace(content)
|
||||
if content == "" {
|
||||
return nil, errors.New("反馈内容不能为空")
|
||||
}
|
||||
if len([]rune(content)) > 1000 {
|
||||
return nil, errors.New("反馈内容太长了")
|
||||
}
|
||||
name := ""
|
||||
var u model.User
|
||||
if err := s.db.Select("nickname").First(&u, "id = ?", userID).Error; err == nil {
|
||||
name = u.Nickname
|
||||
}
|
||||
f := model.Feedback{UserID: userID, Nickname: name, Content: content, Contact: strings.TrimSpace(contact)}
|
||||
if err := s.db.Create(&f).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &f, nil
|
||||
}
|
||||
|
||||
// ListFeedbackAdmin 后台反馈分页
|
||||
func (s *Service) ListFeedbackAdmin(offset, limit int) ([]model.Feedback, int64, error) {
|
||||
var total int64
|
||||
s.db.Model(&model.Feedback{}).Count(&total)
|
||||
var list []model.Feedback
|
||||
err := s.db.Order("id desc").Offset(offset).Limit(limit).Find(&list).Error
|
||||
return list, total, err
|
||||
}
|
||||
|
||||
// SetFeedbackHandled 标记反馈已处理
|
||||
func (s *Service) SetFeedbackHandled(id string, handled bool) error {
|
||||
res := s.db.Model(&model.Feedback{}).Where("id = ?", id).Update("handled", handled)
|
||||
if res.Error != nil {
|
||||
return res.Error
|
||||
}
|
||||
if res.RowsAffected == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"github.com/sundynix/pets-be/internal/model"
|
||||
)
|
||||
|
||||
// FollowUser 关注某人(幂等;不能关注自己)
|
||||
func (s *Service) FollowUser(followerID, followeeID string) error {
|
||||
if followerID == "" || followeeID == "" {
|
||||
return errors.New("参数不完整")
|
||||
}
|
||||
if followerID == followeeID {
|
||||
return errors.New("不能关注自己")
|
||||
}
|
||||
var u model.User
|
||||
if err := s.db.Select("id").First(&u, "id = ?", followeeID).Error; err != nil {
|
||||
return ErrNotFound
|
||||
}
|
||||
f := model.Follow{FollowerID: followerID, FolloweeID: followeeID}
|
||||
return s.db.Where("follower_id = ? AND followee_id = ?", followerID, followeeID).
|
||||
FirstOrCreate(&f).Error
|
||||
}
|
||||
|
||||
// UnfollowUser 取消关注(幂等)
|
||||
func (s *Service) UnfollowUser(followerID, followeeID string) error {
|
||||
return s.db.Where("follower_id = ? AND followee_id = ?", followerID, followeeID).
|
||||
Delete(&model.Follow{}).Error
|
||||
}
|
||||
|
||||
// followeeIDs 我关注的所有人
|
||||
func (s *Service) followeeIDs(userID string) []string {
|
||||
var ids []string
|
||||
s.db.Model(&model.Follow{}).Where("follower_id = ?", userID).Pluck("followee_id", &ids)
|
||||
return ids
|
||||
}
|
||||
|
||||
// markFollowed 标记帖子作者是否已被我关注(用于前端显示「关注」按钮)
|
||||
func (s *Service) markFollowed(userID string, posts []model.Post) {
|
||||
if userID == "" || len(posts) == 0 {
|
||||
return
|
||||
}
|
||||
authors := make([]string, 0, len(posts))
|
||||
for i := range posts {
|
||||
if posts[i].UserID != "" && posts[i].UserID != userID {
|
||||
authors = append(authors, posts[i].UserID)
|
||||
}
|
||||
}
|
||||
if len(authors) == 0 {
|
||||
return
|
||||
}
|
||||
var followed []string
|
||||
s.db.Model(&model.Follow{}).
|
||||
Where("follower_id = ? AND followee_id IN ?", userID, authors).
|
||||
Pluck("followee_id", &followed)
|
||||
set := make(map[string]bool, len(followed))
|
||||
for _, id := range followed {
|
||||
set[id] = true
|
||||
}
|
||||
for i := range posts {
|
||||
posts[i].IsSelf = posts[i].UserID == userID
|
||||
posts[i].Followed = set[posts[i].UserID]
|
||||
}
|
||||
}
|
||||
|
||||
// ensureNotFound 供 handler 区分错误类型
|
||||
var _ = gorm.ErrRecordNotFound
|
||||
Reference in New Issue
Block a user