From c34f874753481fc5105c86f9bcf1eb21efcab92d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 29 四月 2026 13:04:56 +0800
Subject: [PATCH] fix: 合并回款与收付款方式相关修复

---
 src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index a32b6f6..ce21a49 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -127,11 +127,12 @@
             // 2. 澶勭悊璐︽埛鏀嚭
             AccountExpense accountExpense = new AccountExpense();
             accountExpense.setExpenseDate(purchaseLedger.getEntryDate());
-            accountExpense.setExpenseType("0");
+            accountExpense.setExpenseType("4");
             accountExpense.setSupplierName(purchaseLedger.getSupplierName());
             accountExpense.setExpenseMoney(paymentRegistration.getCurrentPaymentAmount());
             accountExpense.setExpenseDescribed("浠樻鏀嚭");
-            accountExpense.setExpenseMethod("0");
+
+            accountExpense.setExpenseMethod(paymentRegistration.getPaymentMethod());
             accountExpense.setBusinessId(paymentRegistration.getId());
             accountExpense.setBusinessType(1);
             accountExpense.setInputTime(new Date());
@@ -344,7 +345,6 @@
         List<Long> supplierIds = suppliers.stream()
                 .map(SupplierManage::getId) // 鍏堣幏鍙朓nteger绫诲瀷鐨処D
                 .filter(Objects::nonNull)    // 杩囨护鎺夊彲鑳界殑null鍊�
-                .map(Integer::longValue)    // 灏咺nteger杞崲涓篖ong
                 .collect(Collectors.toList());
 
         // 鑾峰彇褰撴湀鐨勫紑濮嬪拰缁撴潫鏃ユ湡

--
Gitblit v1.9.3