日历价格

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelCalendarPriceBiz.java

@@ -45,6 +45,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
     private static final Integer DEFAULT_FREE_DAYS = 1;
     private static final Integer DEFAULT_MEMBER_LEVEL = 0;
     private static final String PRICE_VAL = "price";
+    private static final String BASE_PRICE_VAL="basePrice";
     private static final String DAYS_VAL = "freeDays";
 
     private final VehicleModelHolidayPriceBiz vehicleModelHolidayPriceBiz;
@@ -291,6 +292,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
             if (price_freeDays_map != null && !price_freeDays_map.isEmpty()) {
                 vehicle_price = (BigDecimal) price_freeDays_map.get(PRICE_VAL);
                 free_days = (Integer) price_freeDays_map.get(DAYS_VAL);
+                no_discount_price = (BigDecimal) price_freeDays_map.get(BASE_PRICE_VAL);
             }
             vehicleModelCalendarPriceDTO.setNo_discount_price(no_discount_price);
             vehicleModelCalendarPriceDTO.setPrice(vehicle_price.setScale(2, RoundingMode.HALF_UP));
@@ -302,7 +304,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
     }
 
     /**
-     * 节假日价格和免费天数 处理
+     * (节假日|非节假日未设置的)价格和免费天数 处理
      *
      * @param festivalDayMap
      * @param current_date
@@ -311,17 +313,19 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
      * @return
      */
     public Map<String, Object> transfromPriceAndFreeDaysByDate(Map<Date, VehicleModelHolidayPriceDTO> festivalDayMap, Date current_date, BigDecimal vehicle_price, Integer discount) {
-        Map<String, Object> vehicle_price_days_map = new HashMap<>(2);
+        Map<String, Object> vehicle_price_days_map = new HashMap<>(3);
+        Integer free_days = DEFAULT_FREE_DAYS;
+        vehicle_price_days_map.put(BASE_PRICE_VAL,vehicle_price);
         if (festivalDayMap != null && !festivalDayMap.isEmpty()) {
-            Integer free_days = DEFAULT_FREE_DAYS;
             VehicleModelHolidayPriceDTO vehicleModelHolidayPriceDTO = festivalDayMap.get(current_date);
             if (Objects.nonNull(vehicleModelHolidayPriceDTO)) {
-                vehicle_price = vehicle_price.multiply(new BigDecimal(vehicleModelHolidayPriceDTO.getMultiple().doubleValue() * (discount / 100.00)));
+                vehicle_price = vehicle_price.multiply(new BigDecimal(vehicleModelHolidayPriceDTO.getMultiple().doubleValue()));
                 free_days = vehicleModelHolidayPriceDTO.getFreeDays() == null ? free_days : vehicleModelHolidayPriceDTO.getFreeDays();
-                vehicle_price_days_map.put(PRICE_VAL, vehicle_price);
-                vehicle_price_days_map.put(DAYS_VAL, free_days);
             }
         }
+        vehicle_price = vehicle_price.multiply(new BigDecimal(discount / 100.00));
+        vehicle_price_days_map.put(PRICE_VAL, vehicle_price);
+        vehicle_price_days_map.put(DAYS_VAL, free_days);
         return vehicle_price_days_map;
     }