q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(printer): 更新二维码链接参数并优化水印配置读取

Browse Source 
- 在生成微信小程序二维码的链接中添加 force=1 参数
- 从景区配置中读取水印景区文本，为空时使用空字符串
-从景区配置中读取日期格式，为空时使用默认格式 yyyy.MM.dd
This commit is contained in:
Jerry Yan
2025-11-11 14:20:37 +08:00
parent 72e60c95e0
commit dde9f5d542
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
View File

@@ -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);