|
...
|
...
|
@@ -29,11 +29,11 @@ func NewMiniUserNewsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Mini |
|
|
|
|
|
|
|
func (l *MiniUserNewsLogic) MiniUserNews(req *types.MiniUserNewsRequest) (resp *types.MiniUserNewsResposne, err error) {
|
|
|
|
var (
|
|
|
|
conn = l.svcCtx.DefaultDBConn()
|
|
|
|
user *domain.User
|
|
|
|
userToken = contextdata.GetUserTokenFromCtx(l.ctx)
|
|
|
|
articles []*domain.Article
|
|
|
|
readedArticles = make([]*domain.UserReadArticle, 0)
|
|
|
|
conn = l.svcCtx.DefaultDBConn()
|
|
|
|
user *domain.User
|
|
|
|
userToken = contextdata.GetUserTokenFromCtx(l.ctx)
|
|
|
|
articles []*domain.Article
|
|
|
|
readArticles = make([]*domain.UserReadArticle, 0)
|
|
|
|
)
|
|
|
|
if user, err = l.svcCtx.UserRepository.FindOne(l.ctx, conn, userToken.UserId); err != nil {
|
|
|
|
return nil, xerr.NewErrMsgErr("用户不存在", err)
|
|
...
|
...
|
@@ -55,9 +55,9 @@ func (l *MiniUserNewsLogic) MiniUserNews(req *types.MiniUserNewsRequest) (resp * |
|
|
|
})
|
|
|
|
if len(articleIds) > 0 {
|
|
|
|
resp.LastArticleId = articleIds[len(articleIds)-1]
|
|
|
|
_, readedArticles, _ = l.svcCtx.UserReadArticleRepository.Find(l.ctx, conn, domain.IndexCompanyId(userToken.CompanyId)().WithKV("articleIds", articleIds))
|
|
|
|
_, readArticles, _ = l.svcCtx.UserReadArticleRepository.Find(l.ctx, conn, domain.IndexCompanyId(userToken.CompanyId)().WithKV("articleIds", articleIds))
|
|
|
|
}
|
|
|
|
readArticlesMap := lo.KeyBy(readedArticles, func(item *domain.UserReadArticle) int64 {
|
|
|
|
readArticlesMap := lo.KeyBy(readArticles, func(item *domain.UserReadArticle) int64 {
|
|
|
|
return item.ArticleId
|
|
|
|
})
|
|
|
|
lo.ForEach(articles, func(item *domain.Article, index int) {
|
...
|
...
|
|
