diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index 14e20cba2..d9f56c0ea 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -965,14 +965,14 @@ public class DateUtils { * @return */ public static boolean isInDate15Mins(Date date, Date curDate) { - Calendar cal = Calendar.getInstance(); - cal.setTime(curDate); - cal.add(Calendar.MINUTE, -15); - Date timeStart = cal.getTime(); - cal.add(Calendar.MINUTE, 15); - Date timeEnd = cal.getTime(); + long diff = 0; + if (curDate.before(date)) { + diff = date.getTime() - curDate.getTime(); + } else { + diff = curDate.getTime() - date.getTime(); + } - if (date.after(timeStart) && date.before(timeEnd)) { + if (diff <= (1000*60*15)) { return true; } else { return false; @@ -1224,11 +1224,13 @@ public class DateUtils { return startLocalDate.until(endLocalDate, ChronoUnit.DAYS); } - public static void main(String[] args) { - Date curDate = new Date(); - Date limitDate = DateUtils.getTimeAfterDays(7, curDate); - System.out.println(curDate); - System.out.println(limitDate); + public static void main(String[] args) throws Exception { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String feeTimeStr = "2019-08-07 12:44:41"; + String oldFeeTimeStr = "2019-08-07 12:44:28"; + Date feeTime = dateFormat.parse(feeTimeStr); + Date oldFeeTime = dateFormat.parse(oldFeeTimeStr); + System.out.println(DateUtils.isInDate15Mins(feeTime, oldFeeTime)); } }