修改车辆相关

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

@@ -315,6 +315,19 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     return ObjectRestResponse.createFailedResult(1001, restResponse.getMessage());
                 }
                 log.info("小程序订单还车成功： " + restResponse.getCode() + restResponse.getMessage());
+
+                //设置订单实际还车公司
+                CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vehicleArrivalVo.getArrivalBranchCompanyId()).getData();
+                //业务上先更新修改，业务解耦。
+                orderRentVehicleBiz.updateSelectiveById(new OrderRentVehicleDetail(){{
+                    setId(orderRentVehicleDetail.getId());
+                    setActualEndCompanyId(companyDetail.getId());
+                    setActualEndBranchId(companyDetail.getCompanyId());
+                }});
+
+                //避免后续代码对 orderRentVehicleDetail 覆盖ActualEndCompanyId  ActualEndBranchId
+                orderRentVehicleDetail.setActualEndCompanyId(companyDetail.getId());
+                orderRentVehicleDetail.setActualEndBranchId(companyDetail.getCompanyId());
             } catch (Exception e) {
                 return ObjectRestResponse.createFailedResult(500, e.getMessage());
             }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -139,6 +139,10 @@ public class VehicleBookRecord {
     @Column(name = "actual_end_date")
     private Date actualEndDate;
 
+    public void setActualEndDate(Date actualEndDate) {
+        this.actualEndDate = actualEndDate;
+    }
+
     /**
      * 提车公司
      */

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -132,7 +132,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
             dto.setCatas(vehiclePlatCataBiz.groupCatasByParent(dto.getCatasStr()));
         }
         //设置显示是否有车（通过把时间与位比较从where移动到select）
-        //dto.setYearNo4Where(Boolean.TRUE);
+        dto.setYearNo4Where(Boolean.TRUE);
         //匹配相交叉的预约记录
         dto.setRecordIntersection(Boolean.TRUE);
         PageDataVO<UsableVehicleModelVO> uvmvpdvs = vehicleBiz.searchUsableModel(dto);