修改还车未取消预定数据bug

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -197,15 +198,21 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         //调用车辆管理的出车还车
         //出车
         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());
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
             vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
+           if(appUserDTO != null) {
+               vehicleDepartureVo.setUser(appUserDTO.getNickname());
+               vehicleDepartureVo.setUserTel(appUserDTO.getUsername());
+           } else {
+               vehicleDepartureVo.setUser("APP用戶");
+               vehicleDepartureVo.setUserTel("13656235623");
+           }
             vehicleDepartureVo.setUse("用户租车");
             vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
-            vehicleDepartureVo.setUser(userDTO.getUsername());
-            vehicleDepartureVo.setUserTel(userDTO.getTelPhone());
             vehicleDepartureVo.setCheckMan(orderVehicleCrosstownDto.getLicenseName());
             vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getLicensePhone());
             try {