From 08b030a4cb662725c4f73e3b8a531de2c593369b Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 16:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

---
 service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
index 130c9ee..7e7c7ef 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
@@ -333,7 +333,10 @@
         billManagement.setExchangeRate(statisticsVo.getRate());
         billManagement.setStatus("0"); // 榛樿鑽夌鐘舵��
         billManagement.setCreateTime(DateUtils.getNowDate());
-
+        billManagement.setBillName(billCreateVo.getBillName());
+        billManagement.setCustomerName(billCreateVo.getCustomerName());
+        billManagement.setIsInternalSettlement(billCreateVo.getIsInternalSettlement());
+        billManagement.setInternalSettlementUnit(billCreateVo.getInternalSettlementUnit());
         // 3. 鏍规嵁璐﹀崟绫诲瀷璁剧疆甯佺鍜屾�婚噾棰�
         if (billType == 0) {
             // 浜烘皯甯佽处鍗�
@@ -357,16 +360,16 @@
             String billSystemNo = billManagement.getSystemNo();
             
             // 鎵归噺鏇存柊搴旀敹璐圭敤涓昏〃鐨勫叧鑱旇处鍗曠紪鍙�
-            List<ReceivableFeeManagement> feeManagements = new ArrayList<>();
             for (Integer feeId : statisticsVo.getIds()) {
                 ReceivableFeeManagement feeManagement = new ReceivableFeeManagement();
                 feeManagement.setId(feeId);
                 feeManagement.setRelatedBillNo(billSystemNo);
-                feeManagements.add(feeManagement);
+                feeManagement.setStatus("1");
+                receivableFeeManagementMapper.updateReceivableFeeManagement(feeManagement);
             }
             
             // 璋冪敤鎵归噺鏇存柊鏂规硶
-            updateReceivableFeeManagementBatch(feeManagements);
+
         }
 
         return i;

--
Gitblit v1.8.0