Merge branch 'feature-delay-add' into dev

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

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

@@ -482,37 +482,41 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         dedDetailDTO.setStatusName(detailName);
     }
 
-    /**
-     * 获取驾驶人驾照
-     * @param orderPageVo
-     */
-    public void getUserLicense(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());
-                    }
-                }
-            }
-        }
-        if (StringUtils.isBlank(orderPageVo.getDedDetailDTO())) {
-            updateCrossRefund(orderPageVo);
-        }
-        orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
-    }
+	/**
+	 * 获取驾驶人驾照
+	 *
+	 * @param orderPageVo
+	 */
+	public void getUserLicense(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());
+					}
+					if (StringUtils.isNotBlank(a.getDelayVehicleDetail())) {
+						orderPageVo.setDelayVehicleDetail(a.getDelayVehicleDetail());
+					}
+				}
+			}
+		}
+		if (StringUtils.isBlank(orderPageVo.getDedDetailDTO()) || StringUtils.isBlank(orderPageVo.getDelayVehicleDetail())) {
+			updateCrossRefund(orderPageVo);
+		}
+		orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
+	}
 
     //后台获取用户驾驶信息
     public void getUserLicense1(OrderPageVO orderPageVo) {