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

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

@@ -176,7 +176,7 @@ public class OrderCalculateBiz {
         InProgressVO inProgressVO = inProgressCalculate(baseOrder, orderItem, orvd.getFreeDays(), useDays, oad);
 
         //定金 - （额外消费金额 + 违约金）
-        oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getConsumeAmount().add(inProgressVO.getViolateAmount())));
+        oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getExtraAmount().add(inProgressVO.getViolateAmount())));
         oad.setOrderAmount(inProgressVO.getRefundOrderAmount());
         oad.setOriginDepositAmount(orvd.getDeposit());
         oad.setOriginOrderAmount(baseOrder.getGoodsAmount());

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -327,7 +327,7 @@ public class VehicleActiveService {
                     while (iterator.hasNext()) {
                         VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
                         //未出车且超过出车时间和已出车的和本条记录过滤，剩下为正常未出车记录
-                        if ((arrivalVo.getBookRecordId() <= vehicleBookRecordVo.getId()) || (vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null)) {
+                        if ((arrivalVo.getBookRecordId().equals(vehicleBookRecordVo.getId())) || ((vehicleBookRecordVo.getBookStartDate().getTime() - vehicleBookRecord.getBookEndDate().getTime() > 0))) {
                             iterator.remove();
                         }
                     }