From 44c1a5542cb3323b748389e9acc18e670f76e836 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 03 七月 2025 18:41:28 +0800
Subject: [PATCH] 2025-07-03
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 7 +++++--
2 files changed, 6 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 a6a489d..74531b8 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
@@ -1204,9 +1204,12 @@
boolean b = lock.tryLock(3, TimeUnit.MINUTES);
if (b) {
AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser);
- if (!result.get("code").toString().equals("200"))
+ if (!result.get("code").toString().equals("200")) {
+ hisApiMethod.ZfHisApiMethod(tjOrder.getCardId());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
+ }else {
+ tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
+ }
return result;
}
}catch (Exception e){
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 3150cf6..80b6b28 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -413,7 +413,7 @@
return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error("鐢熸垚鎶ュ憡澶辫触锛�"+e.getMessage(),String.valueOf(e));
+ log.error("鐢熸垚鎶ュ憡澶辫触锛�",e);
tjOrder.setReportTime(null);
tjOrder.setCheckTime(null);
tjOrder.setCheckStatus(0);
--
Gitblit v1.8.0