From 127a0f6ab38866d0b05b32d2102cc85638a06e62 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 11 九月 2025 15:59:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into send_coupon

---
 manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java |   32 ++++++++++++++++++++++++++++++--
 seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java    |   16 ++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java
index 2764615..e20b3b5 100644
--- a/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java
@@ -2,13 +2,16 @@
 
 import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
 import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.mapper.AfterSaleMapper;
 import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.system.entity.vo.Traces;
+import cn.lili.utils.COSUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -18,6 +21,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,11 +40,19 @@
      */
     @Autowired
     private AfterSaleService afterSaleService;
+    @Autowired
+    private COSUtil cosUtil;
 
     @ApiOperation(value = "鍒嗛〉鑾峰彇鍞悗鏈嶅姟")
     @GetMapping(value = "/page")
     public ResultMessage<IPage<AfterSaleVO>> getByPage(AfterSaleSearchParams searchParams) {
-        return ResultUtil.data(afterSaleService.getAfterSalePages(searchParams));
+        IPage<AfterSaleVO> afterSalePages = afterSaleService.getAfterSalePages(searchParams);
+        for (AfterSaleVO record : afterSalePages.getRecords()) {
+            if (StringUtils.isNotBlank(record.getGoodsImage())&&!record.getGoodsImage().contains("http")) {
+                record.setGoodsImage(cosUtil.getPreviewUrl(record.getGoodsImage()));
+            }
+        }
+        return ResultUtil.data(afterSalePages);
     }
 
     @ApiOperation(value = "鑾峰彇瀵煎嚭鍞悗鏈嶅姟鍒楄〃鍒楄〃")
@@ -53,7 +65,23 @@
     @ApiImplicitParam(name = "sn", value = "鍞悗鍗曞彿", required = true, paramType = "path")
     @GetMapping(value = "/get/{sn}")
     public ResultMessage<AfterSaleVO> get(@NotNull(message = "鍞悗鍗曞彿") @PathVariable("sn") String sn) {
-        return ResultUtil.data(afterSaleService.getAfterSale(sn));
+        AfterSaleVO afterSale = afterSaleService.getAfterSale(sn);
+        String afterSaleImage = afterSale.getAfterSaleImage();
+        if (StringUtils.isNotBlank(afterSaleImage)) {
+            String[] split = afterSaleImage.split(",");
+            List<String> asleImages = new ArrayList<>(split.length);
+            for (String s : split) {
+                if (!s.contains("http")){
+                    asleImages.add(cosUtil.getPreviewUrl(s));
+                }
+            }
+            String join = String.join(",", asleImages);
+            afterSale.setAfterSaleImage(join);
+        }
+        if (StringUtils.isNotBlank(afterSale.getGoodsImage())&&!afterSale.getGoodsImage().contains("http")) {
+            afterSale.setGoodsImage(cosUtil.getPreviewUrl(afterSale.getGoodsImage()));
+        }
+        return ResultUtil.data(afterSale);
     }
 
     @ApiOperation(value = "鏌ョ湅涔板閫�璐х墿娴佽釜杩�")
diff --git a/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
index ff5fc4d..133400c 100644
--- a/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
@@ -22,6 +22,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -46,6 +47,21 @@
     @GetMapping(value = "/{sn}")
     public ResultMessage<AfterSaleVO> get(@PathVariable String sn) {
         AfterSaleVO afterSale = OperationalJudgment.judgment(afterSaleService.getAfterSale(sn));
+        String afterSaleImage = afterSale.getAfterSaleImage();
+        if (StringUtils.isNotBlank(afterSaleImage)) {
+            String[] split = afterSaleImage.split(",");
+            List<String> asleImages = new ArrayList<>(split.length);
+            for (String s : split) {
+                if (!s.contains("http")){
+                    asleImages.add(cosUtil.getPreviewUrl(s));
+                }
+            }
+            String join = String.join(",", asleImages);
+            afterSale.setAfterSaleImage(join);
+        }
+        if (StringUtils.isNotBlank(afterSale.getGoodsImage())&&!afterSale.getGoodsImage().contains("http")) {
+            afterSale.setGoodsImage(cosUtil.getPreviewUrl(afterSale.getGoodsImage()));
+        }
         return ResultUtil.data(afterSale);
     }
 

--
Gitblit v1.8.0