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 db524b05b..75f188080 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,9 +466,9 @@ 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 || - (client.getIntValue("upay_approve_result") !=1 && !client.containsKey("upay_approve_result") && client.getIntValue("upay_approve_result") !=4) - || org.getBooleanValue("rate_editable"); + 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); client.put("rate_editable", bdRateEditable); } else { client.put("company_phone", "******"); diff --git a/src/main/resources/templates/pdf/letter_of_offer.pdf b/src/main/resources/templates/pdf/letter_of_offer.pdf index 2aa701a83..a6a8a6ade 100644 Binary files a/src/main/resources/templates/pdf/letter_of_offer.pdf and b/src/main/resources/templates/pdf/letter_of_offer.pdf differ