From da9cb628948b381015faf188283a90a3aa15ce62 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期二, 10 十二月 2024 19:52:55 +0800 Subject: [PATCH] zjh202412010 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 6 ++++++ 1 files changed, 6 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 d124182..5c04915 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); } } -- Gitblit v1.8.0