From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
index ce326d6..cf963b6 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -9,6 +10,7 @@
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.SystemDataNoEnum;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import javax.annotation.Resource;
 
@@ -208,6 +210,28 @@
 
     }
 
+    @Override
+    public int saveTmsFinanceDetail2(List<TmsFinanceDetail> tmsFinanceDetails) {
+        String username = SecurityUtils.getUsername();
+        Long userId = SecurityUtils.getUserId();
+        Date nowDate = DateUtils.getNowDate();
+        for (TmsFinanceDetail tmsFinanceDetail : tmsFinanceDetails) {
+            if (StringUtils.isNotEmpty(tmsFinanceDetail.getFeeType() ) &&
+                    tmsFinanceDetail.getActualFeeAmount() != null) {
+                tmsFinanceDetail.setCreateBy(username);
+                tmsFinanceDetail.setInitialFeeAmount(tmsFinanceDetail.getActualFeeAmount());
+                tmsFinanceDetail.setCreateId(userId);
+                tmsFinanceDetail.setFeeCreateTime(nowDate);
+                tmsFinanceDetail.setCreateTime(nowDate);
+            }else {
+                throw new ServiceException("閲戦鎴栬�呰垂鐢ㄧ被鍨嬩笉鑳戒负绌�");
+            }
+        }
+
+        return tmsFinanceDetailMapper.insertTmsFinanceDetailBatch(tmsFinanceDetails);
+
+    }
+
     public void addItem (TmsFinanceDetail tmsFinanceDetail){
 //        if (tmsFinance == null){
 //

--
Gitblit v1.8.0