From 27930b1dca6e9d3141d44a472d98a58a82b33fda Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 27 Oct 2025 10:24:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(printer):=20=E5=A2=9E=E5=8A=A0=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 PrinterMapper 中新增 queryTaskByMpId 方法用于查询打印任务
- 扩展 GoodsDetailVO 类，增加打印机名称和纸张类型字段
- 修改 OrderServiceImpl，在商品列表中设置打印机相关信息
- 更新 PrintTaskResp 类，添加纸张类型属性
- 在 PrinterMapper.xml 中实现 queryTaskByMpId 的 SQL 查询逻辑
---
 src/main/java/com/ycwl/basic/mapper/PrinterMapper.java      | 2 ++
 .../com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java    | 4 +++-
 .../com/ycwl/basic/model/printer/resp/PrintTaskResp.java    | 1 +
 .../com/ycwl/basic/service/pc/impl/OrderServiceImpl.java    | 6 ++++++
 src/main/resources/mapper/PrinterMapper.xml                 | 3 +++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ycwl/basic/mapper/PrinterMapper.java b/src/main/java/com/ycwl/basic/mapper/PrinterMapper.java
index a4fc788d..1257a999 100644
--- a/src/main/java/com/ycwl/basic/mapper/PrinterMapper.java
+++ b/src/main/java/com/ycwl/basic/mapper/PrinterMapper.java
@@ -55,4 +55,6 @@ public interface PrinterMapper {
     void updateUserPhotoListToPrinter(Long memberId, Long scenicId, Integer printerId);
 
     List<MemberPrintResp> listRelationByOrderId(Long orderId);
+
+    PrintTaskResp queryTaskByMpId(Integer id);
 }
diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java
index cf64cbf5..b83dd89c 100644
--- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java
+++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java
@@ -43,7 +43,9 @@ public class GoodsDetailVO {
     private Integer isFree;
     private Integer parts;
     private Integer sort;
-    
+    private String printerName;
+    private String printerPaper;
+
     @JsonProperty("sourceType")
     public Integer getSourceType() {
         return goodsType;
diff --git a/src/main/java/com/ycwl/basic/model/printer/resp/PrintTaskResp.java b/src/main/java/com/ycwl/basic/model/printer/resp/PrintTaskResp.java
index 321d12bb..70999a28 100644
--- a/src/main/java/com/ycwl/basic/model/printer/resp/PrintTaskResp.java
+++ b/src/main/java/com/ycwl/basic/model/printer/resp/PrintTaskResp.java
@@ -10,6 +10,7 @@ public class PrintTaskResp {
     private Integer printerId;
     private Integer status;
     private String printerName;
+    private String paper;
     private String url;
     private Integer width;
     private Integer height;
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 3679c4f8..30ecf568 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
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.ycwl.basic.dto.MobileOrderRequest;
 import com.ycwl.basic.model.pc.source.entity.MemberSourceEntity;
 import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity;
+import com.ycwl.basic.model.printer.resp.PrintTaskResp;
 import com.ycwl.basic.order.dto.PaymentParamsRequest;
 import com.ycwl.basic.order.dto.PaymentParamsResponse;
 import com.ycwl.basic.pricing.dto.CouponUseRequest;
@@ -351,6 +352,11 @@ public class OrderServiceImpl implements OrderService {
                             goods.setScenicId(sourceEntity.getScenicId());
                             goods.setTemplateCoverUrl(sourceEntity.getCropUrl());
                             goods.setCreateTime(sourceEntity.getCreateTime());
+                            PrintTaskResp printTaskResp = printerMapper.queryTaskByMpId(sourceEntity.getId());
+                            if (printTaskResp != null) {
+                                goods.setPrinterName(printTaskResp.getPrinterName());
+                                goods.setPrinterPaper(printTaskResp.getPaper());
+                            }
                             goodsList.add(goods);
                         }
                     }
diff --git a/src/main/resources/mapper/PrinterMapper.xml b/src/main/resources/mapper/PrinterMapper.xml
index 00513d2e..055f6e87 100644
--- a/src/main/resources/mapper/PrinterMapper.xml
+++ b/src/main/resources/mapper/PrinterMapper.xml
@@ -68,6 +68,9 @@
         FROM member_print p
         WHERE p.id in (select order_item.goods_id from order_item where order_item.order_id = #{orderId} and order_item.goods_type = 3)
     </select>
+    <select id="queryTaskByMpId" resultType="com.ycwl.basic.model.printer.resp.PrintTaskResp">
+        SELECT t.*, p.name as printerName FROM print_task t left join printer p on p.id = t.printer_id WHERE mp_id = #{orderId} order by t.create_time desc limit 1
+    </select>
 
     <!-- 新增 -->
     <insert id="add">