2025-07-03

zhaowenxuan

1 天以前 44c1a5542cb3323b748389e9acc18e670f76e836

2025-07-03

 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){

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java

@@ -413,7 +413,7 @@
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
                } catch (Exception e) {
//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    log.error("生成报告失败："+e.getMessage(),String.valueOf(e));
                    log.error("生成报告失败：",e);
                    tjOrder.setReportTime(null);
                    tjOrder.setCheckTime(null);
                    tjOrder.setCheckStatus(0);