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

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

@@ -432,6 +432,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         bookRecordUpdateLog.setOrderId(oldValue.getOrderId());
         bookRecordUpdateLog.setCreateTime(new Date());
         BeanUtil.copyProperties(orderRentVehicleDetail, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(orderRentVehicleDetail.getEndCompanyId()).getData();
+        if(companyDetail != null) {
+            oldValue.setEndCity(companyDetail.getAddrCity());
+            oldValue.setEndAddr(companyDetail.detailAddr());
+        }
         oldValue.setEndCompanyId(orderRentVehicleDetail.getEndCompanyId());
         orderRentVehicleBiz.updateSelectiveByIdRe(oldValue);
         ObjectRestResponse objectRestResponse = vehicleFeign.update(bookRecordUpdateLog);