From 6d09f4ac6ee4718acd131f234f24ad1ac3c2ce3c Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 19 六月 2024 12:11:36 +0800
Subject: [PATCH] zjh 本地 2024/06/19 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 8 ++++++--
1 files changed, 6 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 a44347b..3c13863 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
@@ -1035,7 +1035,11 @@
/*璋冪敤his鎺ュ彛*/
String config = configService.selectConfigByKey("sfkqdyhis");
if(null !=config && config.equals("Y")){
- hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
+ AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
+ if(!result.get("code").toString().equals("200")){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎸傚彿澶辫触!"+result.get("msg").toString());
+ }
}else {
tjCustomer.setCardId("0");
tjCustomerService.updateById(tjCustomer);
@@ -2331,7 +2335,7 @@
if (null != order) {
String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
if (null != payByTjNum) {
- return AjaxResult.success("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+ return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
}
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
--
Gitblit v1.8.0