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

@@ -484,6 +484,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 获取驾驶人驾照
+	 *
 	 * @param orderPageVo
 	 */
 	public void getUserLicense(OrderPageVO orderPageVo) {
@@ -501,14 +502,17 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 			//设置违约明细
 			for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
-                if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
-                    if(StringUtils.isNotBlank(a.getViolateDetail())) {
+				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())) {
+		if (StringUtils.isBlank(orderPageVo.getDedDetailDTO()) || StringUtils.isBlank(orderPageVo.getDelayVehicleDetail())) {
 			updateCrossRefund(orderPageVo);
 		}
 		orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);