Merge branch 'holiday-price' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/RentVehiclePriceVO.java

 package com.xxfc.platform.order.pojo.price;
 
+import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class RentVehiclePriceVO extends OrderPriceVO{
@@ -69,4 +71,9 @@ public class RentVehiclePriceVO extends OrderPriceVO{
      */
     private String couponDesc = "";
 
+    /**
+     * 使用（消耗）详情列表
+     */
+    List<VMCalendarPriceCostDTO> useAmountList;
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -413,6 +413,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rvp.setBuyVehicleAmount(vehicleOrderItem.getBuyAmount());
         rvp.setRealVehicleAmount(vehicleOrderItem.getRealAmount());
         rvp.setCouponDesc(couponDesc);
+        rvp.setUseAmountList(vehicleOrderItem.getVehicleDetail());
 
         rvp.initParamJson();
         //设置收费明细

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

@@ -361,8 +361,8 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                 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);
+            vehicleModelCalendarPriceDTO.setNo_discount_price(no_discount_price.setScale(2, BigDecimal.ROUND_HALF_UP));
+            vehicleModelCalendarPriceDTO.setPrice(vehicle_price.setScale(2, BigDecimal.ROUND_HALF_UP));
             vehicleModelCalendarPriceDTO.setFreeDays(free_days);
             final_startLocalDate = final_startLocalDate.plusDays(1);
             vehicleModelCalendarPriceVos.add(vehicleModelCalendarPriceDTO);