添加价格类型

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/calculate/InProgressVO.java

@@ -45,6 +45,11 @@ public class InProgressVO {
      */
     Integer usedDays = 0;
 
+    /**
+     * 已使用小时数
+     */
+    Integer usedHours = 0;
+
     /**
      * 已使用的金额
      */

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -62,6 +62,7 @@ public class DictionaryKey {
     public static final String DAMAGE_SAFE = "DAMAGE_SAFE";
     public static final String ILLEGAL_RESERVE = "ILLEGAL_RESERVE";
     public static final String RENT_TIME_BUFFER = "RENT_TIME_BUFFER";
+    public static final String RENT_TIME_HOUR_BUFFER = "RENT_TIME_HOUR_BUFFER";
 
     /**
      * 旅游：保险费用

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/inter/CalculateInterface.java

@@ -58,7 +58,7 @@ public interface CalculateInterface {
         Map<String, Dictionary> dictionaryMap = getThirdFeign().dictionaryGetAll4Map().getData();
         Long hourLong = (60L * 60L * 1000L);
         //Long dayLong = hourLong * 24;
-        Long bufferLong = 0L;
+        Long bufferLong = Long.valueOf(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_TIME_HOUR_BUFFER).getDetail()) * hourLong;
 
         //计算：使用天数 当前时间 - 开始时间的0时0分0秒
         Long bookTimeLag = endLong - startLong;