自动确费

eight

2024-11-26 1d9063ac1d60b0d49b664c81426c32f1ba6cd1cc

自动确费

 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;
    }


 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java

@@ -758,7 +758,7 @@
        if (0 == returnValue) {
            devRentMapper.setPaid(rentId, isFeeConfirmOrCancel ? 1 : 0);
        }
        return returnValue;
        return returnValue;  // 0 成功  1 失败
    }

    // 标记 设备已被领取