From 1d7f0862e5f4c4bcc0e4661661de015d24b45855 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 26 十一月 2024 22:55:37 +0800
Subject: [PATCH] 自动确费 异常处理

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index 2d0f616..d119636 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -60,24 +60,32 @@
     public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
         CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
 
-        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
-        String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
-        Long rentId = routineFinishReqVO.getId();
-        devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+        try {
+            String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+            String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+            Long rentId = routineFinishReqVO.getId();
+            devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+        } catch (Exception e) {
+            log.error("甯歌妫�鏌ュ畬鎴�, 鑷姩纭垂澶辫触", e);
+        }
 
         return result;
     }
 
     @PostMapping("/dev-ready")
-    @Operation(summary = "璁惧棰嗙敤")
+    @Operation(summary = "璁惧棰嗙敤瀹屾垚")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
     public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
         CommonResult<Long> result = devRentService.readyOperation(createReqVO);
 
-        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
-        String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
-        Long rentId = createReqVO.getId();
-        devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+        try {
+            String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+            String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+            Long rentId = createReqVO.getId();
+            devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+        } catch (Exception e) {
+            log.error("璁惧棰嗙敤瀹屾垚, 鑷姩纭垂澶辫触", e);
+        }
 
         return result;
     }

--
Gitblit v1.9.3