From 0c9521d93a745de0ec71d83c094a6047c0222398 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 29 十月 2025 15:01:51 +0800
Subject: [PATCH] 调整

---
 seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
index 3204355..5375589 100644
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
@@ -2,6 +2,7 @@
 
 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;
@@ -10,9 +11,13 @@
 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.service.GoodsCustomizeTemplateService;
+import cn.lili.modules.lmk.service.UserCheckTemplateService;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
+import cn.lili.modules.member.entity.dto.UpdateTracesDTO;
 import cn.lili.modules.member.service.StoreLogisticsService;
-import cn.lili.modules.order.order.entity.dto.OrderExportDTO;
+import cn.lili.modules.order.cart.entity.vo.BindingTemplateParam;
 import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
 import cn.lili.modules.order.order.entity.dto.PartDeliveryParamsDTO;
 import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
@@ -23,6 +28,7 @@
 import cn.lili.modules.system.service.LogisticsService;
 import cn.lili.utils.COSUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -51,7 +57,6 @@
 @RequestMapping("/store/order/order")
 @Api(tags = "搴楅摵绔�,璁㈠崟鎺ュ彛")
 public class OrderStoreController {
-
     /**
      * 璁㈠崟
      */
@@ -78,11 +83,17 @@
     private OrderPackageService orderPackageService;
 
     @Autowired
+    private UserCheckTemplateService userCheckTemplateService;
+    @Autowired
+    private GoodsCustomizeTemplateService goodsCustomizeTemplateService;
+
+    @Autowired
     private COSUtil cosUtil;
     @ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃")
     @GetMapping
     public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
-        return ResultUtil.data(orderService.queryByParams(orderSearchParams));
+        Boolean needHide = true;
+        return ResultUtil.data(orderService.queryByParams(orderSearchParams,needHide));
     }
 
 
@@ -100,6 +111,18 @@
                 orderItem.setImage(cosUtil.getPreviewUrl(image));
             }
         });
+        //鏌ヨ鐢ㄦ埛濉啓璁㈠崟淇℃伅
+
+        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);
     }
 
@@ -243,6 +266,12 @@
         return ResultUtil.data(orderPackageService.getOrderPackageVOList(orderSn));
     }
 
+    @PostMapping(value = "/updateTraces")
+    public ResultMessage<Object> updateTraces(@RequestBody UpdateTracesDTO updateTracesDTO) {
+        orderService.updateTraces(updateTracesDTO);
+        return ResultUtil.success(ResultCode.SUCCESS);
+    }
+
     @ApiOperation(value = "鏌ヨ鐗╂祦韪抗")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderSn", value = "璁㈠崟缂栧彿", required = true, dataType = "String", paramType = "path")
@@ -269,4 +298,15 @@
         orderService.updateSellerRemark(orderSn, sellerRemark);
         return ResultUtil.success();
     }
+
+    @ApiOperation(value = "瀹氬埗鍟嗗搧鑾峰彇妯℃澘淇℃伅")
+    @GetMapping(value = "/getTemplate/{templateId}")
+    public Result getTemplate(@PathVariable String templateId) {
+        return goodsCustomizeTemplateService.getCustomizeTemplateById(templateId);
+    }
+    @ApiOperation(value = "淇敼瀹氬埗鍟嗗搧鑾峰彇妯℃澘淇℃伅")
+    @PostMapping(value = "/edit/template")
+    public Result editTemplate(@RequestBody BindingTemplateParam bindingTemplateParam) {
+        return goodsCustomizeTemplateService.editTemplate(bindingTemplateParam);
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0