From d6b30c6097618391359565de48519614363e8a26 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 05 四月 2024 22:23:13 +0800
Subject: [PATCH] 优化时间不对bug

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

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
index 8cae930..9b12ed5 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
@@ -127,7 +127,7 @@
             }
             Date maxEndTime = feeDtos.get(0).getDeadlineTime();
             //鍛ㄦ湡鎬ц垂鐢�
-            if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+            if (maxEndTime == null) {
                 maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
             }
 
@@ -230,7 +230,7 @@
 
         PayFeePo payFeePo = new PayFeePo();
         payFeePo.setFeeId(payFeeDataDto.getFeeId());
-        payFeePo.setEndTime(payFeeDetailPo.getEndTime());
+        payFeePo.setEndTime(DateUtil.getNextSecTime(payFeeDetailPo.getEndTime()));
         payFeePo.setState(FeeDto.STATE_FINISH);
 
         Date maxTime = payFeeDataDto.getFeeDto().getDeadlineTime();

--
Gitblit v1.8.0