From 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 六月 2025 19:01:13 +0800
Subject: [PATCH] zjh20250620
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 0d5da1a..69cd4cd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -235,8 +235,8 @@
// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
- if (order.getFinishTime() != null) {
- return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+ if (order.getPrintLastTime() != null) {
+ return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鎵撳嵃,涓嶅彲琛ュ綍椤圭洰!");
}
TjCustomer customer = customerService.getById(order.getUserId());
@@ -245,9 +245,11 @@
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWater.getPayStasus().toString().equals("0")) {
tjFlowingWater.setPayStasus(0L);
+ tjFlowingWater.setZfgf(tjFlowingWater.getPayStasus().toString());
} else {
tjFlowingWater.setPayStasus(1L);
}
+ tjFlowingWater.setZfgf(tjFlowingWater.getPayStasus().toString());
if (tjFlowingWaterService.save(tjFlowingWater)) {
Date dates = new Date();
@@ -333,6 +335,7 @@
Map<String, Object> map = new HashMap<>();
map.put("waterId", tjFlowingWater.getWaterId());
map.put("mobanId", reportService.getMoBanIds());
+ tjFlowingWaterService.getTjBlCall(order.getTjNumber());
return AjaxResult.success("鏀惰垂鎴愬姛", map);
}
}
@@ -388,8 +391,8 @@
// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
- if (order.getFinishTime() != null) {
- return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+ if (order.getPrintLastTime() != null) {
+ return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鎵撳嵃,涓嶅彲琛ュ綍椤圭洰!");
}
TjCustomer customer = customerService.getById(order.getUserId());
--
Gitblit v1.8.0