From 99d28bddd6ad5bd7c87babf7dcab670215993cb6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 13:51:36 +0800
Subject: [PATCH] zjh20250703
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 6b5d836..a6a489d 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
@@ -1405,7 +1405,10 @@
tjFlowingWater.setPayStasus(1L);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
- if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+ if (!ajaxResult.get("code").toString().equals("200")){
+ throw new IllegalStateException("鍥綋鐢宠鍗曞彂閫佸け璐�!" + result.get("msg").toString());
+// return ajaxResult;
+ }
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
@@ -3414,13 +3417,10 @@
}
}
boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
- if (zfHisApiMethods) {
- return AjaxResult.success("鎾ら攢鎴愬姛");
- } else {
+ if (!zfHisApiMethods) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
}
-
}
tjCustomer.setCardId("0");
--
Gitblit v1.8.0