Merge branch 'master-bg-update' into dev

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

 package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.*;
-import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import lombok.Data;
@@ -35,9 +34,10 @@ public class OrderPageVO extends BaseOrder {
     private String startCompanyName;
 
     private String endCompanyName;
-
+    //用户手机号
     private String telephone;
-
+    // "用户职位名称"
+    private  String positionName;
     //订单违约金
     private String dedDetailDTO;
     /**

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

@@ -230,7 +230,12 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     }
 
 
-
+    /**
+     * 后台获取订单详情
+     * @param no
+     * @param userDTO
+     * @return
+     */
 	public ObjectRestResponse<OrderPageVO> orderDetail(String no, UserDTO userDTO) {
 		OrderPageVO orderPageVo = mapper.getOrderDetail(no);
 		if (orderPageVo == null) {
@@ -240,6 +245,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		if(appUserVo != null) {
 			orderPageVo.setTelephone(appUserVo.getUsername());
 			orderPageVo.setUsername(appUserVo.getRealname());
+            orderPageVo.setPositionName(appUserVo.getPositionName());
 		}
 		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
 		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
@@ -442,8 +448,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     }
 
 
-
-
+    /**
+     * 初始化违约金实体
+     * @param dedDetailDTO
+     * @param type
+     * @param cost
+     * @param stringBuilder
+     */
     public void initDedDetail(DedDetailDTO dedDetailDTO, Integer type, BigDecimal cost, StringBuilder stringBuilder) {
         String detailName = null;
         if (type == OrderViolateEnum.BEFORE.getCode()) {
@@ -527,6 +538,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
     }
 
+    /**
+     * 修改订单还车公司
+     * @param orderRentVehicleDetail
+     * @return
+     */
     public ObjectRestResponse save(OrderRentVehicleDetail orderRentVehicleDetail) {
         if (orderRentVehicleDetail == null || orderRentVehicleDetail.getId() == null) {
             return ObjectRestResponse.paramIsEmpty();