From dde9f5d54239b4a4ee86f7267ecf5c6256c2ef11 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 11 Nov 2025 14:20:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(printer):=20=E6=9B=B4=E6=96=B0=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E9=93=BE=E6=8E=A5=E5=8F=82=E6=95=B0=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B0=B4=E5=8D=B0=E9=85=8D=E7=BD=AE=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在生成微信小程序二维码的链接中添加 force=1 参数
- 从景区配置中读取水印景区文本，为空时使用空字符串
-从景区配置中读取日期格式，为空时使用默认格式 yyyy.MM.dd
---
 .../ycwl/basic/service/printer/impl/PrinterServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 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 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);