From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
index cc2ccfb..122bcfd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
@@ -1,11 +1,13 @@
package com.ruoyi.project.service;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.project.domain.*;
+import com.ruoyi.project.domain.vo.TaxMoneySumEO;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import com.ruoyi.project.domain.vo.TaxedMoneyVO;
import org.springframework.web.bind.annotation.PathVariable;
@@ -61,11 +63,22 @@
List<ServiceFunddetailVO> getFundDetail(Long id);
/**
- * 鏍规嵁鏉′欢绠楃◣
+ * 鏍规嵁鏉′欢绠楃◣锛堝姵鍔′釜绋� + 澧炲�肩◣ + 鍩庡缓绋庯級
*
* @param serviceFunddetails
*/
- public Boolean calculateTax(List<ServiceFunddetail> serviceFunddetails);
+ public Boolean calculateTax(List<ServiceFunddetail> serviceFunddetails, Map<String, TaxMoneySumEO> tempTaxSumMap);
+
+ /**
+ * 鏍规嵁鏉′欢绠楃◣锛屽苟鎸囧畾鏈壒绠楃◣鏃堕棿锛堝悓鎵规槑缁� tax_time 涓�鑷达級
+ *
+ * @param serviceFunddetails 鏄庣粏鍒楄〃
+ * @param tempTaxSumMap 鏈湀绱缂撳瓨
+ * @param taxTime 鏈绠楃◣鏃堕棿
+ */
+ public Boolean calculateTax(List<ServiceFunddetail> serviceFunddetails, Map<String, TaxMoneySumEO> tempTaxSumMap, Date taxTime);
+
+// public Boolean calculateTax2(List<ServiceFunddetail> serviceFunddetails);
/**
* 缁╂晥璁＄畻
--
Gitblit v1.9.3