From 72e215c552f20a3b72e749c024b09ad0d1eb44ff Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 8 Nov 2025 17:09:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(printer):=20=E6=B7=BB=E5=8A=A0sourceId?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在MemberPrintResp中新增sourceId字段
- 优化PrinterServiceImpl中的水印处理逻辑
- 添加sourceId为空时的返回判断，避免空指针异常
---
 .../com/ycwl/basic/model/pc/printer/resp/MemberPrintResp.java | 1 +
 .../ycwl/basic/service/printer/impl/PrinterServiceImpl.java   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ycwl/basic/model/pc/printer/resp/MemberPrintResp.java b/src/main/java/com/ycwl/basic/model/pc/printer/resp/MemberPrintResp.java
index 4a286c96..cd6cc204 100644
--- a/src/main/java/com/ycwl/basic/model/pc/printer/resp/MemberPrintResp.java
+++ b/src/main/java/com/ycwl/basic/model/pc/printer/resp/MemberPrintResp.java
@@ -8,6 +8,7 @@ import java.util.Date;
 public class MemberPrintResp {
     private Integer id;
     private Long scenicId;
+    private Long sourceId;
     private String scenicName;
     private Long faceId;
     private Long memberId;
diff --git a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
index 3d26f031..6703ac49 100644
--- a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
@@ -624,7 +624,9 @@ public class PrinterServiceImpl implements PrinterService {
         }
         userPhotoListByOrderId.forEach(item -> {
             PrinterEntity printer = printerMapper.getById(item.getPrinterId());
-
+            if (item.getSourceId() == null) {
+                return;
+            }
             // 水印处理逻辑
             String printUrl = item.getCropUrl();
             try {