预定单 预约单 预定时间校验模式修改

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/utils/DateUtils.java

@@ -45,7 +45,37 @@ public class DateUtils {
     }
 
     public static int diffDay(Date before, Date after) {
-        return Integer.parseInt(String.valueOf((after.getTime() - before.getTime()) / 86400000L));
+        Calendar cal1 = Calendar.getInstance();
+        cal1.setTime(before);
+
+        Calendar cal2 = Calendar.getInstance();
+        cal2.setTime(after);
+        int day1= cal1.get(Calendar.DAY_OF_YEAR);
+        int day2 = cal2.get(Calendar.DAY_OF_YEAR);
+
+        int year1 = cal1.get(Calendar.YEAR);
+        int year2 = cal2.get(Calendar.YEAR);
+        if(year1 != year2)   //同一年
+        {
+            int timeDistance = 0 ;
+            for(int i = year1 ; i < year2 ; i ++)
+            {
+                if(i%4==0 && i%100!=0 || i%400==0)    //闰年
+                {
+                    timeDistance += 366;
+                }
+                else    //不是闰年
+                {
+                    timeDistance += 365;
+                }
+            }
+
+            return timeDistance + (day2-day1) ;
+        }
+        else    //不同年
+        {
+            return day2-day1;
+        }
     }
 
 }