From cdbed525ab8395e916b2874ff9e7d59742f320b1 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 17:45:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
index 10d215a..653f5c3 100644
--- a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
@@ -9,8 +9,10 @@
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.lmk.domain.entity.UserCheckTemplate;
import cn.lili.modules.lmk.domain.vo.OrderCountVO;
import cn.lili.modules.lmk.domain.vo.SelectVO;
+import cn.lili.modules.lmk.service.UserCheckTemplateService;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dto.OrderExportDTO;
@@ -67,6 +69,8 @@
@Autowired
private COSUtil cosUtil;
+ @Autowired
+ private UserCheckTemplateService userCheckTemplateService;
@ApiModelProperty(value = "搴楅摵涓嬫媺")
@GetMapping("/storeSelect")
@@ -126,6 +130,17 @@
}
});
+
+ List<UserCheckTemplate> list = new LambdaQueryChainWrapper<>(userCheckTemplateService.getBaseMapper())
+ .eq(UserCheckTemplate::getOrderSn, orderSn)
+ .eq(UserCheckTemplate::getDeleteFlag, Boolean.FALSE)
+ .list();
+ for (UserCheckTemplate userCheckTemplate : list) {
+ if (StringUtils.isNotBlank(userCheckTemplate.getContent()) && userCheckTemplate.getContent().startsWith("image")){
+ userCheckTemplate.setContent(cosUtil.getPreviewUrl(userCheckTemplate.getContent()));
+ }
+ }
+ orderDetailVO.setUserCheckTemplates(list);
return ResultUtil.data(orderDetailVO);
}
--
Gitblit v1.8.0