Merge branch 'holiday-price' into dev

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

@@ -244,8 +244,10 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
         BigDecimal vehicle_base_price = new BigDecimal(0);
         BigDecimal vehicle_price = vehicleModelBiz.findVehicleModelPriceByVehicleModelId(vehicleModelId);
         vehicle_base_price = vehicle_base_price.add(vehicle_price);
+        log.info("用户id【{}】",userId);
         if (Objects.nonNull(userId)) {
             BaseUserMember baseUserMember = userFeign.findBaseUserMemberByUserId(userId);
+            log.info("用户会员信息:【{}】",baseUserMember);
             discount = baseUserMember == null ? discount : baseUserMember.getDiscount();
             memberLevel = baseUserMember == null ? memberLevel : baseUserMember.getMemberLevel();
         }
@@ -315,7 +317,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
      * @return
      */
     public Map<String, Object> transfromPriceAndFreeDaysByDate(Map<Date, VehicleModelHolidayPriceDTO> festivalDayMap, Date current_date, BigDecimal vehicle_price, Integer discount) {
-        log.info("参数：【{}=={}=={}=={}】",festivalDayMap,current_date,vehicle_price,discount);
+        log.info("参数：【{}==当前时间:{}==价格:{}==折扣:{}】",festivalDayMap,current_date,vehicle_price,discount);
         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);