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 += ""+voucherPrintResp.getCode()+""; content += ""+voucherPrintResp.getType()+""; content += "有效期:"+sdf2.format(new Date())+""; -// 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