Merge branch 'holiday-price' into dev

eda3ef8f · 周健威 · 83aaa1e4 · 3cb98b39 · eda3ef8f
Commit eda3ef8f authored Oct 24, 2019 by 周健威
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

OrderRentVehicleService.java .../xxfc/platform/order/service/OrderRentVehicleService.java +2 -2

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
@@ -316,8 +316,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
        //计算价格
        if(vehicleDayNum > 0) {
            for(int i = cutDayNum; i < vmcpds.size(); i++) {
-                vehicleAmount.add(vmcpds.get(i).getPrice());
+                vehicleAmount = vehicleAmount.add(vmcpds.get(i).getPrice());
-                metaVehicleAmount.add(vmcpds.get(i).getNo_discount_price());
+                metaVehicleAmount = metaVehicleAmount.add(vmcpds.get(i).getNo_discount_price());
            }
        }else {
            vehicleOrderItem.setUnitPrice(BigDecimal.ZERO);