网关日志限制修改

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

@@ -165,7 +165,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                return ObjectRestResponse.createFailedResult(3501, "无收车权限");
            }
        }
-
         if(baseOrder.getStatus() != -1) {
             Vehicle vehicle = null;
             RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
@@ -236,6 +235,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         orderVehicleCrosstownDto.setDeductionCost(amount);
        //扣除费用
         orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(amount));
+        if(orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+            return ObjectRestResponse.createFailedResult(500,"押金不足，不能交车，请联系客服！");
+        }
         //出车成功后修改订单状态
         List<OrderVehicleCrosstownDto> oldValue = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
         if (oldValue.size() == 1) {
@@ -271,6 +273,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             //总押金-保留金
             totalAmount = objectRestResponse.getData().getOrderRentVehicleDetail().getDeposit();
         }
+
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
             baseOrderBiz.updateSelectiveById(baseOrder);