From df9d895b53544991babee15e5ad96798d2bcb363 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 16 Jun 2020 16:36:03 +1000 Subject: [PATCH] upay invoice update --- .../payment/manage/tradelog/core/impls/TradeLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 09b9cbca6..fe8016808 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -987,7 +987,7 @@ public class TradeLogServiceImpl implements TradeLogService { } BigDecimal transactionFee = item.getBigDecimal("transaction_fee"); BigDecimal royalpaySvcFee = (item.containsKey("total_surcharge") ? item.getBigDecimal("total_surcharge") : BigDecimal.ZERO) - .add(taxAmount).subtract(transactionFee).subtract(incrementalSurcharge).subtract(incrementalTax); + .add(taxAmount).subtract(incrementalSurcharge).subtract(incrementalTax).subtract(transactionFee); item.put("incremental_surcharge", incrementalSurcharge.add(incrementalTax).setScale(2, RoundingMode.HALF_UP)); item.put("total_surcharge_intax", royalpaySvcFee.setScale(2, RoundingMode.HALF_UP)); item.put("transaction_fee_intax", transactionFee.setScale(2, RoundingMode.HALF_UP));