From 2502a96da66c84a19393a4c439d838f2d035e562 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 31 Jan 2018 17:07:50 +0800 Subject: [PATCH] invoice --- .../manage/tradelog/core/impls/TradeLogServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 afd17050a..1694ea999 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 @@ -567,7 +567,7 @@ public class TradeLogServiceImpl implements TradeLogService { parmerters.put("actual_fee", takeDecimalOrDefault(analysis, "actual_fee", BigDecimal.ZERO)); parmerters.put("totalSettledAmount", takeDecimalOrDefault(analysis, "total_settle_amount", BigDecimal.ZERO)); parmerters.put("royalpay_charge", takeDecimalOrDefault(analysis, "total_royal_surcharge", BigDecimal.ZERO)); - parmerters.put("total_fee", takeDecimalOrDefault(analysis, "total_surcharge", BigDecimal.ZERO) + "(GST Inclusive)"); + parmerters.put("total_fee", takeDecimalOrDefault(analysis, "total_surcharge", BigDecimal.ZERO)); parmerters.put("alipay_fee", takeDecimalOrDefault(analysis, "alipay_fee", BigDecimal.ZERO)); parmerters.put("wechat_fee", takeDecimalOrDefault(analysis, "wechat_fee", BigDecimal.ZERO)); parmerters.put("bestpay_fee", takeDecimalOrDefault(analysis, "bestpay_fee", BigDecimal.ZERO)); @@ -608,9 +608,9 @@ public class TradeLogServiceImpl implements TradeLogService { obj.put(key, CurrencyAmountUtils.scale(decimal, currency)); } - private String takeDecimalOrDefault(JSONObject analysis, String key, BigDecimal defaultVal) { + private BigDecimal takeDecimalOrDefault(JSONObject analysis, String key, BigDecimal defaultVal) { BigDecimal decimal = analysis.containsKey(key) ? analysis.getBigDecimal(key) : defaultVal; - return CurrencyAmountUtils.scale(decimal, PlatformEnvironment.getEnv().getForeignCurrency()).toPlainString(); + return CurrencyAmountUtils.scale(decimal, PlatformEnvironment.getEnv().getForeignCurrency()); } @Override