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

@@ -352,9 +352,10 @@ type(
         ItemFlag int `json:"itemFlag"` //0:默认查询所有 1:他的帖子  2：他的评论/回复 4：他收到的赞 8：TA的圆桌讨论 16：被采纳
         ItemFlag int `json:"itemFlag"` //0:默认查询所有 1:他的帖子  2：他的评论/回复 4：他收到的赞 8：TA的圆桌讨论 16：被采纳
     }
     }
     UserStatisticsResponse{
     UserStatisticsResponse{
-        TotalArticle int `json:"totalArticle"`
-        TotalComment int `json:"totalComment"`
-        TotalLoved   int `json:"totalLoved"`
+        TotalArticle int `json:"totalArticle"` // 累计发布文章
+        TotalComment int `json:"totalComment"` // 累计发布评论
+        TotalLoved   int `json:"totalLoved"` // 累计赞别人
+        TotalBeLoved int `json:"totalBeLoved"` // 累计收到的赞
     }
     }
     StatisticsItem{
     StatisticsItem{
         ItemFlag int `json:"itemFlag"`     // 1:他的帖子  2：他的评论/回复 4：他收到的赞 8：TA的圆桌讨论 16：被采纳
         ItemFlag int `json:"itemFlag"`     // 1:他的帖子  2：他的评论/回复 4：他收到的赞 8：TA的圆桌讨论 16：被采纳

@@ -35,6 +35,7 @@ func (l *SystemUserStatisticsLogic) SystemUserStatistics(req *types.UserStatisti
 		TotalArticle: s.TotalArticle,
 		TotalArticle: s.TotalArticle,
 		TotalComment: s.TotalComment,
 		TotalComment: s.TotalComment,
 		TotalLoved:   s.TotalLoved,
 		TotalLoved:   s.TotalLoved,
+		TotalBeLoved: s.TotalBeLoved,
 	}
 	}
 	return
 	return
 }
 }
@@ -57,8 +58,13 @@ func StatisticsItems(ctx context.Context, svcCtx *svc.ServiceContext, companyId,
 	}
 	}
 	if (itemFlag & TotalLoved) > 0 {
 	if (itemFlag & TotalLoved) > 0 {
 		var total int64
 		var total int64
-		total, _, _ = svcCtx.UserLoveFlagRepository.Find(ctx, conn, domain.IndexCompanyId(companyId)().WithCountOnly().MustWithKV("userId", userId))
-		s.TotalComment = int(total)
+		total, _, _ = svcCtx.UserLoveFlagRepository.Find(ctx, conn, domain.IndexCompanyId(0)().WithCountOnly().MustWithKV("userId", userId))
+		s.TotalLoved = int(total)
+	}
+	if (itemFlag & TotalBeLoved) > 0 {
+		var total int64
+		total, _, _ = svcCtx.UserLoveFlagRepository.Find(ctx, conn, domain.IndexCompanyId(0)().WithCountOnly().MustWithKV("toUserId", userId))
+		s.TotalBeLoved = int(total)
 	}
 	}
 	return
 	return
 }
 }
@@ -67,12 +73,14 @@ type Statistics struct {
 	TotalArticle int `json:"totalArticle"`
 	TotalArticle int `json:"totalArticle"`
 	TotalComment int `json:"totalComment"`
 	TotalComment int `json:"totalComment"`
 	TotalLoved   int `json:"totalLoved"`
 	TotalLoved   int `json:"totalLoved"`
+	TotalBeLoved int `json:"totalBeLoved"`
 }
 }
 
 
 const (
 const (
-	TotalArticle = 1
-	TotalComment = 2
-	TotalLoved   = 4
+	TotalArticle = 1 // 累计发布文章
+	TotalComment = 2 // 累计发布评论
+	TotalLoved   = 4 // 累计赞别人
+	TotalBeLoved = 8 // 累计收到的赞
 )
 )
 
 
 func NewStatisticsItem(itemFlag int, value float64) types.StatisticsItem {
 func NewStatisticsItem(itemFlag int, value float64) types.StatisticsItem {

@@ -642,9 +642,10 @@ type UserStatisticsRequest struct {
 }
 }
 
 
 type UserStatisticsResponse struct {
 type UserStatisticsResponse struct {
-	TotalArticle int `json:"totalArticle"`
-	TotalComment int `json:"totalComment"`
-	TotalLoved   int `json:"totalLoved"`
+	TotalArticle int `json:"totalArticle"` // 累计发布文章
+	TotalComment int `json:"totalComment"` // 累计发布评论
+	TotalLoved   int `json:"totalLoved"`   // 累计赞别人
+	TotalBeLoved int `json:"totalBeLoved"` // 累计收到的赞
 }
 }
 
 
 type StatisticsItem struct {
 type StatisticsItem struct {