From c5a203cd94117eb87fa4ff7df974a4aaee5ed83b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 02 九月 2025 10:58:32 +0800
Subject: [PATCH] mq处理订单失败后的手动补偿机制
---
buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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..61888b1 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
@@ -9,9 +9,11 @@
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
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;
@@ -19,8 +21,10 @@
import cn.lili.modules.order.order.service.OrderItemService;
import cn.lili.modules.order.order.service.OrderPackageService;
import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.modules.permission.service.AdminUserService;
import cn.lili.modules.system.entity.vo.Traces;
import cn.lili.utils.COSUtil;
+import cn.lili.utils.CommonUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -32,6 +36,8 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Objects;
/**
@@ -56,18 +62,38 @@
@Autowired
private COSUtil cosUtil;
+ @Autowired
+ private AdminUserService adminUserService;
@ApiOperation(value = "鏌ヨ浼氬憳璁㈠崟鍒楄〃")
@GetMapping
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
orderSearchParams.setMemberId(currentUser.getId());
- return ResultUtil.data(orderService.queryByParams(orderSearchParams));
+ Boolean needHide = false;
+ IPage<OrderSimpleVO> t = orderService.queryByParams(orderSearchParams,needHide);
+
+ 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