From 40d3bb9fe638a0bd79e829e7fd5114871101390b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 20 十一月 2025 10:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java
index abc3a70..9ef1d35 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java
@@ -3,11 +3,14 @@
import cn.lili.common.enums.CollectTypeEnum;
import cn.lili.common.properties.RocketmqCustomProperties;
import cn.lili.common.security.context.UserContext;
+import cn.lili.common.vo.PageVO;
import cn.lili.modules.goods.entity.vos.GoodsVO;
import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
import cn.lili.modules.lmk.domain.vo.*;
import cn.lili.modules.lmk.service.MySubscribeService;
import cn.lili.modules.lmk.service.VideoService;
+import cn.lili.modules.member.entity.vo.GoodsCollectionVO;
+import cn.lili.modules.member.service.GoodsCollectionService;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.CommentTagsEnum;
import cn.lili.rocketmq.tags.VideoTagsEnum;
@@ -52,8 +55,7 @@
private final LmkFileServiceImpl fileService;
private final RocketMQTemplate rocketMQTemplate;
private final VideoServiceMakeUpImpl serviceMakeUp;
-
-
+ private final GoodsCollectionService goodsCollectionService;
/**
* 鏀惰棌/鍙栨秷鏀惰棌
@@ -200,7 +202,15 @@
videoQuery.setPageNumber(query.getPageNumber());
return serviceMakeUp.getAuthorCollectVideoPage(videoQuery);
}else if (CollectTypeEnum.goods.getType().equals(query.getType())) {
- baseMapper.getGoodsCollectPage(page, userId);
+ PageVO pageVo = new PageVO();
+ pageVo.setPageSize((int) query.getPageSize());
+ pageVo.setPageNumber((int) query.getPageNumber());
+
+ IPage<GoodsCollectionVO> goodsCollectionVOIPage = goodsCollectionService.goodsCollection(pageVo);
+ for (GoodsCollectionVO goodsCollectionVO : goodsCollectionVOIPage.getRecords()) {
+ goodsCollectionVO.setImage(fileService.getPreviewUrl(goodsCollectionVO.getImage()));
+ }
+ return Result.ok().data(goodsCollectionVOIPage.getRecords()).total(goodsCollectionVOIPage.getTotal());
}
--
Gitblit v1.8.0