From 3a6a72a418c45f68a0aa2590f9f0f22766431f50 Mon Sep 17 00:00:00 2001 From: dulingling Date: Tue, 21 Jul 2020 13:48:35 +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 +- .../manage/merchants/core/impls/ClientManagerImpl.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 277b9c0f8..8556f9483 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.41 + 2.3.42 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 2a93c40ef..a1670bad8 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 @@ -7050,8 +7050,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid info.put("legal_bussiness", legalInfo.getString("representative_person") + " AS " + (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码 info.put("annual_rate", cardAnnualRate);//年费率 info.put("cost_per_transaction", clientRate.getString("transaction_fee"));//每次交易成本 - info.put("domestic_fee", cardRate.getString("domestic_rate_value"));//国内服务费 - info.put("international_fee", upayProfileInfo.getBoolean("enable_international_card") ? cardRate.getString("overseas_rate_value") : "-");//国际服务费 + 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"); + 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)); info.put("account_reserve", reserve.compareTo(new BigDecimal(200)) <= 0 ? new BigDecimal(200).toPlainString() : reserve.toPlainString());//账户储备金 //银行账号信息