Merge branch 'master-count-vehicle' into base-modify

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);

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

@@ -225,9 +225,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getLicensePhone());
             try {
                 RestResponse restResponse = vehicleFeign.departureBySmall(vehicleDepartureVo);
-                log.info("返回信息： " + restResponse);
+                log.info("返回信息： " + restResponse.toString());
             } catch (Exception e) {
-                e.printStackTrace();
                 return ObjectRestResponse.createFailedResult(1001, e.getMessage());
             }
         } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //还车
@@ -243,9 +242,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 vehicleArrivalVo.setRecycleManTel("13565235623");
             }
             try {
-                vehicleFeign.arrivalBySmall(vehicleArrivalVo);
+                RestResponse restResponse = vehicleFeign.arrivalBySmall(vehicleArrivalVo);
+                log.info("返回信息： " + restResponse.toString());
             } catch (Exception e) {
-                e.printStackTrace();
                 return ObjectRestResponse.createFailedResult(500, e.getMessage());
             }
         }

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

@@ -365,7 +365,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return baseOrderBiz.save(orderRentVehicleDetail);
     }
 
-
     @Data
     public static class ChangeVehicleDTO {
         String no;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/common/RestResponse.java

@@ -70,4 +70,11 @@ public class RestResponse<T> extends BaseResponse {
         return restResponse;
     }
 
+    @Override
+    public String toString() {
+        return "RestResponse{" +
+                "data=" + data +
+                ", code=" + code +
+                '}';
+    }
 }