From 1fdfb56613adca09a0ddf39289b41f96fa335a01 Mon Sep 17 00:00:00 2001 From: peng <peng.com> Date: 星期三, 23 七月 2025 17:55:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java index 2e3d1c8..d8528db 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java @@ -5,12 +5,15 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.OperationalJudgment; import cn.lili.common.security.context.UserContext; +import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.DraftGoods; import cn.lili.modules.goods.entity.dto.DraftGoodsDTO; import cn.lili.modules.goods.entity.dto.DraftGoodsSearchParams; import cn.lili.modules.goods.entity.vos.DraftGoodsVO; import cn.lili.modules.goods.service.DraftGoodsService; +import cn.lili.utils.COSUtil; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,14 +34,23 @@ public class DraftGoodsStoreController { @Autowired private DraftGoodsService draftGoodsService; - + @Autowired + private COSUtil cosUtil; @ApiOperation(value = "鍒嗛〉鑾峰彇鑽夌鍟嗗搧鍒楄〃") @GetMapping(value = "/page") public ResultMessage<IPage<DraftGoods>> getDraftGoodsByPage(DraftGoodsSearchParams searchParams) { String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId(); searchParams.setStoreId(storeId); - return ResultUtil.data(draftGoodsService.getDraftGoods(searchParams)); + IPage<DraftGoods> page = draftGoodsService.getDraftGoods(searchParams); + page.getRecords().forEach(item ->{ + if (StringUtils.isNotBlank(item.getOriginal())&&!item.getOriginal().contains("http")) { + item.setOriginal(cosUtil.getPreviewUrl(item.getOriginal())); + } + + }); + + return ResultUtil.data(page); } @ApiOperation(value = "鑾峰彇鑽夌鍟嗗搧") -- Gitblit v1.8.0