Merge branch 'master-bg-update' into dev

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

@@ -267,7 +267,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
 				//设置违约金金额
 				getDriverInfo(orderPageVo);
-				getUserLicense(orderPageVo);
+				getUserLicense1(orderPageVo);
 			}
 			ObjectRestResponse<CompanyDetail> startResponse = vehicleFeign.getCompanyDetail(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId());
 			if (startResponse.getData() != null) {
@@ -507,6 +507,32 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
     }
 
+    //后台获取用户驾驶信息
+    public void getUserLicense1(OrderPageVO orderPageVo) {
+        OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
+        orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
+        orderVehicleCrosstownDto.setOrderNo(orderPageVo.getNo());
+        List<OrderVehicleCrosstownDto> orderVehicleCrosstown = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
+        if (orderVehicleCrosstown != null && orderVehicleCrosstown.size() > 0) {
+            List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicleCrosstown.get(0).getUserLicenseId()).getData();
+            if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
+                orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
+                orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
+                orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
+                orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
+            }
+            //设置违约明细
+            for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
+                if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
+                    if(StringUtils.isNotBlank(a.getViolateDetail())) {
+                        orderPageVo.setDedDetailDTO(a.getViolateDetail());
+                    }
+                }
+            }
+        }
+        orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
+    }
+
     /**
      *  获取驾驶人信息
      * @param orderPageVo