Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss into dev

@@ -3,6 +3,8 @@ package comment
 import (
 import (
 	"context"
 	"context"
 
 
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/message"
+
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
@@ -83,18 +85,18 @@ func (l *MiniCreateArticleCommentLogic) MiniCreateArticleComment(req *types.Mini
 		}
 		}
 	}
 	}
 	var atWhoList []*domain.User
 	var atWhoList []*domain.User
+	var atWhoIds = make([]int64, 0)
 	if len(req.AtWho) > 0 {
 	if len(req.AtWho) > 0 {
-		uids := []int64{}
 		for _, val := range req.AtWho {
 		for _, val := range req.AtWho {
-			uids = append(uids, val.Id)
+			atWhoIds = append(atWhoIds, val.Id)
 		}
 		}
-		uids = lo.Uniq(uids)
-		queryOption := domain.NewQueryOptions().WithFindOnly().WithKV("ids", uids)
+		atWhoIds = lo.Uniq(atWhoIds)
+		queryOption := domain.NewQueryOptions().WithFindOnly().WithKV("ids", atWhoIds)
 		_, atWhoList, err = l.svcCtx.UserRepository.Find(l.ctx, conn, queryOption)
 		_, atWhoList, err = l.svcCtx.UserRepository.Find(l.ctx, conn, queryOption)
 		if err != nil {
 		if err != nil {
 			return nil, xerr.NewErrMsgErr("检查@的人员失败", err)
 			return nil, xerr.NewErrMsgErr("检查@的人员失败", err)
 		}
 		}
-		if len(uids) != len(atWhoList) {
+		if len(atWhoIds) != len(atWhoList) {
 			return nil, xerr.NewErrMsg("检查@的人员失败")
 			return nil, xerr.NewErrMsg("检查@的人员失败")
 		}
 		}
 	}
 	}
@@ -187,6 +189,21 @@ func (l *MiniCreateArticleCommentLogic) MiniCreateArticleComment(req *types.Mini
 				return err
 				return err
 			}
 			}
 		}
 		}
+
+		// 创建回复消息
+		var atAllIds = make([]int64, 0)
+		atAllIds = append(atAllIds, newComment.ToUserId)
+		atAllIds = append(atAllIds, atWhoIds...)
+		var messageLogic = message.NewMiniBusinessLogic(l.ctx, l.svcCtx)
+		if pComment != nil {
+			err = messageLogic.CommentReply(c, pComment.ArticleId, pComment.SectionId, pComment.Id, req.Content, atAllIds) // 对评论回复
+		} else {
+			err = messageLogic.CommentArticle(c, req.ArtitcleId, req.SectionId, req.Content, atAllIds) // 对文章回复
+		}
+		if err != nil {
+			return err
+		}
+
 		return nil
 		return nil
 	}, true)
 	}, true)
 
 

@@ -207,23 +207,23 @@ func (l *MiniBusinessLogic) MiniBusiness(req *types.MessageBusinessRequest) (res
 }
 }
 
 
 // CommentArticle 评论文章
 // CommentArticle 评论文章
-func (l *MiniBusinessLogic) CommentArticle(conn transaction.Conn, articleId int64, content string, at []int64) (err error) {
-	return l.createMessage(conn, domain.MsgTypeReply, domain.OptTypeArticle, articleId, 0, content, at)
+func (l *MiniBusinessLogic) CommentArticle(conn transaction.Conn, articleId int64, sectionId int64, content string, at []int64) (err error) {
+	return l.createMessage(conn, domain.MsgTypeReply, domain.OptTypeArticle, articleId, sectionId, 0, content, at)
 }
 }
 
 
 // CommentReply 评论回复
 // CommentReply 评论回复
-func (l *MiniBusinessLogic) CommentReply(conn transaction.Conn, articleId int64, commentId int64, content string, at []int64) (err error) {
-	return l.createMessage(conn, domain.MsgTypeReply, domain.OptTypeComment, articleId, commentId, content, at)
+func (l *MiniBusinessLogic) CommentReply(conn transaction.Conn, articleId int64, sectionId int64, commentId int64, content string, at []int64) (err error) {
+	return l.createMessage(conn, domain.MsgTypeReply, domain.OptTypeComment, articleId, sectionId, commentId, content, at)
 }
 }
 
 
 // LikeArticle 点赞文章
 // LikeArticle 点赞文章
 func (l *MiniBusinessLogic) LikeArticle(conn transaction.Conn, articleId int64, at int64) (err error) {
 func (l *MiniBusinessLogic) LikeArticle(conn transaction.Conn, articleId int64, at int64) (err error) {
-	return l.createMessage(conn, domain.MsgTypeLike, domain.OptTypeArticle, articleId, 0, "", []int64{at})
+	return l.createMessage(conn, domain.MsgTypeLike, domain.OptTypeArticle, articleId, 0, 0, "", []int64{at})
 }
 }
 
 
 // LikeComment 点赞评论
 // LikeComment 点赞评论
-func (l *MiniBusinessLogic) LikeComment(conn transaction.Conn, articleId int64, commentId int64, at int64) (err error) {
-	return l.createMessage(conn, domain.MsgTypeLike, domain.OptTypeComment, articleId, commentId, "", []int64{at})
+func (l *MiniBusinessLogic) LikeComment(conn transaction.Conn, articleId int64, sectionId int64, commentId int64, at int64) (err error) {
+	return l.createMessage(conn, domain.MsgTypeLike, domain.OptTypeComment, articleId, sectionId, commentId, "", []int64{at})
 }
 }
 
 
 func (l *MiniBusinessLogic) createMessage(
 func (l *MiniBusinessLogic) createMessage(
@@ -231,6 +231,7 @@ func (l *MiniBusinessLogic) createMessage(
 	msgType domain.MsgBusinessType,
 	msgType domain.MsgBusinessType,
 	optType domain.MsgBusinessOpt,
 	optType domain.MsgBusinessOpt,
 	articleId int64,
 	articleId int64,
+	sectionId int64,
 	commentId int64,
 	commentId int64,
 	content string,
 	content string,
 	at []int64) (err error) {
 	at []int64) (err error) {
@@ -245,6 +246,7 @@ func (l *MiniBusinessLogic) createMessage(
 			UserId:      userToken.UserId,
 			UserId:      userToken.UserId,
 			RecipientId: at[i],
 			RecipientId: at[i],
 			ArticleId:   articleId,
 			ArticleId:   articleId,
+			SectionId:   sectionId,
 			CommentId:   commentId,
 			CommentId:   commentId,
 			Content:     content,
 			Content:     content,
 		}
 		}

@@ -17,6 +17,7 @@ type MessageBusiness struct {
 	UserId      int64                 `json:"userId"`              // 操作人用户ID
 	UserId      int64                 `json:"userId"`              // 操作人用户ID
 	RecipientId int64                 `json:"recipientId"`         // 接收人用户ID
 	RecipientId int64                 `json:"recipientId"`         // 接收人用户ID
 	ArticleId   int64                 `json:"articleId,omitempty"` // 文章ID
 	ArticleId   int64                 `json:"articleId,omitempty"` // 文章ID
+	SectionId   int64                 `json:"sectionId,omitempty"` // 段落ID
 	CommentId   int64                 `json:"commentId,omitempty"` // 评论ID
 	CommentId   int64                 `json:"commentId,omitempty"` // 评论ID
 	Content     string                `json:"content,omitempty"`   // 消息内容
 	Content     string                `json:"content,omitempty"`   // 消息内容
 	CreatedAt   int64                 `json:",omitempty"`
 	CreatedAt   int64                 `json:",omitempty"`

@@ -13,6 +13,7 @@ type MessageBusiness struct {
 	UserId      int64           `json:"userId"`      // 操作人用户ID
 	UserId      int64           `json:"userId"`      // 操作人用户ID
 	RecipientId int64           `json:"recipientId"` // 接收人用户ID
 	RecipientId int64           `json:"recipientId"` // 接收人用户ID
 	ArticleId   int64           `json:"articleId"`   // 文章ID
 	ArticleId   int64           `json:"articleId"`   // 文章ID
+	SectionId   int64           `json:"sectionId"`   // 段落ID
 	CommentId   int64           `json:"commentId"`   // 评论ID
 	CommentId   int64           `json:"commentId"`   // 评论ID
 	Content     string          `json:"content"`     // 消息内容
 	Content     string          `json:"content"`     // 消息内容
 	CreatedAt   int64           `json:",omitempty"`
 	CreatedAt   int64           `json:",omitempty"`
@@ -35,7 +36,7 @@ const (
 
 
 const (
 const (
 	OptTypeArticle    MsgBusinessOpt = 1 // 操作分类-针对文章
 	OptTypeArticle    MsgBusinessOpt = 1 // 操作分类-针对文章
-	OptTypeComment    MsgBusinessOpt = 2 // 操作分类-针对评论
+	OptTypeComment    MsgBusinessOpt = 2 // 操作分类-针对评论（）
 	OptTypeDiscussion MsgBusinessOpt = 3 // 操作分类-针对讨论
 	OptTypeDiscussion MsgBusinessOpt = 3 // 操作分类-针对讨论
 )
 )