Merge remote-tracking branch 'origin/holiday-price' into holiday-price

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

@@ -426,6 +426,12 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //剩余押金 = 押金 - 违章保证金 - 定损金额
             oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(csv.getDamagesAmount()));
+
+            //设置违约金
+                //设置原来算出的违约金及描述
+            csv.setViolateAmount(inProgressVO.getViolateAmount());
+            csv.setViolateDesc(inProgressVO.getViolateDesc());
+                //处理更改之后的违约金及描述
             handleCrosstownDetail(crosstown, oad, csv);
 
             //退款