Commit d0151b8f authored by 周健威's avatar 周健威

修改代码

parent afb68825
...@@ -313,7 +313,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl ...@@ -313,7 +313,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
if(vehicleDayNum > 0) { if(vehicleDayNum > 0) {
for(int i = cutDayNum; i < vmcpds.size(); i++) { for(int i = cutDayNum; i < vmcpds.size(); i++) {
vehicleAmount.add(vmcpds.get(i).getPrice()); vehicleAmount.add(vmcpds.get(i).getPrice());
metaVehicleAmount.add(vmcpds.get(i).getPrice()); metaVehicleAmount.add(vmcpds.get(i).getNo_discount_price());
} }
}else { }else {
vehicleOrderItem.setUnitPrice(BigDecimal.ZERO); vehicleOrderItem.setUnitPrice(BigDecimal.ZERO);
...@@ -325,7 +325,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl ...@@ -325,7 +325,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
} }
//平均单价 = 总价 / 实际消费天数 //平均单价 = 总价 / 实际消费天数
vehicleOrderItem.calculateVehicleUnitPrice(vehicleAmount, metaVehicleAmount, Boolean.TRUE, Boolean.TRUE); vehicleOrderItem.calculateVehicleUnitPrice(vehicleAmount, metaVehicleAmount, Boolean.TRUE);
if(DRIVER_TYPE_COMPANY.equals(detail.getDriverType())) { if(DRIVER_TYPE_COMPANY.equals(detail.getDriverType())) {
//计算司机费用 //计算司机费用
......
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