From d71460e89b4e556aa9f396100004fcdabe98a0ff Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 14 六月 2024 21:30:39 +0800
Subject: [PATCH] zjh 本地 2024/06/14 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 6dcfd41..a720dbe 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
@@ -851,14 +851,16 @@
wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
wqq.eq(TjOrder::getCheckStatus, 0);
wqq.isNull(TjOrder::getFinishTime);
- if (!tjCustomer.getCardId().equals("0")) {
- wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
- }
+// if (!tjCustomer.getCardId().equals("0")) {
+ wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
+// }
TjOrder order = tjOrderService.getOne(wqq);
if (null != order) {
transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjCustomer.getCardId());
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
+
+
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
--
Gitblit v1.8.0