From 65f504c971b3ba63529ea5dd4e9123d5d5388812 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 21 八月 2024 17:10:41 +0800
Subject: [PATCH] 优化采购提示消息不准确问题
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 16 ++++++++++++++++
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java | 2 +-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index bf59984..a152ff6 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -817,6 +817,22 @@
return calendar.getTime();
}
+ /**
+ * 闄ゅ幓 灏忔椂 鍒� 绉�
+ *
+ * deadtime 鏈潵灏卞皯浜嗕竴绉�
+ *
+ * @param time
+ * @return
+ */
+ public static Date deadTimeToDate(Date time) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ calendar.add(Calendar.SECOND,1);
+ setTimeToMidnight(calendar);
+ return calendar.getTime();
+ }
+
public static boolean sameMonthDay(Date startDate, Date endDate) {
Calendar startCalendar = Calendar.getInstance();
startCalendar.setTime(startDate);
diff --git a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
index ceffe4b..ac03b23 100644
--- a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
+++ b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
@@ -177,7 +177,7 @@
List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
// todo 澶勭悊 寮�濮嬫椂闂村拰缁撴潫鏃堕棿
Date startTime = DateUtil.timeToDate(feeDto.getEndTime());
- Date endTime = DateUtil.timeToDate(deadlineTime);
+ Date endTime = DateUtil.deadTimeToDate(deadlineTime);
BigDecimal receivableAmount = new BigDecimal(feePrice);
--
Gitblit v1.8.0