From ab95fdd0d06f409b4f41ff9696f292248e86d9bc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 14 七月 2025 10:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 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..f2f3ede 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,8 @@
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.context.UserContext;
+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 +22,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;
@@ -36,6 +39,7 @@
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* 涔板绔�,鍟嗗搧鎺ュ彛
@@ -67,6 +71,9 @@
@Autowired
private HotWordsService hotWordsService;
+
+ @Autowired
+ private COSUtil cosUtil;
@ApiOperation(value = "閫氳繃id鑾峰彇鍟嗗搧淇℃伅")
@ApiImplicitParam(name = "goodsId", value = "鍟嗗搧ID", required = true, paramType = "path", dataType = "Long")
@@ -114,7 +121,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 = "鍟嗗搧鍒嗛〉-鍙戝竷瑙嗛鏃跺叧鑱斿晢鍝�")
@@ -138,4 +161,28 @@
return ResultUtil.data(hotWords);
}
+ @ApiOperation(value = "渚涘簲鍟嗗垎椤佃幏鍙栧晢鍝佸垪琛�")
+ @GetMapping(value = "/store/list")
+ public ResultMessage<IPage<Goods>> getManagerPage(GoodsSearchParams goodsSearchParams) {
+ //鑾峰彇褰撳墠鐧诲綍鍟嗗璐﹀彿
+ String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
+ goodsSearchParams.setStoreId(storeId);
+ IPage<Goods> page = goodsService.queryByParams(goodsSearchParams);
+ page.getRecords().forEach(goodsVO -> {
+ if (StringUtils.isNotBlank(goodsVO.getOriginal())) {
+ goodsVO.setOriginal(cosUtil.getPreviewUrl(goodsVO.getOriginal()));
+ }
+ if (StringUtils.isNotBlank(goodsVO.getGoodsVideo())) {
+ goodsVO.setGoodsVideo(cosUtil.getPreviewUrl(goodsVO.getGoodsVideo()));
+ }
+ if (StringUtils.isNotBlank(goodsVO.getThumbnail())) {
+ goodsVO.setThumbnail(cosUtil.getPreviewUrl(goodsVO.getThumbnail()));
+ }
+ if (StringUtils.isNotBlank(goodsVO.getSmall())) {
+ goodsVO.setSmall(cosUtil.getPreviewUrl(goodsVO.getSmall()));
+ }
+ });
+ return ResultUtil.data(page);
+ }
+
}
--
Gitblit v1.8.0