From 402d54b051a96b61a5bab774437e98705b64708d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 17 五月 2023 18:30:50 +0800
Subject: [PATCH] optimize pay fee detail to month
---
service-fee/src/main/java/com/java110/fee/feeMonth/IPayFeeMonthHelp.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/feeMonth/IPayFeeMonthHelp.java b/service-fee/src/main/java/com/java110/fee/feeMonth/IPayFeeMonthHelp.java
index a02a074..9fbd7dc 100644
--- a/service-fee/src/main/java/com/java110/fee/feeMonth/IPayFeeMonthHelp.java
+++ b/service-fee/src/main/java/com/java110/fee/feeMonth/IPayFeeMonthHelp.java
@@ -2,10 +2,12 @@
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.fee.MonthFeeDetailDto;
import com.java110.dto.payFeeDetailMonth.PayFeeMonthOwnerDto;
import java.util.Date;
import java.util.List;
+import java.util.Map;
public interface IPayFeeMonthHelp {
@@ -14,7 +16,7 @@
Double getMonthFeePrice(FeeDto feeDto);
- Double getReceivableAmount(List<FeeDetailDto> feeDetailDtos, Double feePrice, Date curDate, FeeDto feeDto);
+ Double getReceivableAmount(List<FeeDetailDto> feeDetailDtos,Map<String, MonthFeeDetailDto> monthFeeDetailDtos, Double feePrice, Date curDate, FeeDto feeDto);
/**
* 璁＄畻瀹炴敹
@@ -22,7 +24,7 @@
* @param feePrice
* @return
*/
- Double getReceivedAmount(List<FeeDetailDto> feeDetailDtos, Double feePrice, Date curDate, FeeDto feeDto);
+ Double getReceivedAmount(List<FeeDetailDto> feeDetailDtos,Map<String ,MonthFeeDetailDto> monthFeeDetailDtos, Double feePrice, Date curDate, FeeDto feeDto);
Double getDiscountAmount(Double feePrice, double receivedAmount, Date curDate, FeeDto feeDto);
@@ -41,4 +43,11 @@
* @return
*/
String getFeeFeeTime(List<FeeDetailDto> feeDetailDtos, String detailId);
+
+ /**
+ * 缂磋垂璁板綍杞崲涓烘湀缂磋垂璁板綍锛岄噾棰� 闄や互 缂磋垂鏃堕棿娈靛唴鎵�鍖呭惈鐨勬湀涓暟
+ * @param feeDetailDtos
+ * @return
+ */
+ Map<String ,MonthFeeDetailDto> analysisMonthFeeDetail(List<FeeDetailDto> feeDetailDtos);
}
--
Gitblit v1.8.0