From f3ccf81a4f203dd0d8957bab15c491cb2181e071 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
index 72faab7..2d0e06b 100644
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
@@ -5,6 +5,7 @@
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
+import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.OrderComplaint;
@@ -12,6 +13,7 @@
import cn.lili.modules.order.order.entity.vo.*;
import cn.lili.modules.order.order.service.OrderComplaintCommunicationService;
import cn.lili.modules.order.order.service.OrderComplaintService;
+import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -20,6 +22,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Objects;
/**
@@ -45,11 +49,38 @@
@Autowired
private OrderComplaintCommunicationService orderComplaintCommunicationService;
+ @Autowired
+ private COSUtil cosUtil;
@ApiOperation(value = "閫氳繃id鑾峰彇")
@ApiImplicitParam(name = "id", value = "鎶曡瘔鍗旾D", required = true, paramType = "path")
@GetMapping(value = "/{id}")
public ResultMessage<OrderComplaintVO> get(@PathVariable String id) {
- return ResultUtil.data(OperationalJudgment.judgment(orderComplaintService.getOrderComplainById(id)));
+ OrderComplaintVO orderComplainById = OperationalJudgment.judgment(orderComplaintService.getOrderComplainById(id));
+ String goodsImage = orderComplainById.getGoodsImage();
+ if (StringUtils.isNotBlank(goodsImage)&&!goodsImage.contains("http")) {
+ orderComplainById.setGoodsImage(cosUtil.getPreviewUrl(goodsImage));
+ }
+ String[] orderComplaintImages = orderComplainById.getOrderComplaintImages();
+ List<String> orderComplaintImagesList = new ArrayList<>();
+ for (String orderComplaintImage : orderComplaintImages) {
+ if (StringUtils.isNotBlank(orderComplaintImage)&&!orderComplaintImage.contains("http")) {
+ orderComplaintImagesList.add(cosUtil.getPreviewUrl(orderComplaintImage));
+ }
+ }
+ String images = orderComplainById.getImages();
+ String[] split = images.split(",");
+ ArrayList<String> imgs = new ArrayList<>();
+ for (String s : split) {
+ if (StringUtils.isNotBlank(s)) {
+ if (StringUtils.isNotBlank(s)&&!s.contains("http")) {
+ imgs.add(cosUtil.getPreviewUrl(s));
+ }
+ }
+ }
+ String join = String.join(",", imgs);
+ orderComplainById.setImages(join);
+ orderComplainById.setOrderComplaintImages(orderComplaintImagesList.toArray(new String[0]));
+ return ResultUtil.data(orderComplainById);
}
@ApiOperation(value = "鍒嗛〉鑾峰彇")
--
Gitblit v1.8.0