From 6c4280deb57b6beadbd62c11952bda55d0334101 Mon Sep 17 00:00:00 2001 From: dulingling Date: Tue, 21 Jul 2020 14:00:30 +0800 Subject: [PATCH] =?UTF-8?q?upd:=E5=8D=A1=E7=94=B3=E8=AF=B7-=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=94=9F=E6=88=90=EF=BC=9A=E8=A7=A3=E6=9E=90=E5=A2=83?= =?UTF-8?q?=E5=A4=96/=E5=A2=83=E5=86=85=E8=B4=B9=E7=8E=87=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8556f9483..e55c398d6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.42 + 2.3.43 UTF-8 2.4.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index a1670bad8..163a46819 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -7052,7 +7052,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid info.put("cost_per_transaction", clientRate.getString("transaction_fee"));//每次交易成本 String domesticRateValue = cardRate.getString("domestic_rate_value"); info.put("domestic_fee", domesticRateValue.indexOf("rate")!= -1?JSONObject.parseObject(domesticRateValue).getString("rate"):cardRate.getString("domestic_rate_value"));//国内服务费 - String overseasRateValue = cardRate.getString("domestic_rate_value"); + String overseasRateValue = cardRate.getString("overseas_rate_value"); info.put("international_fee", upayProfileInfo.getBoolean("enable_international_card") ? overseasRateValue.indexOf("rate")!=-1?JSONObject.parseObject(overseasRateValue).getString("rate"):cardRate.getString("overseas_rate_value") : "-");//国际服务费 BigDecimal reserve = (upayProfileInfo.getBigDecimal("expected_card_revenue").multiply(new BigDecimal(0.005)).setScale(0, RoundingMode.HALF_UP));