核銷bug

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java

@@ -31,6 +31,11 @@ public class OrderPageVO extends BaseOrder {
 
     private String telephone;
 
+    /**
+     * 車輛編碼
+     */
+    private Integer code;
+
     /**
      * 是否是用户匹配公司
      */

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

@@ -194,11 +194,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 }
 
         }
-
+        AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
         //调用车辆管理的出车还车
         //出车
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) { //交车
-            AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
+
             VehicleDepartureVo vehicleDepartureVo = new VehicleDepartureVo();
             vehicleDepartureVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleDepartureVo.setDepartureBranchCompanyId(orderRentVehicleDetail.getStartCompanyId());
@@ -222,15 +222,18 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 e.printStackTrace();
                 return ObjectRestResponse.createFailedResult(1001, e.getMessage());
             }
-
         } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //还车
-
             VehicleArrivalVo vehicleArrivalVo = new VehicleArrivalVo();
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());
             vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
             vehicleArrivalVo.setRecycleMan(userDTO.getName());
-            vehicleArrivalVo.setRecycleManTel(userDTO.getTelPhone());
+            vehicleArrivalVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
+            if(appUserDTO != null) {
+                vehicleArrivalVo.setRecycleManTel(appUserDTO.getUsername());
+            } else {
+                vehicleArrivalVo.setRecycleManTel("13565235623");
+            }
             try {
                 vehicleFeign.arrivalBySmall(vehicleArrivalVo);
             } catch (Exception e) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -235,6 +235,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
                 if (restResponse.getData() != null) {
                     orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+                    orderPageVO.setCode(restResponse.getData().getCode());
                 }
             }
 

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

@@ -212,7 +212,9 @@ public class VehicleActiveService {
 
             // 写入车辆公里数,还车分公司id
             vehicle.setMileageLastUpdate(Mileagerest1);
-            vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+            if(vehicleBookRecord != null) {
+                vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+            }
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);