From 0db411c2e4a906bac3d92391592ef79314fd75ce Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 27 Oct 2025 11:22:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E7=BA=B8=E5=BC=A0=E4=BF=A1=E6=81=AF=E5=88=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 OrderItemVO 中新增 printerPaper 字段
- 根据商品类型查询并设置打印任务的纸张信息
- 优化订单详情接口返回数据结构
---
 .../ycwl/basic/model/pc/order/resp/OrderItemVO.java    |  1 +
 .../ycwl/basic/service/pc/impl/OrderServiceImpl.java   | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java
index ddeed231..90ed1459 100644
--- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java
+++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java
@@ -45,4 +45,5 @@ public class OrderItemVO {
     private Date createTime;
     private Date shootingTime;
     private List<String> coverList;
+    private String printerPaper;
 }
diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
index 30ecf568..bc639376 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
@@ -567,6 +567,16 @@ public class OrderServiceImpl implements OrderService {
                 log.warn("获取景区名称失败: {}", orderAppRespVO.getScenicId(), e);
             }
         }
+        if (orderAppRespVO != null && orderAppRespVO.getOrderItemList() != null && !orderAppRespVO.getOrderItemList().isEmpty()) {
+            orderAppRespVO.getOrderItemList().forEach(orderItem -> {
+                if (orderItem.getGoodsType() == 3) {
+                    PrintTaskResp printTaskResp = printerMapper.queryTaskByMpId(Math.toIntExact(orderItem.getGoodsId()));
+                    if (printTaskResp != null) {
+                        orderItem.setPrinterPaper(printTaskResp.getPaper());
+                    }
+                }
+            });
+        }
         
         return ApiResponse.success(orderAppRespVO);
     }