Merge remote-tracking branch 'origin/dev' into dev

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

@@ -72,7 +72,6 @@ public class OrderRentVehicleController extends CommonBaseController {
                         }else {
                                 BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
                                 vo.setEndCompanyId(endCompany.getId());
-                                vo.setEndAddr(endCompany.getAddrDetail());
                         }
                 }
             }
@@ -82,6 +81,12 @@ public class OrderRentVehicleController extends CommonBaseController {
                             vo.setStartAddr(companyDetail.detailAddr());
                     }
             }
+                if(vo.getEndCompanyId() != null) {
+                        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getEndCompanyId()).getData();
+                        if(companyDetail != null) {
+                                vo.setEndAddr(companyDetail.detailAddr());
+                        }
+                }
             RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
             bo.setBookVehicleVO(new BookVehicleVO(){{
                     setBookStartDate(vo.getBookStartDate());