From 607c5bc057f08f8bc03abd612352dcf13995f7df Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 30 Aug 2025 13:17:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor(print):=20=E4=BC=98=E5=8C=96=E9=97=A8?=
 =?UTF-8?q?=E7=A5=A8=E6=89=93=E5=8D=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 AppClaimController 中的重复代码
- 在 VoucherPrintServiceImpl 中增加了打印配置的判断和警告日志
- 保留了 FeiETicketPrinter 的调用逻辑，增加了配置判断
---
 .../basic/controller/mobile/AppClaimController.java    |  2 --
 .../pricing/service/impl/VoucherPrintServiceImpl.java  | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppClaimController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppClaimController.java
index d7766fd..f574a54 100644
--- a/src/main/java/com/ycwl/basic/controller/mobile/AppClaimController.java
+++ b/src/main/java/com/ycwl/basic/controller/mobile/AppClaimController.java
@@ -49,7 +49,6 @@ public class AppClaimController {
             if (voucherPrintResp != null) {
                 claimResp.setHasCoupon(false);
                 claimResp.setHasPrint(true);
-                claimResp.setHasPrint(voucherPrintResp.getPrintStatus() == 1);
                 claimResp.setPrintCode(voucherPrintResp.getCode());
                 claimResp.setPrintType(voucherPrintResp.getType());
                 return ApiResponse.success(claimResp);
@@ -66,7 +65,6 @@ public class AppClaimController {
             if (voucherPrintResp != null) {
                 claimResp.setHasCoupon(false);
                 claimResp.setHasPrint(true);
-                claimResp.setHasPrint(voucherPrintResp.getPrintStatus() == 1);
                 claimResp.setPrintCode(voucherPrintResp.getCode());
                 claimResp.setPrintType(voucherPrintResp.getType());
                 return ApiResponse.success(claimResp);
diff --git a/src/main/java/com/ycwl/basic/pricing/service/impl/VoucherPrintServiceImpl.java b/src/main/java/com/ycwl/basic/pricing/service/impl/VoucherPrintServiceImpl.java
index 8108f31..41b6dcf 100644
--- a/src/main/java/com/ycwl/basic/pricing/service/impl/VoucherPrintServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/pricing/service/impl/VoucherPrintServiceImpl.java
@@ -327,7 +327,7 @@ public class VoucherPrintServiceImpl implements VoucherPrintService {
     }
     
     /**
-     * 调用打印机接口（待实现）
+     * 调用打印机接口
      */
     private void printTicket(VoucherPrintRecord record, VoucherPrintResp voucherPrintResp) throws Exception {
         FaceEntity face = faceRepository.getFace(record.getFaceId());
@@ -362,7 +362,11 @@ public class VoucherPrintServiceImpl implements VoucherPrintService {
         content += "<CB>"+voucherPrintResp.getCode()+"</CB>";
         content += "<C>"+voucherPrintResp.getType()+"</C>";
         content += "<C>有效期："+sdf2.format(new Date())+"</C>";
-//        FeiETicketPrinter.doPrint("550519002", content, 1);
-        log.info("打印完成->内容：\n{}", content);
+        ScenicConfigManager config = scenicRepository.getScenicConfigManager(face.getScenicId());
+        if (Strings.isNotBlank(config.getString("ticket_print_sn"))) {
+            FeiETicketPrinter.doPrint(config.getString("ticket_print_sn"), content, 1);
+        } else {
+            log.warn("打印没有配置->内容：\n{}", content);
+        }
     }
 }
\ No newline at end of file