From 48c8518ae65b9aeb166a2c16b46e49bae6c25dc6 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 7 Nov 2025 21:08:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(printer):=E4=BC=98=E5=8C=96=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91=E5=B9=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=B0=B4=E5=8D=B0=E6=99=AF=E5=8C=BA=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 根据订单项循环设置用户购买状态 - 添加水印信息中的景区文案配置 - 调整打印任务创建流程顺序 --- .../basic/service/printer/impl/PrinterServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 6bb82bc2..cdb694c4 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 @@ -573,11 +573,14 @@ public class PrinterServiceImpl implements PrinterService { return; } redisTemplate.opsForValue().set(USER_PHOTO_LIST_TO_PRINTER + memberId + ":" + orderId, "1", 60, TimeUnit.SECONDS); - printerMapper.setUserIsBuyItem(memberId, id, orderId); + OrderEntity order = orderRepository.getOrder(orderId); + List orderItems = orderMapper.getOrderItems(orderId); + orderItems.forEach(item -> { + printerMapper.setUserIsBuyItem(memberId, item.getGoodsId(), orderId); + }); // 创建打印任务 List userPhotoListByOrderId = getUserPhotoListByOrderId(orderId); File qrCodeFile = new File("qrCodeFile" + orderId + ".png"); - OrderEntity order = orderRepository.getOrder(orderId); MpConfigEntity scenicMpConfig = scenicRepository.getScenicMpConfig(order.getScenicId()); try { WxMpUtil.generateWXAQRCode(scenicMpConfig.getAppId(), scenicMpConfig.getAppSecret(), scenicMpConfig.getState(), "pages/my/orderDetailNew?id="+orderId, "qrCodeFile" + orderId + ".png"); @@ -638,6 +641,7 @@ public class PrinterServiceImpl implements PrinterService { // 处理水印 WatermarkInfo watermarkInfo = new WatermarkInfo(); + watermarkInfo.setScenicLine(scenicConfig.getString("watermark_scenic_text")); watermarkInfo.setOriginalFile(needRotation ? rotatedOriginalFile : originalFile); watermarkInfo.setWatermarkedFile(watermarkedFile); watermarkInfo.setQrcodeFile(qrCodeFile);