Merge branch 'master-modify-cutAmount' into dev

14f53a63 · 周健威 · 097f0730 · 8a8f3ae5 · 14f53a63
Commit 14f53a63 authored Sep 17, 2019 by 周健威
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

OrderCancelBiz.java ...ava/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java +1 -1

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
@@ -190,7 +190,7 @@ public class OrderCancelBiz {
                            }
                        }
                        //退款流程
-                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount, null);
+                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount, oad);

                        //如果有扣款项，则生成额外的费用明细
                        if(oad.getDeductions().size() > 0) {