Merge branch 'develop'

master
taylor.dang 6 years ago
commit bba67b1556

@ -48,7 +48,7 @@ public class HfClearAmountServiceImpl implements HfClearAmountService {
}
});
result.put("gross_amount", result.getBigDecimal("payment_amount").subtract(result.getBigDecimal("refund_amount")));
result.put("real_charge", result.getBigDecimal("payment_surcharge").subtract(result.getBigDecimal("refund_surcharge")));
result.put("charge_amount", result.getBigDecimal("payment_surcharge").subtract(result.getBigDecimal("refund_surcharge")));
result.put("clear_amount", result.getBigDecimal("gross_amount").subtract(result.getBigDecimal("real_charge")));
return result;
}

Loading…
Cancel
Save