From 4318746ee88ad53e00341df1a0395058bebc40fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 六月 2025 14:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
index c5d3d25..3d94bc5 100644
--- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
@@ -4,6 +4,7 @@
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
+import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Goods;
@@ -20,6 +21,7 @@
import cn.lili.modules.search.service.HotWordsService;
import cn.lili.modules.statistics.aop.PageViewPoint;
import cn.lili.modules.statistics.aop.enums.PageViewEnum;
+import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -68,6 +70,9 @@
@Autowired
private HotWordsService hotWordsService;
+ @Autowired
+ private COSUtil cosUtil;
+
@ApiOperation(value = "閫氳繃id鑾峰彇鍟嗗搧淇℃伅")
@ApiImplicitParam(name = "goodsId", value = "鍟嗗搧ID", required = true, paramType = "path", dataType = "Long")
@GetMapping(value = "/get/{goodsId}")
@@ -114,7 +119,23 @@
@GetMapping("/es")
public ResultMessage<Page<EsGoodsIndex>> getGoodsByPageFromEs(EsGoodsSearchDTO goodsSearchParams, PageVO pageVO) {
pageVO.setNotConvert(true);
- return ResultUtil.data(goodsSearchService.searchGoodsByPage(goodsSearchParams, pageVO));
+ Page<EsGoodsIndex> ePage = goodsSearchService.searchGoodsByPage(goodsSearchParams, pageVO);
+ ePage.getRecords().forEach(item -> {
+ String small = item.getSmall();
+ String thumbnail = item.getThumbnail();
+ String goodsVideo = item.getGoodsVideo();
+ if (StringUtils.isNotBlank(small) && !small.contains("http")) {
+ item.setSmall(cosUtil.getPreviewUrl(small));
+ }
+ if (StringUtils.isNotBlank(thumbnail) && !thumbnail.contains("http")) {
+ item.setThumbnail(cosUtil.getPreviewUrl(thumbnail));
+ }
+ if (StringUtils.isNotBlank(goodsVideo) && !goodsVideo.contains("http")) {
+ item.setGoodsVideo(cosUtil.getPreviewUrl(goodsVideo));
+ }
+
+ });
+ return ResultUtil.data(ePage);
}
@ApiOperation(value = "鍟嗗搧鍒嗛〉-鍙戝竷瑙嗛鏃跺叧鑱斿晢鍝�")
--
Gitblit v1.8.0