From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/feeMonth/IPayFeeMonthHelp.java |   42 ++++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 26 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 0a2e8c2..9bf1f37 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
@@ -1,11 +1,9 @@
 package com.java110.fee.feeMonth;
 
-import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
-import com.java110.dto.payFeeDetailMonth.PayFeeMonthOwnerDto;
+import com.java110.dto.payFee.PayFeeMonthOwnerDto;
 
 import java.util.Date;
-import java.util.List;
 
 public interface IPayFeeMonthHelp {
 
@@ -14,31 +12,23 @@
     Double getMonthFeePrice(FeeDto feeDto);
 
 
-    Double getReceivableAmount(List<FeeDetailDto> feeDetailDtos, Double feePrice, Date curDate, FeeDto feeDto);
+
+    Double getDiscountAmount(Double feePrice, double receivedAmount, Date curDate, FeeDto feeDto);
+
 
     /**
-     * 璁$畻瀹炴敹
-     * @param feeDetailDtos
+     * 澶勭悊瀹炴敹 闂
+     * @param feeDto
+     * @param payFeeMonthOwnerDto
+     */
+    void waitDispersedFeeDetail(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto);
+
+    /**
+     * 澶勭悊娆犺垂闂
+     * @param feeDto
+     * @param payFeeMonthOwnerDto
      * @param feePrice
-     * @return
+     * @param deadlineTime
      */
-    Double getReceivedAmount(List<FeeDetailDto> feeDetailDtos, Double feePrice, Date curDate, FeeDto feeDto);
-
-    Double getDiscountAmount(Double feePrice, double parseDouble, Date curDate, FeeDto feeDto);
-
-    /**
-     * 璁$畻缂磋垂DetailId
-     * @param feeDetailDtos
-     * @param time
-     * @return
-     */
-    String getFeeDetailId(List<FeeDetailDto> feeDetailDtos, Date time);
-
-    /**
-     * 鑾峰彇 鏀粯鏃堕棿
-     * @param feeDetailDtos
-     * @param detailId
-     * @return
-     */
-    String getFeeFeeTime(List<FeeDetailDto> feeDetailDtos, String detailId);
+    void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime);
 }

--
Gitblit v1.8.0