From 05522e00fc976bec6644bd00953e1a4e1c3d96e8 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 23 十月 2025 14:26:43 +0800
Subject: [PATCH] 调整
---
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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..108d5e3 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")
@@ -93,6 +97,12 @@
Boolean needHide = true;
return ResultUtil.data(orderService.queryByParams(orderSearchParams,needHide));
}
+ @ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃鍒嗛〉")
+ @GetMapping("/share")
+ public ResultMessage<IPage<OrderSimpleVO>> queryShareMineOrder(OrderSearchParams orderSearchParams) {
+ Boolean needHide = true;
+ return ResultUtil.data(orderService.queryShareMineOrder(orderSearchParams,needHide));
+ }
@ApiOperation(value = "鏌ヨ璁㈠崟骞剁粺璁￠噾棰濅笌璁㈠崟鏁�")
@GetMapping("/countOrder/{id}")
public ResultMessage<OrderCountVO> countByIdOrder(@PathVariable("id") String id){
@@ -112,6 +122,13 @@
HttpServletResponse response = ThreadContextHolder.getHttpResponse();
orderService.queryExportOrder(response,orderSearchParams);
}
+ @ApiOperation(value = "鏌ヨ璁㈠崟瀵煎嚭鍒楄〃")
+ @GetMapping("/queryShareExportOrder")
+ public void queryShareExportOrder(OrderSearchParams orderSearchParams) {
+
+ HttpServletResponse response = ThreadContextHolder.getHttpResponse();
+ orderService.queryShareExportOrder(response,orderSearchParams);
+ }
@ApiOperation(value = "璁㈠崟鏄庣粏")
@@ -126,6 +143,20 @@
}
});
+
+ 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()));
+ }
+ if (StringUtils.isNotBlank(userCheckTemplate.getChooseImg()) && userCheckTemplate.getChooseImg().startsWith("image")){
+ userCheckTemplate.setChooseImg(cosUtil.getPreviewUrl(userCheckTemplate.getChooseImg()));
+ }
+ }
+ orderDetailVO.setUserCheckTemplates(list);
return ResultUtil.data(orderDetailVO);
}
--
Gitblit v1.8.0