Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

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

@@ -331,11 +331,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             }
             //设置违约明细
             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);
         }