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 7a5486a9..e37ce810 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 @@ -616,7 +616,7 @@ public class PrinterServiceImpl implements PrinterService { File qrCodeFile = new File("qrCodeFile" + orderId + ".png"); MpConfigEntity scenicMpConfig = scenicRepository.getScenicMpConfig(order.getScenicId()); try { - WxMpUtil.generateWXAQRCode(scenicMpConfig.getAppId(), scenicMpConfig.getAppSecret(), scenicMpConfig.getState(), "pages/my/orderDetailNew?id="+orderId, "qrCodeFile" + orderId + ".png"); + WxMpUtil.generateWXAQRCode(scenicMpConfig.getAppId(), scenicMpConfig.getAppSecret(), scenicMpConfig.getState(), "pages/my/orderDetailNew?force=1&id="+orderId, "qrCodeFile" + orderId + ".png"); } catch (Exception e) { throw new RuntimeException(e); } @@ -674,12 +674,12 @@ public class PrinterServiceImpl implements PrinterService { // 处理水印 WatermarkInfo watermarkInfo = new WatermarkInfo(); - watermarkInfo.setScenicLine(scenicConfig.getString("watermark_scenic_text")); + watermarkInfo.setScenicLine(scenicConfig.getString("print_watermark_scenic_text", "")); watermarkInfo.setOriginalFile(needRotation ? rotatedOriginalFile : originalFile); watermarkInfo.setWatermarkedFile(watermarkedFile); watermarkInfo.setQrcodeFile(qrCodeFile); watermarkInfo.setDatetime(new Date()); - watermarkInfo.setDtFormat("yyyy.MM.dd"); + watermarkInfo.setDtFormat(scenicConfig.getString("print_watermark_dt_format", "yyyy.MM.dd")); operator.process(watermarkInfo);