From 436289f86a6c3d2428d7569e118bfac9c74bb012 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 23 Jul 2020 21:41:27 +1000 Subject: [PATCH] fix warnings --- .../manage/merchants/core/impls/ClientManagerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 a5625f10c..d04008a58 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 @@ -7054,11 +7054,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid info.put("annual_rate", cardAnnualRate);//年费率 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"));//国内服务费 + 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.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("international_fee", upayProfileInfo.getBooleanValue("enable_international_card") ? + overseasRateValue.contains("rate") ? JSON.parseObject(overseasRateValue).getString("rate") : overseasRateValue : "-");//国际服务费 + 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());//账户储备金 //银行账号信息 info.put("account_name", bankAccountInfo.getString("account_name"));//