From bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:37:57 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_business' into fix/hsy/20260811
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
index f6ac8c3..55ee80c 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
@@ -37,12 +37,12 @@
void updateReceivable(@Valid CrmReceivableSaveReqVO updateReqVO);
/**
- * 鏇存柊鍥炴娴佺▼瀹℃壒缁撴灉
+ * 鏇存柊鍥炴鐨勭姸鎬侊紙瀹℃牳/鍙嶅鏍革級
*
- * @param id 鍥炴缂栧彿
- * @param bpmResult BPM 瀹℃壒缁撴灉
+ * @param id 缂栧彿
+ * @param status 鐘舵��
*/
- void updateReceivableAuditStatus(Long id, Integer bpmResult);
+ void updateReceivableStatus(Long id, Integer status);
/**
* 鍒犻櫎鍥炴
@@ -50,14 +50,6 @@
* @param id 缂栧彿
*/
void deleteReceivable(Long id);
-
- /**
- * 鍙戣捣鍥炴瀹℃壒娴佺▼
- *
- * @param id 鍥炴缂栧彿
- * @param userId 鐢ㄦ埛缂栧彿
- */
- void submitReceivable(Long id, Long userId);
/**
* 鑾峰緱鍥炴
@@ -123,6 +115,14 @@
Map<Long, BigDecimal> getReceivablePriceMapByContractId(Collection<Long> contractIds);
/**
+ * 鑾峰緱寮�绁ㄥ凡鍥炴閲戦 Map锛堣崏绋� + 瀹℃壒涓� + 瀹℃壒閫氳繃锛�
+ *
+ * @param invoiceIds 寮�绁ㄧ紪鍙�
+ * @return 宸插洖娆鹃噾棰� Map
+ */
+ Map<Long, BigDecimal> getReceivablePriceMapByInvoiceId(Collection<Long> invoiceIds);
+
+ /**
* 鏍规嵁鍚堝悓缂栧彿鏌ヨ鍥炴鏁伴噺
*
* @param contractId 鍚堝悓缂栧彿
@@ -130,4 +130,27 @@
*/
Long getReceivableCountByContractId(Long contractId);
+ /**
+ * 鏍规嵁鍚堝悓缂栧彿鏌ヨ宸插洖娆鹃噾棰�
+ *
+ * @param contractId 鍚堝悓缂栧彿
+ * @return 宸插洖娆鹃噾棰�
+ */
+ BigDecimal getReceivablePriceByContractId(Long contractId);
+
+ /**
+ * 鑾峰彇鎬诲洖娆鹃噾棰�
+ *
+ * @return 鎬诲洖娆鹃噾棰�
+ */
+ BigDecimal getReceivablePriceSum();
+
+ /**
+ * 鏍规嵁璐熻矗浜烘煡璇㈠洖娆鹃噾棰�
+ *
+ * @param ownerUserId 璐熻矗浜虹紪鍙�
+ * @return 鍥炴閲戦
+ */
+ BigDecimal getReceivablePriceByOwnerUserId(Long ownerUserId);
+
}
--
Gitblit v1.9.3