From 098af4eba64c197e8131df61082070d9c766bf87 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 30 三月 2026 10:46:53 +0800
Subject: [PATCH] 新增作废

---
 tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 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 f5a1fc9..e72160b 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;
 
@@ -183,8 +185,10 @@
 
     @Override
     public int saveTmsFinanceDetail(TmsFinanceDetail tmsFinanceDetail) {
-        insertTmsFinanceDetail(tmsFinanceDetail);
-
+        if (StringUtils.isNotEmpty(tmsFinanceDetail.getFeeType() ) &&
+                tmsFinanceDetail.getActualFeeAmount() != null){
+            insertTmsFinanceDetail(tmsFinanceDetail);
+        }
         List<FinanceDetailRow> rowItems = tmsFinanceDetail.getRowItems();
         if (rowItems != null && !rowItems.isEmpty()){
 
@@ -192,6 +196,10 @@
                 if (rowItem.getIsYF() != null && rowItem.getIsYF() == 0){
                     rowItem.setYfPrice(null);
                     rowItem.setYfCurrency(null);
+                    rowItem.setYfServiceProviderId(null);
+                    rowItem.setYfServiceProviderType(null);
+                    rowItem.setYfServiceProviderIdType(null);
+                    rowItem.setYfServiceProviderName(null);
                 }
                 TmsFinanceDetail tmsFinanceDetailNew = BeanUtil.copyProperties(rowItem, TmsFinanceDetail.class);
                 tmsFinanceDetailMapper.updateTmsFinanceDetail(tmsFinanceDetailNew);
@@ -199,6 +207,28 @@
         }
         return 1;
 
+
+    }
+
+    @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);
 
     }
 
@@ -284,6 +314,11 @@
         }};
         return tmsFinanceMapper.updateTmsFinance(tmsFinance1);
     }
+    @Override
+    public int updateTmsFinanceDetail2(TmsFinanceDetail tmsFinanceDetail)
+    {
+      return tmsFinanceDetailMapper.updateTmsFinanceDetail(tmsFinanceDetail);
+    }
 
     @Override
     public AjaxResult cancelFinanceDetail(Integer id) {

--
Gitblit v1.8.0