Merge branch 'dev' into test

@@ -102,7 +102,7 @@ func (l *MiniSetUserLikeLogic) cancelSetUserLikeArticle(req *types.MiniSetUserLi
 
 		// 删除点赞文章消息
 		var messageLogic = message.NewMiniBusinessLogic(l.ctx, l.svcCtx)
-		err = messageLogic.UnLikeArticle(c, articleInfo.Id)
+		err = messageLogic.UnLikeArticle(c, articleInfo.Id, articleInfo.AuthorId)
 		if err != nil {
 			return err
 		}
@@ -183,7 +183,7 @@ func (l *MiniSetUserLikeLogic) cancelSetUserLikeComment(req *types.MiniSetUserLi
 
 		// 删除点赞评论消息
 		var messageLogic = message.NewMiniBusinessLogic(l.ctx, l.svcCtx)
-		err = messageLogic.UnLikeComment(c, commentInfo.ArticleId, commentInfo.Id)
+		err = messageLogic.UnLikeComment(c, commentInfo.ArticleId, commentInfo.Id, commentInfo.FromUserId)
 		if err != nil {
 			return err
 		}

@@ -248,13 +248,13 @@ func (l *MiniBusinessLogic) LikeComment(conn transaction.Conn, articleId int64,
 }
 
 // UnLikeArticle 取消点赞文章
-func (l *MiniBusinessLogic) UnLikeArticle(conn transaction.Conn, articleId int64) (err error) {
-	return l.deleteMessage(conn, domain.OptTypeArticle, articleId, 0)
+func (l *MiniBusinessLogic) UnLikeArticle(conn transaction.Conn, articleId int64, recipientId int64) (err error) {
+	return l.deleteMessage(conn, domain.OptTypeArticle, articleId, 0, recipientId)
 }
 
 // UnLikeComment 取消点赞评论
-func (l *MiniBusinessLogic) UnLikeComment(conn transaction.Conn, articleId int64, commentId int64) (err error) {
-	return l.deleteMessage(conn, domain.OptTypeComment, articleId, commentId)
+func (l *MiniBusinessLogic) UnLikeComment(conn transaction.Conn, articleId int64, commentId int64, recipientId int64) (err error) {
+	return l.deleteMessage(conn, domain.OptTypeComment, articleId, commentId, recipientId)
 }
 
 func (l *MiniBusinessLogic) createMessage(
@@ -287,14 +287,14 @@ func (l *MiniBusinessLogic) createMessage(
 	return nil
 }
 
-func (l *MiniBusinessLogic) deleteMessage(conn transaction.Conn, optType domain.MsgBusinessOpt, articleId int64, commentId int64) (err error) {
+func (l *MiniBusinessLogic) deleteMessage(conn transaction.Conn, optType domain.MsgBusinessOpt, articleId int64, commentId int64, recipientId int64) (err error) {
 	var userToken = contextdata.GetUserTokenFromCtx(l.ctx)
 
 	queryOption := domain.NewQueryOptions().WithFindOnly().WithOffsetLimit(1, 1).
 		MustWithKV("type", domain.MsgTypeLike).
 		MustWithKV("optType", optType).
 		MustWithKV("companyId", userToken.CompanyId).
-		MustWithKV("recipientId", userToken.UserId).
+		MustWithKV("recipientId", recipientId).
 		MustWithKV("articleId", articleId).
 		MustWithKV("commentId", commentId)