Merge branch 'master-modify-cutAmount' into dev

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

@@ -176,7 +176,7 @@ public class OrderCalculateBiz {
         InProgressVO inProgressVO = inProgressCalculate(baseOrder, orderItem, orvd.getFreeDays(), useDays, oad);
 
         //定金 - （额外消费金额 + 违约金）
-        oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getConsumeAmount().add(inProgressVO.getViolateAmount())));
+        oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getExtraAmount().add(inProgressVO.getViolateAmount())));
         oad.setOrderAmount(inProgressVO.getRefundOrderAmount());
         oad.setOriginDepositAmount(orvd.getDeposit());
         oad.setOriginOrderAmount(baseOrder.getGoodsAmount());