From 8fd500b275650e47dcc5b02731c172695251495e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 07 七月 2025 11:16:16 +0800
Subject: [PATCH] zjh20250707
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 5222178..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){
@@ -1405,7 +1408,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());
@@ -3421,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