Merge branch 'dev' into test

@@ -153,7 +153,8 @@ func (l *MiniSubscribeLogic) ReplyComment(conn transaction.Conn, article *domain
 		msg.ToUser = openId
 		msg.Page = fmt.Sprintf("/pages/detail/more-comment?id=%v", article.Id) //跳转页面 帖子评论聚合页
 		//备注
-		msg.Data["thing9"] = &subscribe.DataItem{Value: fmt.Sprintf("您的帖子最近已有%v人评论，点击查看详情", article.CountComment)}
+		userCount, _ := l.svcCtx.ArticleCommentRepository.CommentUserCount(l.ctx, conn, comment.CompanyId, comment.ArticleId)
+		msg.Data["thing9"] = &subscribe.DataItem{Value: fmt.Sprintf("您的帖子最近已有%v人评论，点击查看详情", userCount)}
 		//发送微信订阅消息
 		err = subCtx.Send(msg)
 		err = l.saveAndDecrease(conn, comment.CompanyId, article.AuthorId, domain.SubscribeTypeReplyComment, msg, err)
@@ -168,9 +169,9 @@ func (l *MiniSubscribeLogic) ReplyComment(conn transaction.Conn, article *domain
 			msg.ToUser = toOpenId
 			msg.Page = fmt.Sprintf("/pages/detail/reply-comment?id=%v&commentId=%v", article.Id, comment.Pid) //跳转页面评论聚合页
 			//备注
-			parent, err := l.svcCtx.ArticleCommentRepository.FindOne(l.ctx, conn, comment.Pid)
-			if err == nil && parent.Id > 0 {
-				msg.Data["thing9"] = &subscribe.DataItem{Value: fmt.Sprintf("您的评论最近已有%v人回复，点击查看详情", parent.CountReply)}
+			replyCount, err := l.svcCtx.ArticleCommentRepository.ReplyUserCount(l.ctx, conn, comment.CompanyId, comment.Pid)
+			if err == nil {
+				msg.Data["thing9"] = &subscribe.DataItem{Value: fmt.Sprintf("您的评论最近已有%v人回复，点击查看详情", replyCount)}
 				//发送微信订阅消息
 				err = subCtx.Send(msg)
 				err = l.saveAndDecrease(conn, comment.CompanyId, comment.ToUserId, domain.SubscribeTypeReplyComment, msg, err)
@@ -210,6 +211,10 @@ func (l *MiniSubscribeLogic) LikeArticle(conn transaction.Conn, article *domain.
 	if err != nil || openId == "" {
 		return nil
 	}
+	newArticle, err := l.svcCtx.ArticleRepository.FindOne(l.ctx, conn, article.Id)
+	if err != nil {
+		return xerr.NewErrMsgErr("未获取到帖子信息", err)
+	}
 	msg := &subscribe.Message{
 		ToUser:     openId,
 		TemplateID: domain.SubscribeTemplateLike,
@@ -222,7 +227,7 @@ func (l *MiniSubscribeLogic) LikeArticle(conn transaction.Conn, article *domain.
 			//动态内容
 			"thing8": &subscribe.DataItem{Value: article.GetSubscribeMessageTitle()},
 			//被赞次数
-			"number4": &subscribe.DataItem{Value: article.CountLove},
+			"number4": &subscribe.DataItem{Value: newArticle.CountLove},
 			//温馨提示
 			"thing5": &subscribe.DataItem{Value: "这条内容很受欢迎哦，快来看看吧"},
 		},
@@ -243,6 +248,11 @@ func (l *MiniSubscribeLogic) LikeComment(conn transaction.Conn, comment *domain.
 	if err != nil || openId == "" {
 		return nil
 	}
+	//获取被赞次数
+	newComment, err := l.svcCtx.ArticleCommentRepository.FindOne(l.ctx, conn, comment.Id)
+	if err != nil {
+		return xerr.NewErrMsgErr("未获取到评论信息", err)
+	}
 	msg := &subscribe.Message{
 		ToUser:     openId,
 		TemplateID: domain.SubscribeTemplateLike,
@@ -255,7 +265,7 @@ func (l *MiniSubscribeLogic) LikeComment(conn transaction.Conn, comment *domain.
 			//动态内容
 			"thing8": &subscribe.DataItem{Value: comment.GetSubscribeMessageContent()},
 			//被赞次数
-			"number4": &subscribe.DataItem{Value: comment.CountUserLove},
+			"number4": &subscribe.DataItem{Value: newComment.CountUserLove},
 			//温馨提示
 			"thing5": &subscribe.DataItem{Value: "这条内容很受欢迎哦，快来看看吧"},
 		},

@@ -437,6 +437,28 @@ func (repository *ArticleCommentRepository) CustomSearchBy(ctx context.Context,
 
 }
 
+// CommentUserCount 统计评论人数
+func (repository *ArticleCommentRepository) CommentUserCount(ctx context.Context, conn transaction.Conn, companyId int64, articleId int64) (int64, error) {
+	var (
+		err error
+		tx  = conn.DB()
+		c   int64
+	)
+	err = tx.Model(&models.ArticleComment{}).Where("company_id = ? and article_id = ?", companyId, articleId).Group("user_id").Count(&c).Error
+	return c, err
+}
+
+// ReplyUserCount 统计回复人数
+func (repository *ArticleCommentRepository) ReplyUserCount(ctx context.Context, conn transaction.Conn, companyId int64, commentId int64) (int64, error) {
+	var (
+		err error
+		tx  = conn.DB()
+		c   int64
+	)
+	err = tx.Model(&models.ArticleComment{}).Where("company_id = ? and pid = ?", companyId, commentId).Group("user_id").Count(&c).Error
+	return c, err
+}
+
 func NewArticleCommentRepository(cache *cache.CachedRepository) domain.ArticleCommentRepository {
 	return &ArticleCommentRepository{CachedRepository: cache}
 }

@@ -80,6 +80,10 @@ type ArticleCommentRepository interface {
 	// 特定的查询
 	CustomSearchBy(ctx context.Context, conn transaction.Conn, companyId int64, page int, size int,
 		topId int64, articleTitle string, contentLike string, fromUserId int64, show int, createdAtRange [2]int64) (int, []*ArticleCommentShow, error)
+	// CommentUserCount 统计帖子评论人数
+	CommentUserCount(ctx context.Context, conn transaction.Conn, companyId int64, articleId int64) (int64, error)
+	// ReplyUserCount 统计评论回复人数
+	ReplyUserCount(ctx context.Context, conn transaction.Conn, companyId int64, commentId int64) (int64, error)
 }
 
 // 运营点数 填写的最大值