From d2cfdaf9ed492589bc23e2aead3bb56a7f7a5747 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 29 Apr 2020 14:14:49 +0800 Subject: [PATCH] fix add card payment rates --- pom.xml | 2 +- .../manage/merchants/core/impls/ClientManagerImpl.java | 7 +++---- .../payment/partner/templates/partner_bankaccounts.html | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 528756fac..9e39e2e15 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.2.12 + 2.2.13 UTF-8 1.8.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 75f188080..2a3918fbe 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 @@ -466,11 +466,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid client.put("show_all_permission", checkBDPermission > 0); if (checkBDPermission > 0) { JSONObject org = orgMapper.findOne(manager.getIntValue("org_id")); - boolean bdRateEditable = client.getIntValue("approve_result") != 1 || org.getBooleanValue("rate_editable") || - //开起信用卡支付申请,并且申请结果不是:null.新建 1.通过 4.BD已提交资料状态 - ( !clientConfig.getBoolean("enable_card_payment") && !client.containsKey("upay_approve_result") && client.getIntValue("upay_approve_result") !=1 && client.getIntValue("upay_approve_result") !=4); + boolean bdRateEditable = client.getIntValue("approve_result") != 1 || org.getBooleanValue("rate_editable"); client.put("rate_editable", bdRateEditable); - } else { + boolean bdCardRateEditable = (clientConfig.getBoolean("enable_card_payment") && !client.containsKey("upay_approve_result"); + client.put("company_phone", "******"); client.put("contact_person", "******"); client.put("contact_phone", "******"); diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index 36ef11d4d..be3c145e9 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -214,7 +214,7 @@
  • CB_BankPay
  • Card Payment
  • Direct Debit
  • - + Add Card Payment Rates