修改管家核销订单列表

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/CrosstownTypeEnum.java

@@ -7,6 +7,7 @@ public enum CrosstownTypeEnum {
     DEPARTURE(1, "交车"),
     ARRIVE(2, "还车"),
     FIXED_LOSS(3, "定损"),
+    FIXED_LOSS_NOW(4, "定损"),
     ;
     /**
      * 编码

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

@@ -12,6 +12,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.user.UserInfoBiz;
+import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
@@ -304,6 +305,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, orderVehicleCrosstown);
+            orderVehicleCrosstownBiz.updateSelectiveByIdRe(orderVehicleCrosstown);
             RestResponse<Vehicle> response = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
             if (response.getData() != null) {
                 orderVehicleCrosstownDto.setVehicleNumberPlat(response.getData().getNumberPlate());
@@ -358,6 +360,19 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
+            } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) { //直接定损还车
+                orderVehicleCrosstown.setType(CrosstownTypeEnum.FIXED_LOSS.getCode());
+                DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
+                depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
+                depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
+                depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
+                depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
+                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
+                //修改訂單狀態為已完成
+                baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
+                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                orderRentVehicleDetail.setFixedLossStatus(1);
+                orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             }
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
             DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUND.getCode());