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/TjOrderController.java |    7 +++++--
 1 files changed, 5 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 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){

--
Gitblit v1.8.0