Commit 384e2116 authored by hezhen's avatar hezhen

Merge branch 'feature_chw_zjw' into dev-chw

parents fa966a7e 36172dce
...@@ -140,9 +140,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> { ...@@ -140,9 +140,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
BigDecimal orderDeductAmount = calculateDeduction(orderDeductSource, timeLag, dicParentKey, orderRefundDescBuilder); BigDecimal orderDeductAmount = calculateDeduction(orderDeductSource, timeLag, dicParentKey, orderRefundDescBuilder);
Integer dayLag = Long.valueOf(timeLag/(1000L * 60L * 60L * 24L)).intValue(); Integer dayLag = Long.valueOf(timeLag/(1000L * 60L * 60L * 24L)).intValue();
if(dayLag <= 0 && baseOrder.getInsureAmount().compareTo(BigDecimal.ZERO) > 0) { if(dayLag <= 0 && baseOrder.getPersonInsureAmount().compareTo(BigDecimal.ZERO) > 0) {
//扣钱 //扣钱
orderDeductAmount = orderDeductAmount.add(baseOrder.getInsureAmount()); orderDeductAmount = orderDeductAmount.add(baseOrder.getPersonInsureAmount());
orderRefundDescBuilder = orderRefundDescBuilder.insert(0, "小于24小时扣除保险费"); orderRefundDescBuilder = orderRefundDescBuilder.insert(0, "小于24小时扣除保险费");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment