日历价格

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

@@ -219,10 +219,9 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
      * @param startDate
      * @param endDate
      * @param vehicleModelId
-     * @param type
      * @return
      */
-    public List<VehicleModelCalendarPriceVo> listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(Date startDate, Date endDate, Integer vehicleModelId, Integer type, Integer userId) {
+    public List<VehicleModelCalendarPriceVo> listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(Date startDate, Date endDate, Integer vehicleModelId, Integer userId) {
         List<VehicleModelCalendarPriceVo> vehicleModelCalendarPriceVos = new ArrayList<>();
         //车型的原价
         BigDecimal vehicle_price = new BigDecimal(0);
@@ -245,13 +244,11 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
         List<VehicleModelHolidayPriceDTO> vehicleModelHolidayPrices = vehicleModelHolidayPriceBiz.findVehicleModelHolidayPriceByMonth(final_startDate, final_endDate);
         Map<Date, VehicleModelHolidayPriceDTO> festivalDayMap = vehicleModelHolidayPrices.stream().collect(Collectors.toMap(VehicleModelHolidayPriceDTO::getFestivalDay, Function.identity()));
 
-        if (type == PRICE_OF_TYPE) {
         vehicle_price = vehicleModelBiz.findVehicleModelPriceByVehicleModelId(vehicleModelId);
         if (Objects.nonNull(userId)) {
             BaseUserMember baseUserMember = userFeign.findBaseUserMemberByUserId(userId);
             discount = baseUserMember == null ? discount : baseUserMember.getDiscount();
         }
-        }
         VehicleModelCalendarPriceVo vehicleModelCalendarPriceVo;
         LocalDate startLocalDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         LocalDate endLocalDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
@@ -267,7 +264,6 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
             } else {
                 vehicleModelCalendarPriceVo.setIsSelect(false);
             }
-            if (type == PRICE_OF_TYPE) {
             if (calendarPriceMap != null && !calendarPriceMap.isEmpty()) {
                 VehicleModelCalendarPrice vehicleModelCalendarPrice = calendarPriceMap.get(current_date);
                 if (Objects.isNull(vehicleModelCalendarPrice)) {
@@ -275,6 +271,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                         VehicleModelHolidayPriceDTO vehicleModelHolidayPriceDTO = festivalDayMap.get(current_date);
                         if (Objects.nonNull(vehicleModelHolidayPriceDTO)) {
                             vehicle_price = vehicle_price.multiply(new BigDecimal(vehicleModelHolidayPriceDTO.getMultiple().doubleValue() * (discount / 100)));
+                            free_days = vehicleModelHolidayPriceDTO.getFreeDays();
                         }
                     }
                 } else {
@@ -291,25 +288,9 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                         default:
                             break;
                     }
-
-                    }
-                }
-                vehicleModelCalendarPriceVo.setPrice(vehicle_price);
-            }
-            if (type == DAYS_OF_TYPE) {
-                if (calendarPriceMap != null && !calendarPriceMap.isEmpty()) {
-                    VehicleModelCalendarPrice vehicleModelCalendarPrice = calendarPriceMap.get(current_date);
-                    if (Objects.isNull(vehicleModelCalendarPrice)) {
-                        if (festivalDayMap != null && !festivalDayMap.isEmpty()) {
-                            VehicleModelHolidayPriceDTO vehicleModelHolidayPriceDTO = festivalDayMap.get(current_date);
-                            if (Objects.nonNull(vehicleModelHolidayPriceDTO)) {
-                                free_days = vehicleModelHolidayPriceDTO.getFreeDays();
-                            }
-                        }
-                    } else {
                     free_days = vehicleModelCalendarPrice.getFreeDays();
                 }
-                }
+                vehicleModelCalendarPriceVo.setPrice(vehicle_price);
                 vehicleModelCalendarPriceVo.setDays(free_days);
             }
             final_startLocalDate = final_startLocalDate.plusDays(1);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelCalendarPriceController.java

@@ -33,9 +33,8 @@ public class VehicleModelCalendarPriceController {
      public ObjectRestResponse<VehicleModelCalendarPriceVo> listVehicleModelCalendarPriceByDateAndVehicleModelId(@RequestParam(value = "start",required = false) Date startDate,
                                                                                                                  @RequestParam(value = "end",required = false) Date endDate,
                                                                                                                  @PathVariable(value = "vehicleModelId") Integer vehicleModelId,
-                                                                                                                 @PathVariable(value = "type")Integer type,
                                                                                                                  AppUserDTO appUserDTO){
-          List<VehicleModelCalendarPriceVo> vehicleModelCalendarPriceVos = vehicleModelCalendarPriceBiz.listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(startDate,endDate,vehicleModelId,type,appUserDTO.getUserid());
+          List<VehicleModelCalendarPriceVo> vehicleModelCalendarPriceVos = vehicleModelCalendarPriceBiz.listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(startDate,endDate,vehicleModelId,appUserDTO.getUserid());
           return ObjectRestResponse.succ(vehicleModelCalendarPriceVos);
      }
 }