From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
index ecc8a64..2c70c1b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
@@ -23,7 +23,7 @@
CommonResult<Long> registerOperation(@Valid DevRentSaveReqVO createReqVO);
/**
- * 璁惧鍑嗗
+ * 甯歌妫�鏌� 瀹屾垚
*
* @param createReqVO 鍒涘缓淇℃伅
* @return 缂栧彿
@@ -62,6 +62,15 @@
*/
Long dataEntryOperation(@Valid DevRentSaveReqVO createReqVO);
+
+ /**
+ * 甯歌妫�鏌� 鍙栨秷
+ *
+ * @param cancelReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ CommonResult<Long> cancelRoutineOperation(@Valid DevCancelReqVO cancelReqVO);
+
/**
* 鍙栨秷棰嗙敤
*
@@ -84,7 +93,7 @@
* @param createReqVO 鍒涘缓淇℃伅
* @return 缂栧彿
*/
- CommonResult<Long> loseOperation(@Valid DevRentSaveReqVO createReqVO);
+ CommonResult<Long> dismantleExceptionOperation(@Valid DevRentSaveReqVO createReqVO);
/**
* 鍒涘缓瑁呮満鎷嗘満
@@ -124,7 +133,21 @@
*/
PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO);
- DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO);
+ DevRentDO getExistingRent(DevRentSearchReqVO searchReqVO);
+ DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO);
DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO);
DevRentDO getDismantledRent(DevRentSearchReqVO searchReqVO);
+
+ Integer feeConfirm(Long rentId, String hisId, String userNickname, Boolean isFeeConfirmOrCancel);
+
+ /**
+ * 鎾ら攢銆屾鏌ュ畬鎴愩�嶅悗鐨勫洖婊氾紙鏈鏂板锛夛細
+ * 鎶婅鎮ｈ�呬粖鏃ャ�佽妫�鏌ラ」鐩殑 **60(甯歌妫�鏌ュ畬鎴�) 鈫� 0(寰呮鏌�)**锛屽苟**鍙栨秷纭垂**銆�
+ *
+ * <p>涓轰粈涔堝繀椤诲洖婊氾細鎾ら攢鍘熷厛鍙妸闃熷垪琛� 40鈫�20锛屾鏌ュ崟浠嶆槸 60锛�
+ * 鍓嶇鍐嶆瀹屾垚鏃� `getFreeRent` 鍙栦笉鍒般�屽緟妫�鏌ャ�嶅崟锛坮entId 涓虹┖锛夛紝鍚庣渚挎姤銆岃鍏堥绾︾‘璁ゃ�嶃��
+ *
+ * <p>鍐呴儴宸� try/catch锛氬洖婊氬け璐ヤ笉搴斿奖鍝�"鎾ら攢"鏈韩鐨勭粨鏋溿��
+ */
+ void rollbackRoutineFinish(String patId, Integer checkType);
}
\ No newline at end of file
--
Gitblit v1.9.3