From 3135ac10ab738063bb5df39b3c5cc0f143d11061 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 07 一月 2026 16:11:15 +0800
Subject: [PATCH] 新增开票接口

---
 service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java
index 1a0671b..526229b 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java
@@ -146,7 +146,7 @@
         }
         String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YF);
         payableFeeManagement.setSystemNo(noByKey);
-        
+        payableFeeManagement.setCreateBy(SecurityUtils.getUsername());
         // 淇濆瓨涓诲疄浣�
         int result = payableFeeManagementMapper.insertPayableFeeManagement(payableFeeManagement);
         Integer payableFeeId = payableFeeManagement.getId();
@@ -217,7 +217,7 @@
             // 璁剧疆姣忎釜鏄庣粏鐨勫簲浠樿垂鐢ㄧ鐞咺D
             payableFeeManagement.getPayableFeeDetailList().forEach(detail -> {
                 detail.setPayableFeeId(payableFeeId);
-                detail.setUpdateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
+                detail.setCreateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
             });
             
             // 璋冪敤鎵归噺鎻掑叆鏂规硶
@@ -434,7 +434,22 @@
         
         return result;
     }
+    /**
+     * 鏍规嵁鍏宠仈璐﹀崟缂栧彿鎵归噺鏇存柊搴斾粯璐圭敤绠$悊璁板綍
+     * 娓呴櫎鍏宠仈璐﹀崟缂栧彿骞跺皢鐘舵�佹敼涓�0锛堝緟鐢熸垚璐﹀崟锛�
+     * 浣跨敤鍦烘櫙锛氬綋搴斾粯璐﹀崟琚垹闄ゆ垨浣滃簾鏃讹紝闇�瑕佸皢鍏宠仈鐨勫簲浠樿垂鐢ㄨ褰曟仮澶嶄负寰呯敓鎴愯处鍗曠姸鎬�
+     *
+     * @param relatedBillNo 鍏宠仈璐﹀崟缂栧彿
+     * @return 褰卞搷鐨勮鏁�
+     */
+    @Override
+    public int updatePayableFeeManagementByRelatedBillNo(String relatedBillNo)
+    {
+        // 璋冪敤Mapper灞傛柟娉曟墽琛屾壒閲忔洿鏂�
+        int result = payableFeeManagementMapper.updatePayableFeeManagementByRelatedBillNo(relatedBillNo);
 
+        return result;
+    }
     /**
      * 浣滃簾搴斾粯璐圭敤绠$悊璁板綍
      *
@@ -492,7 +507,7 @@
         Map<String, BigDecimal> currencyAmountMap = new HashMap<>();
         for (PayableFeeDetail detail : detailList) {
             String currency = detail.getCurrency();
-            BigDecimal billingAmount = detail.getBillingAmount();
+            BigDecimal billingAmount = detail.getActualAmount();
             
             if (currency != null && billingAmount != null) {
                 currencyAmountMap.merge(currency, billingAmount, BigDecimal::add);
@@ -509,7 +524,7 @@
             
             // 鏍规嵁甯佺鏄剧ず瀵瑰簲鐨勮揣甯佸悕绉�
             String currency = entry.getKey();
-            if ("CNY".equals(currency)) {
+            if ("RMB".equals(currency)) {
                 sb.append("浜烘皯甯�");
             } else if ("HKD".equals(currency)) {
                 sb.append("娓竵");

--
Gitblit v1.8.0