From 46675f1b0e738d6feac132606612e16056c9aee6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 15 五月 2025 01:02:52 +0800
Subject: [PATCH] 优化基础报表产生数据逻辑将自然月和非自然月却别对待

---
 service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java
index ce9890d..6232ee5 100644
--- a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java
@@ -230,8 +230,10 @@
 
 
         //todo 澶勭悊 endTime 鍒� deadlineTime 鐨勮垂鐢�
-        Date deadlineTime = computeFeeSMOImpl.getDeadlineTime(feeDto);
-        payFeeMonthHelp.waitDispersedOweFee(feeDto, payFeeMonthOwnerDto, feePrice, deadlineTime);
+        Map info = computeFeeSMOImpl.getTargetEndDateAndOweMonth(feeDto);
+        Date deadlineTime = (Date) info.get("targetEndDate");
+        double oweMonth = (double)info.get("targetEndDate");
+        payFeeMonthHelp.waitDispersedOweFee(feeDto, payFeeMonthOwnerDto, feePrice, deadlineTime,oweMonth);
 
     }
 

--
Gitblit v1.8.0