Commit 8b61d5c7 authored by 周健威's avatar 周健威

Merge branch 'holiday-price' into dev

parents cf7d929e 4492f271
...@@ -145,7 +145,7 @@ public class VehicleItemDTO extends OrderItem { ...@@ -145,7 +145,7 @@ public class VehicleItemDTO extends OrderItem {
public Integer mapFreeDays(Integer userDays) { public Integer mapFreeDays(Integer userDays) {
List<VMCalendarPriceCostDTO> vmcpds = getVehicleDetail(); List<VMCalendarPriceCostDTO> vmcpds = getVehicleDetail();
if(userDays < getTotalNum()) { if(userDays > getTotalNum()) {
userDays = getTotalNum(); userDays = getTotalNum();
} }
if(CollUtil.isEmpty(vmcpds)){ if(CollUtil.isEmpty(vmcpds)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment