From 9f087e0cdec5679b2a2c3b16ad0115196f32d15b Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 08 一月 2025 17:50:14 +0800 Subject: [PATCH] zjh20250108 --- ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java index 4f0293f..26aedf9 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java @@ -756,19 +756,15 @@ List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz); addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz); } + AjaxResult result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L); + if (!result.get("code").toString().equals("200")) + return false; }else { -// tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbz(order.getOrderId().toString(),jxbz,tjFlowingWater.getTjSerialNumber().toString()); -// orderRemarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),jxbz,tjFlowingWater.getTjSerialNumber().toString()); - List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz); addCaiYangDengJiByDiaoYongShiTu(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz); } } - if(null !=config && config.equals("Y")){ - AjaxResult result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L); - if (!result.get("code").toString().equals("200")) - return false; - } + return true; } @@ -2097,7 +2093,8 @@ @Override public void run() { try { - transitionService.saveTemoTransitionByGroupingId(reservation.getIdCard(), reservation.getGroupingId()); +// transitionService.saveTemoTransitionByGroupingId(reservation.getIdCard(), reservation.getGroupingId()); + transitionService.ttsaveTemoTransitionByGroupingId(reservation.getIdCard(),"0",reservation.getGroupingId()); threadPool.shutdown(); } catch (Exception e) { -- Gitblit v1.8.0