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 | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 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 7de494e..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
@@ -1,10 +1,12 @@
package cn.lihu.jh.module.ecg.controller.admin.devrent;
import cn.lihu.jh.framework.common.util.exception.ExceptionUtils;
+import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.enums.DevStateEnum;
import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
+import io.swagger.v3.oas.models.security.SecurityScheme;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -53,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;
}
@@ -65,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;
}
@@ -263,4 +277,36 @@
devRentRespVO.setModel( deviceDO.getModel() );
return CommonResult.success(devRentRespVO);
}
+
+ // 纭垂
+ @GetMapping("/fee-confirm")
+ @Operation(summary = "纭垂")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Integer> feeConfirm(@Valid Long rentId) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+
+ Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, true);
+ if (1 == result)
+ return CommonResult.error(result, "纭垂澶辫触");
+
+ return CommonResult.success(result);
+ }
+
+ // 鍙栨秷纭垂
+ @GetMapping("/fee-cancel")
+ @Operation(summary = "鍙栨秷纭垂")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Integer> feeCancel(@Valid Long rentId) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+
+ Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, false);
+ if (1 == result)
+ return CommonResult.error(result, "鍙栨秷纭垂澶辫触");
+
+ return CommonResult.success(result);
+ }
}
--
Gitblit v1.9.3