From 0fdd0bf60b7d98d21c9b5ff95bb55f0fa6495007 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:20:03 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java
index 87c8ab8..a58be47 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java
@@ -7,8 +7,10 @@
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentItemDO;
import jakarta.validation.Valid;
+import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
/**
* ERP 浠樻鍗� Service 鎺ュ彛
@@ -33,12 +35,28 @@
void updateFinancePayment(@Valid ErpFinancePaymentSaveReqVO updateReqVO);
/**
- * 鏇存柊浠樻鍗曠殑鐘舵��
+ * 鎻愪氦浠樻鍗曞鎵�
*
* @param id 缂栧彿
- * @param status 鐘舵��
+ * @param processDefinitionKey 娴佺▼瀹氫箟鐨勭紪鍙�
+ * @param userId 鐢ㄦ埛缂栧彿
*/
- void updateFinancePaymentStatus(Long id, Integer status);
+ void submitFinancePayment(Long id, String processDefinitionKey, Long userId);
+
+ /**
+ * 鑾峰緱浠樻鍗曞鎵规祦绋嬪畾涔夊垪琛�
+ *
+ * @return 娴佺▼瀹氫箟鍒楄〃
+ */
+ List<Map<String, Object>> getFinancePaymentApproveProcessDefinitionList();
+
+ /**
+ * 鏇存柊浠樻鍗曠殑瀹℃壒鐘舵�侊紙鐢� BPM 娴佺▼瀹炰緥鐨勫洖璋冭Е鍙戯級
+ *
+ * @param id 缂栧彿
+ * @param bpmResult BPM 瀹℃壒缁撴灉
+ */
+ void updateFinancePaymentAuditStatus(Long id, Integer bpmResult);
/**
* 鍒犻櫎浠樻鍗�
@@ -63,6 +81,14 @@
*/
PageResult<ErpFinancePaymentDO> getFinancePaymentPage(ErpFinancePaymentPageReqVO pageReqVO);
+ /**
+ * 缁熻姣忓紶鏉ョエ宸蹭粯娆鹃噾棰濓紙鏈鏍� + 瀹℃壒涓� + 宸插鏍革紝鎺掗櫎浣滃簾锛�
+ *
+ * @param invoiceIds 鏉ョエ缂栧彿鍒楄〃
+ * @return key 涓烘潵绁ㄧ紪鍙凤紝value 涓哄凡浠樻閲戦
+ */
+ Map<Long, BigDecimal> getPaymentPriceMapByInvoiceId(Collection<Long> invoiceIds);
+
// ==================== 浠樻鍗曢」 ====================
/**
--
Gitblit v1.9.3