Merge branch 'holiday-price' into dev

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

@@ -105,17 +105,14 @@ public class VehicleItemDTO extends OrderItem {
 
     public BigDecimal getUsedAmount(Integer useDays) {
         List<VMCalendarPriceCostDTO> vmcpds = getVehicleDetail();
-        if(CollUtil.isEmpty(vmcpds)){
         if(useDays > getTotalNum()) {
             useDays = getTotalNum();
         }
+        if(CollUtil.isEmpty(vmcpds)){
             return getUnitPrice().multiply(new BigDecimal(useDays+ ""));
         }
 
         BigDecimal usedAmount = BigDecimal.ZERO;
-//        for(VMCalendarPriceCostDTO vmcpcd : vmcpds) {
-//            usedAmount.add(vmcpcd.getPrice());
-//        }
         for(int i = 0; i < useDays; i++) {
             usedAmount = usedAmount.add(vmcpds.get(i).getPrice());
         }