From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
index 480b882..caf0910 100644
--- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
@@ -2,16 +2,16 @@
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
-import cn.lili.common.vo.PageVO;
+import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dto.FootPrintQueryParams;
import cn.lili.modules.member.service.FootprintService;
import cn.lili.modules.search.entity.dos.EsGoodsIndex;
+import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
-import org.apache.catalina.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,18 +36,38 @@
@Autowired
private FootprintService footprintService;
+ @Autowired
+ private COSUtil cosUtil;
+
@ApiOperation(value = "鍒嗛〉鑾峰彇")
@GetMapping
public ResultMessage<IPage<EsGoodsIndex>> getByPage(FootPrintQueryParams params) {
params.setMemberId(UserContext.getCurrentUser().getId());
- return ResultUtil.data(footprintService.footPrintPage(params));
+ IPage<EsGoodsIndex> indexIPage = footprintService.footPrintPage(params);
+ indexIPage.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(indexIPage);
}
@ApiOperation(value = "鏍规嵁id鍒犻櫎")
- @ApiImplicitParam(name = "ids", value = "鍟嗗搧ID", required = true, allowMultiple = true, dataType = "String", paramType = "path")
- @DeleteMapping(value = "/delByIds/{ids}")
- public ResultMessage<Object> delAllByIds(@NotNull(message = "鍟嗗搧ID涓嶈兘涓虹┖") @PathVariable("ids") List ids) {
- footprintService.deleteByIds(ids);
+ @ApiImplicitParam(name = "ids", value = "鍏宠仈ID", required = true, allowMultiple = true, dataType = "String", paramType = "path")
+ @DeleteMapping(value = "/delByIds/{viewType}/{ids}")
+ public ResultMessage<Object> delAllByIds(@NotNull(message = "鍏宠仈ID涓嶈兘涓虹┖") @PathVariable("ids") List ids, @PathVariable("viewType") String viewType) {
+ footprintService.deleteByIds(ids, viewType);
return ResultUtil.success();
}
--
Gitblit v1.8.0