From 18a9f86a8c1fdb6c42c4212dcaa1de437f6f4861 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 15 十月 2025 14:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 23db668..251c210 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,7 +9,10 @@
import cn.lili.common.security.context.UserContext;
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.enums.general.AdminRoleEnum;
+import cn.lili.modules.lmk.enums.general.TemplateContentTypeEnum;
+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.dos.OrderPackage;
@@ -27,7 +30,9 @@
import cn.lili.modules.system.entity.vo.Traces;
import cn.lili.utils.COSUtil;
import cn.lili.utils.CommonUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -70,6 +75,8 @@
@Autowired
private AdminUserService adminUserService;
+ @Autowired
+ private UserCheckTemplateService userCheckTemplateService;
@ApiOperation(value = "鏌ヨ浼氬憳璁㈠崟鍒楄〃")
@GetMapping
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
@@ -103,6 +110,21 @@
orderSearchParams.setMemberId(currentUser.getId());
return ResultUtil.data(orderService.queryByXcxParams(orderSearchParams));
}
+ @ApiOperation(value = "鏍规嵁璁㈠崟鍙锋煡璇㈠畾鍒舵ā鏉垮～鍐欎俊鎭�")
+ @GetMapping("/customize/{sn}")
+ public ResultMessage<List<UserCheckTemplate>> customize(@PathVariable @NotBlank String sn) {
+ LambdaQueryWrapper<UserCheckTemplate> eq = Wrappers.<UserCheckTemplate>lambdaQuery().eq(UserCheckTemplate::getOrderSn, sn);
+ List<UserCheckTemplate> list = userCheckTemplateService.list(eq);
+ for (UserCheckTemplate userCheckTemplate : list) {
+ if (TemplateContentTypeEnum.IMAGE.name().equals(userCheckTemplate.getContentType())) {
+ String content = userCheckTemplate.getContent();
+ if (StringUtils.isNotBlank(content)&&!content.contains("http")) {
+ userCheckTemplate.setContent(cosUtil.getPreviewUrl(content));
+ }
+ }
+ }
+ return ResultUtil.data(list);
+ }
@ApiOperation(value = "璁㈠崟鏄庣粏")
@ApiImplicitParams({
--
Gitblit v1.8.0