Merge branch 'master-order-departure' into dev

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

@@ -39,4 +39,8 @@ public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
 
     List<DepositRefundRecord> depositRefundRecord;
 
+    private String checkUser;
+
+    private String checkTel;
+
 }

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

@@ -221,12 +221,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             vehicleDepartureVo.setUse("用户租车");
             vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
-            vehicleDepartureVo.setCheckMan(userDTO.getName());
-            if(StringUtils.isNotBlank(orderVehicleCrosstownDto.getLicensePhone())) {
-                vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getLicensePhone());
-            } else {
-                vehicleDepartureVo.setCheckManTel("13656235623");
-            }
+            vehicleDepartureVo.setCheckMan(orderVehicleCrosstownDto.getCheckUser());
+            vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getCheckTel());
             try {
                 RestResponse restResponse = vehicleFeign.departureBySmall(vehicleDepartureVo);
                 log.error("返回信息： " + restResponse.toString());
@@ -238,14 +234,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());
             vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
-            vehicleArrivalVo.setRecycleMan(userDTO.getName());
-            vehicleArrivalVo.setRecycleManTel("13656235623");
+            vehicleArrivalVo.setRecycleMan(orderVehicleCrosstownDto.getCheckUser());
+            vehicleArrivalVo.setRecycleManTel(orderVehicleCrosstownDto.getCheckTel());
             vehicleArrivalVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
-            if (appUserDTO != null) {
-                vehicleArrivalVo.setRecycleManTel(appUserDTO.getUsername());
-            } else {
-                vehicleArrivalVo.setRecycleManTel("13565235623");
-            }
             try {
                 RestResponse restResponse = vehicleFeign.arrivalBySmall(vehicleArrivalVo);
                 log.info("返回信息： " + restResponse.toString());