From 3c378a12577695f4de03fd2fbe83c033f1369c3f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 29 六月 2025 19:58:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/order/CartController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/order/CartController.java b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java
index 6eb90b1..2973172 100644
--- a/buyer-api/src/main/java/cn/lili/controller/order/CartController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java
@@ -1,9 +1,11 @@
package cn.lili.controller.order;
+import cn.hutool.json.JSONUtil;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
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.ResultMessage;
import cn.lili.modules.order.cart.entity.dto.BuyBackDTO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
@@ -11,6 +13,7 @@
import cn.lili.modules.order.cart.entity.vo.TradeParams;
import cn.lili.modules.order.cart.service.CartService;
import cn.lili.modules.order.order.entity.vo.ReceiptVO;
+import cn.lili.utils.COSUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -45,6 +48,8 @@
*/
@Autowired
private CartService cartService;
+ @Autowired
+ private COSUtil cosUtil;
@ApiOperation(value = "鍚戣喘鐗╄溅涓坊鍔犱竴涓骇鍝�")
@@ -74,7 +79,19 @@
@ApiOperation(value = "鑾峰彇璐墿杞﹂〉闈㈣喘鐗╄溅璇︽儏")
@GetMapping("/all")
public ResultMessage<TradeDTO> cartAll() {
- return ResultUtil.data(this.cartService.getAllTradeDTO());
+ TradeDTO allTradeDTO = this.cartService.getAllTradeDTO();
+ allTradeDTO.getSkuList().forEach(item->{
+ String goodsVideo = item.getGoodsSku().getGoodsVideo();
+ if (StringUtils.isNotBlank(goodsVideo)&&!goodsVideo.contains("http")) {
+ item.getGoodsSku().setGoodsVideo(cosUtil.getPreviewUrl(goodsVideo));
+ }
+
+ String thumbnail = item.getGoodsSku().getThumbnail();
+ if (StringUtils.isNotBlank(thumbnail)&&!thumbnail.contains("http")) {
+ item.getGoodsSku().setThumbnail(cosUtil.getPreviewUrl(thumbnail));
+ }
+ });
+ return ResultUtil.data(allTradeDTO);
}
@ApiOperation(value = "鑾峰彇璐墿杞︽暟閲�")
@@ -174,7 +191,22 @@
public ResultMessage<TradeDTO> cartChecked(@NotNull(message = "璇诲彇閫変腑鍒楄〃") String way) {
try {
//璇诲彇閫変腑鐨勫垪琛�
- return ResultUtil.data(this.cartService.getCheckedTradeDTO(CartTypeEnum.valueOf(way)));
+ TradeDTO checkedTradeDTO = this.cartService.getCheckedTradeDTO(CartTypeEnum.valueOf(way));
+ checkedTradeDTO.getSkuList().forEach(item->{
+
+
+ String goodsVideo = item.getGoodsSku().getGoodsVideo();
+ if (StringUtils.isNotBlank(goodsVideo)&&!goodsVideo.contains("http")) {
+ item.getGoodsSku().setGoodsVideo(cosUtil.getPreviewUrl(goodsVideo));
+ }
+
+ String thumbnail = item.getGoodsSku().getThumbnail();
+ if (StringUtils.isNotBlank(thumbnail)&&!thumbnail.contains("http")) {
+ item.getGoodsSku().setThumbnail(cosUtil.getPreviewUrl(thumbnail));
+ }
+ });
+ System.err.println(JSONUtil.toJsonStr(checkedTradeDTO));
+ return ResultUtil.data(checkedTradeDTO);
} catch (ServiceException se) {
log.error(se.getMsg(), se);
throw se;
--
Gitblit v1.8.0