From 817e6e138931c32f47049f112727a571580771c0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 12 十二月 2024 16:06:02 +0800
Subject: [PATCH] zjh202412012
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 d124182..7ca6141 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
@@ -997,6 +997,7 @@
AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser);
if (!result.get("code").toString().equals("200"))
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
return result;
}
} finally {
@@ -1717,6 +1718,11 @@
transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
if (null != ppList && !ppList.isEmpty()) {
+ String string = transitionService.panduantaocanshifouchongfu(cusId,pacId);
+ if(!StringUtils.isBlank(string)){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: "+string);
+ }
transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
}
}
@@ -2622,7 +2628,8 @@
public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
- AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+// AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+ AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
if (!ajaxResult.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
} else {
--
Gitblit v1.8.0