From a6ae7c44fccca62e535c763aae0e599d2f3f73b0 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 29 五月 2024 14:27:53 +0800
Subject: [PATCH] 增加通过多个base64PDF合并为一个
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index afe75ae..c4a9dd7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -850,8 +850,8 @@
wq1.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq1);
MallOrder mallOrder = null;
- if (tjReservation != null) {
- order.setReservationId(tjReservation.getId());
+ if (null != tjReservation) {
+ tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
return AjaxResult.error("鏈埌棰勭害鏃堕棿");
--
Gitblit v1.8.0