From cd4422eb234d1863ef24a5b233baef53be22ef3d Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 18 Dec 2025 11:13:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(printer):=20=E4=BC=98=E5=8C=96=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=91=E5=88=B8=E9=80=BB=E8=BE=91=E5=B9=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E7=A7=8D=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了对source类型为3的检查逻辑
- 简化了自动发券的触发条件判断
- 新增对effectCount大于0时发放PHOTO_PRINT_FX类型优惠券的支持
- 保留了原有的异常处理机制确保不影响主流程
- 维持了mobileCount相关的业务逻辑不变
---
 .../printer/impl/PrinterServiceImpl.java      | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

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 b0d0a7c5..1949d8ed 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
@@ -473,32 +473,30 @@ public class PrinterServiceImpl implements PrinterService {
 
         request.setProducts(productItems);
 
-        // 检查是否存在type=3的source记录，存在才自动发券
-        boolean hasType3Source = userPhotoList.stream()
-                .filter(item -> item.getSourceId() != null && item.getSourceId() > 0)
-                .anyMatch(item -> {
-                    try {
-                        SourceEntity source = sourceMapper.getEntity(item.getSourceId());
-                        return source != null && Integer.valueOf(3).equals(source.getType());
-                    } catch (Exception e) {
-                        log.warn("查询source失败: sourceId={}, error={}", item.getSourceId(), e.getMessage());
-                        return false;
-                    }
-                });
-
-        if (hasType3Source) {
-            if (normalCount > 0) {
-                try {
-                    autoCouponService.autoGrantCoupon(
-                            memberId,
-                            faceId,
-                            scenicId,
-                            ProductType.PHOTO_PRINT
-                    );
-                } catch (Exception e) {
-                    log.warn("自动发券失败，不影响下单流程: memberId={}, faceId={}, scenicId={}, error={}",
-                            memberId, faceId, scenicId, e.getMessage());
-                }
+        if (normalCount > 0) {
+            try {
+                autoCouponService.autoGrantCoupon(
+                        memberId,
+                        faceId,
+                        scenicId,
+                        ProductType.PHOTO_PRINT
+                );
+            } catch (Exception e) {
+                log.warn("自动发券失败，不影响下单流程: memberId={}, faceId={}, scenicId={}, error={}",
+                        memberId, faceId, scenicId, e.getMessage());
+            }
+        }
+        if (effectCount > 0) {
+            try {
+                autoCouponService.autoGrantCoupon(
+                        memberId,
+                        faceId,
+                        scenicId,
+                        ProductType.PHOTO_PRINT_FX
+                );
+            } catch (Exception e) {
+                log.warn("自动发券失败，不影响下单流程: memberId={}, faceId={}, scenicId={}, error={}",
+                        memberId, faceId, scenicId, e.getMessage());
             }
         }
         if (mobileCount > 0) {