From bf8a94a62076b3fdd9640c9f0b984ce7ebefd918 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 16 Oct 2018 12:56:08 +0800
Subject: [PATCH] fix rpay+switchMerchantSettle

---
 .../manage/merchants/core/impls/ClientManagerImpl.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 5e86590dc..f928885fd 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
@@ -3193,7 +3193,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account, clientMoniker, "skip_clearing", skip_clearing));
         client.put("skip_clearing", skip_clearing);
-        rpayApi.switchMerchantSettle(client);
+        if (client.getString("rpay_enterprise_id") != null) {
+            rpayApi.switchMerchantSettle(client);
+        }
     }
 
     @Override