From 1d9063ac1d60b0d49b664c81426c32f1ba6cd1cc Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 26 十一月 2024 20:53:06 +0800 Subject: [PATCH] 自动确费 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 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 924cf0d..2d0f616 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 @@ -55,10 +55,16 @@ // 甯歌妫�鏌� 瀹屾垚 @PostMapping("/routine-finish") - @Operation(summary = "") + @Operation(summary = "甯歌妫�鏌ュ畬鎴�") @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") 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); // 鏁呮剰 涓嶆鏌ヨ繑鍥炲�� + return result; } @@ -67,6 +73,12 @@ @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); // 鏁呮剰 涓嶆鏌ヨ繑鍥炲�� + return result; } -- Gitblit v1.9.3