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) {