From b57e809c301dd79a66dc6930ec92e0a61fe69044 Mon Sep 17 00:00:00 2001 From: dulingling Date: Wed, 19 Aug 2020 13:49:43 +0800 Subject: [PATCH] =?UTF-8?q?upd:=E5=8D=A1=E4=BC=98=E6=83=A0=E6=B1=87?= =?UTF-8?q?=E7=8E=87=E5=90=88=E5=90=8C=E8=8E=B7=E5=8F=96=E8=B4=B9=E7=8E=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/merchants/core/impls/ClientManagerImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b23ac46db..a858ba6e1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.64 + 2.3.65 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 ab21ff682..5ac5dc392 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 @@ -7072,7 +7072,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid info.put("partner_bussiness_name", client.getString("business_name"));//商户商用名称 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("domestic_fee", cardRate.getString("domestic_rate_value"));//国内服务费 - info.put("international_fee", upayProfileInfo.getBooleanValue("enable_international_card") ? cardRate.getString("overseas_rate_value") : "-");//国际服务费 + String domesticRateValue = cardRate.getString("domestic_rate_value"); + info.put("domestic_fee", domesticRateValue.contains("rate") ? JSON.parseObject(domesticRateValue).getString("rate") : domesticRateValue);//国内服务费 + String overseasRateValue = cardRate.getString("overseas_rate_value"); + info.put("international_fee", upayProfileInfo.getBooleanValue("enable_international_card") ? + overseasRateValue.contains("rate") ? JSON.parseObject(overseasRateValue).getString("rate") : overseasRateValue : "-");//国际服务费 info.put("promotional_effective_date", formatter.print(currentRate.getDate("active_time").getTime())); info.put("promotional_period", formatter.print(currentRate.getDate("expiry_time").getTime())); return info;