Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

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

@@ -289,9 +289,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 stringBuilder.append(" x ");
                 stringBuilder.append(noUsedDay);
                 stringBuilder.append("天) = ");
-                BigDecimal cost = (inProgressVO.getExtraAmount()).add(inProgressVO.getViolateAmount());
                 stringBuilder.append(inProgressVO.getViolateAmount());
-                initDedDetail(dedDetailDTO, OrderViolateEnum.BEFORE.getCode(), cost, stringBuilder);
+                initDedDetail(dedDetailDTO, OrderViolateEnum.BEFORE.getCode(), inProgressVO.getExtraAmount(), stringBuilder);
             }
             /**
              * 延期还车