Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -341,7 +341,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		DedDetailDTO dedDetailDTO = new DedDetailDTO();
 		//提前还车,结束时间大于当前时间
 		Long nowTime = System.currentTimeMillis();
-		Long endTime = orderPageVO.getOrderRentVehicleDetail().getEndTime();
+		Long endTime = (null == orderPageVO.getOrderRentVehicleDetail().getDelayAddEndTime()) ?
+				orderPageVO.getOrderRentVehicleDetail().getEndTime() : orderPageVO.getOrderRentVehicleDetail().getDelayAddEndTime();
 		Long startTime = orderPageVO.getOrderRentVehicleDetail().getStartTime();
 
 		//设置使用天数

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java

@@ -254,7 +254,7 @@ public class OrderCalculateBiz {
 
             //"{}元/天 x{}天"
             BigDecimal residueAmount = BigDecimal.ZERO;
-            for(int i = useDays; i < vehicleItemDTO.getTotalNum(); i++) {
+            for(int i = useDays; i < realVmcpds.size(); i++) {
                 residueAmount = residueAmount.add(realVmcpds.get(i).getPrice());
                 inProgressVO.getViolateAmountList().add(realVmcpds.get(i));
             }