From 959a154ce0df9e029c6efaef8be38ca8dc699dad Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 07 七月 2025 17:13:50 +0800
Subject: [PATCH] 查看人员列表以及查看报告数据去除核收判断

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   10 ++++++++--
 1 files changed, 8 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..b8777f9 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){
@@ -3424,6 +3427,9 @@
             }
 
             tjCustomer.setCardId("0");
+            Long cusNumber = tjCustomer.getCusNumber();
+            cusNumber -= 1;
+            tjCustomer.setCusNumber(cusNumber);
             tjCustomerService.updateById(tjCustomer);
             tjOrderService.removeById(order.getOrderId());
             return  AjaxResult.success("鎾ら攢鎴愬姛");

--
Gitblit v1.8.0