From 8bdb26708241c70a9998b1729a2c9881422f2d5d Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 16 十月 2025 15:35:39 +0800
Subject: [PATCH] 模板修改
---
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 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 c964d0a..ff0d417 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
@@ -2,13 +2,17 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.NumberUtil;
+import cn.lili.base.Result;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.context.ThreadContextHolder;
import cn.lili.common.enums.ResultCode;
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;
@@ -18,8 +22,12 @@
import cn.lili.modules.order.order.service.OrderPackageService;
import cn.lili.modules.order.order.service.OrderPriceService;
import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.modules.store.entity.dos.Store;
+import cn.lili.modules.store.entity.enums.StoreStatusEnum;
+import cn.lili.modules.store.mapper.StoreMapper;
import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +37,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -41,6 +50,8 @@
@RequestMapping("/manager/order/order")
@Api(tags = "绠＄悊绔�,璁㈠崟API")
public class OrderManagerController {
+ @Autowired
+ private StoreMapper storeMapper;
/**
* 璁㈠崟
@@ -58,6 +69,27 @@
@Autowired
private COSUtil cosUtil;
+ @Autowired
+ private UserCheckTemplateService userCheckTemplateService;
+
+ @ApiModelProperty(value = "搴楅摵涓嬫媺")
+ @GetMapping("/storeSelect")
+ public ResultMessage<List<SelectVO>> getStoreSelect(){
+ List<Store> storeList =
+ new LambdaQueryChainWrapper<>(storeMapper)
+ .eq(Store::getDeleteFlag,Boolean.FALSE)
+ .eq(Store::getStoreDisable, StoreStatusEnum.OPEN.name())
+ .list();
+ List<SelectVO> selectVOS = new ArrayList<>();
+ for (Store store : storeList){
+ SelectVO vo = new SelectVO();
+ vo.setId(store.getId());
+ vo.setLabel(store.getStoreName());
+ selectVOS.add(vo);
+ }
+ return ResultUtil.data(selectVOS);
+
+ }
@ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃鍒嗛〉")
@GetMapping
@@ -98,6 +130,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