Merge remote-tracking branch 'origin/holiday-price' into holiday-price

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

@@ -19,13 +19,18 @@ import java.util.List;
 public class VehicleItemDTO extends OrderItem {
     public static final int topNum = 2;
     public BigDecimal calculateVehicleUnitPrice(BigDecimal vehicleAmount, BigDecimal metaVehicleAmount, Boolean isSetRealAmount) {
-        BigDecimal unitPrice = vehicleAmount.divide(new BigDecimal(getCalculateNum()+ ""), 2, RoundingMode.HALF_UP);
-        BigDecimal metaUnitPrice = metaVehicleAmount.divide(new BigDecimal(getCalculateNum()+ ""), 2, RoundingMode.HALF_UP);
-
         if(isSetRealAmount) {
             setRealAmount(vehicleAmount);
         }
 
+        BigDecimal unitPrice = BigDecimal.ZERO;
+        BigDecimal metaUnitPrice = BigDecimal.ZERO;
+
+        if(getCalculateNum() > 0) {
+            unitPrice = vehicleAmount.divide(new BigDecimal(getCalculateNum()+ ""), 2, RoundingMode.HALF_UP);
+            metaUnitPrice = metaVehicleAmount.divide(new BigDecimal(getCalculateNum()+ ""), 2, RoundingMode.HALF_UP);
+        }
+
         setUnitPrice(unitPrice);
         setMetaUnitPrice(metaUnitPrice);
 

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());
-                metaVehicleAmount.add(vmcpds.get(i).getNo_discount_price());
+                vehicleAmount = vehicleAmount.add(vmcpds.get(i).getPrice());
+                metaVehicleAmount = metaVehicleAmount.add(vmcpds.get(i).getNo_discount_price());
             }
         }else {
             vehicleOrderItem.setUnitPrice(BigDecimal.ZERO);