From 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 05 八月 2025 09:14:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
index 086685d..94faaa2 100644
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
@@ -12,6 +12,7 @@
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderPackage;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
+import cn.lili.modules.order.order.entity.dto.OrderSearchXcxParams;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
@@ -32,6 +33,8 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Objects;
/**
@@ -62,12 +65,28 @@
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
orderSearchParams.setMemberId(currentUser.getId());
- return ResultUtil.data(orderService.queryByParams(orderSearchParams));
+ IPage<OrderSimpleVO> t = orderService.queryByParams(orderSearchParams);
+ t.getRecords().forEach(orderSimpleVO -> {
+ String groupImages = orderSimpleVO.getGroupImages();
+ if (StringUtils.isNotBlank(groupImages)) {
+ String[] split = groupImages.split(",");
+ List<String> groupImg = new ArrayList<>();
+ for (String s : split) {
+ if (StringUtils.isNotBlank(s)&&!s.contains("http")) {
+ groupImg.add(cosUtil.getPreviewUrl(s));
+ }
+ }
+ orderSimpleVO.setGroupImages(
+ String.join(",", groupImg)
+ );
+ }
+ });
+ return ResultUtil.data(t);
}
@ApiOperation(value = "鏌ヨ浼氬憳璁㈠崟鍒楄〃")
@GetMapping("/xcx")
- public ResultMessage<IPage<OrderSimpleXcxVO>> queryXcxMineOrder(OrderSearchParams orderSearchParams) {
+ public ResultMessage<IPage<OrderSimpleXcxVO>> queryXcxMineOrder(OrderSearchXcxParams orderSearchParams) {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
orderSearchParams.setMemberId(currentUser.getId());
return ResultUtil.data(orderService.queryByXcxParams(orderSearchParams));
--
Gitblit v1.8.0