From a80a8b04713f064b9792768d995ffe352833d7de Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 10 九月 2024 17:52:28 +0800
Subject: [PATCH] zjh 2024-09-10
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 6 +++---
1 files changed, 3 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 eb79a5f..bc26c5f 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
@@ -893,7 +893,7 @@
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
-
+ TjFlowingWater tjFlowingWater = new TjFlowingWater();
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -958,6 +958,7 @@
tjOrder.setFinishTime(new Date());
tjOrder.setCheckStatus(1);
tjOrder.setStatus(TjConstants.TJ_WAIT);
+ tjFlowingWater.setPayStasus(1L);
}
if (tjOrderService.save(tjOrder)) {
@@ -973,8 +974,7 @@
cusNumber += 1;
tjCustomer.setCusNumber(cusNumber);
BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
- TjFlowingWater tjFlowingWater = new TjFlowingWater();
- tjFlowingWater.setPayStasus(0L);
+
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjFlowingWater.setPayStasus(3L);
--
Gitblit v1.8.0