Przeglądaj źródła

优化采购提示消息不准确问题

wuxw 1 rok temu
rodzic
commit
65f504c971

+ 16 - 0
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -817,6 +817,22 @@ public class DateUtil {
         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);

+ 1 - 1
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java

@@ -177,7 +177,7 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
         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);