From 2d2665c4e27393cacde08f2b5980ffcb58dfa284 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 30 七月 2024 19:26:03 +0800
Subject: [PATCH] zjh 2024/07/30-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 d63f658..2a026cf 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
@@ -1076,6 +1076,10 @@
                 AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
                 if (!result.get("code").toString().equals("200")) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    Object jzh = result.get("jzh");
+                    if(null !=jzh && null !=jzh.toString()){
+                        hisApiMethod.ZfHisApiMethod(jzh.toString());
+                    }
                     return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
                 }
             } else {
@@ -2834,6 +2838,12 @@
                     if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
                         return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
                     }
+
+                }
+                boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
+                if(!b){
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
                 }
             }
             for (String bldh : dto.getBldhs()) {

--
Gitblit v1.8.0