Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -616,7 +616,7 @@ public class DateUtils extends PropertyEditorSupport {
         }
 
         if (flag == day) {
-            return (int) (millisDiff / DAY_IN_MILLIS);
+            return (int) Math.ceil((millisDiff * 1.0 / DAY_IN_MILLIS));
         }
 
         if (flag == hour) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomsLivingOrder.java

@@ -227,4 +227,8 @@ public class BusRoomsLivingOrder implements Serializable {
     @TableField(exist = false)
     private BigDecimal shouKuan;
 
+    // 已住几晚
+    @TableField(exist = false)
+    private Integer liveDayCount;
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -1037,6 +1037,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                  Map<String,BigDecimal> feeMap = getRoomOrderFees(livingOrder.getId());
                  livingOrder.setXiaoFei(feeMap.get("xf"));
                  livingOrder.setShouKuan(feeMap.get("sk"));
+                 // 获取入住天数
+                 livingOrder.setLiveDayCount(getLivingDayCount(livingOrder));
+
                  vo.getLivingData().setLivingOrder(livingOrder);
 
 
@@ -1053,6 +1056,15 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         return roomVos;
     }
 
+    private Integer getLivingDayCount(BusRoomsLivingOrder order) {
+        Calendar calendarBeijian = new GregorianCalendar();
+        calendarBeijian.setTime(order.getDueOutTime());
+        Calendar calendarJian = new GregorianCalendar();
+        calendarJian.setTime(order.getArrivalTime());
+        int count = DateUtils.dateDiff('d',calendarBeijian,calendarJian);
+       return  count == 0 ? 1:count;
+    }
+
     private Map<String, BigDecimal> getRoomOrderFees(String livingOrderId) {
         List<BusOrderFee> fees = feeService.list(Wrappers.<BusOrderFee>query()
         .eq("living_order_id",livingOrderId).eq("preferential_status",1));

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/test/Test.java

@@ -18,5 +18,7 @@ public class Test {
         // 这个时间就是日期往后推一天的结果
         date = calendar.getTime();
         System.out.println(DateUtils.formatDate(date));
+        double a =  Math.ceil(((10L* 1.0) / 3L));
+        System.out.println(a);
     }
 }