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/GoodsStoreController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
index 48a9b03..e63de9e 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
@@ -8,6 +8,7 @@
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.Goods;
import cn.lili.modules.goods.entity.dos.GoodsSku;
@@ -25,6 +26,8 @@
import cn.lili.modules.statistics.aop.enums.PageViewEnum;
import cn.lili.modules.store.entity.dos.StoreDetail;
import cn.lili.modules.store.service.StoreDetailService;
+import cn.lili.utils.COSUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -70,6 +73,8 @@
*/
@Autowired
private GoodsSkuService goodsSkuService;
+ @Autowired
+ private COSUtil cosUtil;
@ApiOperation(value = "鍒嗛〉鑾峰彇鍟嗗搧鍒楄〃")
@@ -78,7 +83,16 @@
//鑾峰彇褰撳墠鐧诲綍鍟嗗璐﹀彿
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
goodsSearchParams.setStoreId(storeId);
- return ResultUtil.data(goodsService.queryByParams(goodsSearchParams));
+ IPage<Goods> page = goodsService.queryByParams(goodsSearchParams);
+ page.getRecords().forEach(goodsVO -> {
+ if (StringUtils.isNotBlank(goodsVO.getOriginal())&& !goodsVO.getOriginal().contains("http")) {
+ goodsVO.setOriginal(cosUtil.getPreviewUrl(goodsVO.getOriginal()));
+ }
+ if (StringUtils.isNotBlank(goodsVO.getGoodsVideo())&& !goodsVO.getGoodsVideo().contains("http")) {
+ goodsVO.setGoodsVideo(cosUtil.getPreviewUrl(goodsVO.getGoodsVideo()));
+ }
+ });
+ return ResultUtil.data(page);
}
@ApiOperation(value = "鍒嗛〉鑾峰彇鍟嗗搧Sku鍒楄〃")
@@ -87,7 +101,13 @@
//鑾峰彇褰撳墠鐧诲綍鍟嗗璐﹀彿
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
goodsSearchParams.setStoreId(storeId);
- return ResultUtil.data(goodsSkuService.getGoodsSkuByPage(goodsSearchParams));
+ IPage<GoodsSku> page = goodsSkuService.getGoodsSkuByPage(goodsSearchParams);
+ page.getRecords().forEach(item ->{
+ if (StringUtils.isNotBlank(item.getThumbnail())&&!item.getThumbnail().contains("http")) {
+ item.setThumbnail(cosUtil.getPreviewUrl(item.getThumbnail()));
+ }
+ });
+ return ResultUtil.data(page);
}
@ApiOperation(value = "鍒嗛〉鑾峰彇搴撳瓨鍛婅鍟嗗搧鍒楄〃")
@@ -135,6 +155,7 @@
@ApiOperation(value = "鏂板鍟嗗搧")
@PostMapping(value = "/create", consumes = "application/json", produces = "application/json")
public ResultMessage<GoodsOperationDTO> save(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO) {
+ System.err.println(JSONObject.toJSONString(goodsOperationDTO));
goodsService.addGoods(goodsOperationDTO);
return ResultUtil.success();
}
@@ -142,6 +163,7 @@
@ApiOperation(value = "淇敼鍟嗗搧")
@PutMapping(value = "/update/{goodsId}", consumes = "application/json", produces = "application/json")
public ResultMessage<GoodsOperationDTO> update(@Valid @RequestBody GoodsOperationDTO goodsOperationDTO, @PathVariable String goodsId) {
+ System.err.println(JSONObject.toJSONString(goodsOperationDTO));
goodsService.editGoods(goodsOperationDTO, goodsId);
return ResultUtil.success();
}
--
Gitblit v1.8.0