From e234e5745fbec2e75dc879d24c6693c9bd1854d7 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Wed, 14 Mar 2018 18:25:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=B3=E9=97=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/core/impl/ClientContractServiceImpl.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
index 5d0b357b1..75f774d57 100644
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
@@ -156,6 +156,14 @@ public class ClientContractServiceImpl implements ClientContractService {
         if (client == null) {
             throw new NotFoundException("merchant not found please check ID");
         }
+        JSONObject sysconfig = sysConfigManager.getSysConfig();
+        JSONObject defaultResult = new JSONObject();
+        defaultResult.put("rate_expire", false);
+        defaultResult.put("rate_waring", false);
+        defaultResult.put("old_contract",false);
+        if (sysconfig!=null && !sysconfig.getBoolean("sys_new_contract_on")) {
+            return defaultResult;
+        }
         List<JSONObject> rateInfo = clientRateMapper.minExpiryTime(client_id, null);
         JSONObject result = new JSONObject();
         if (CollectionUtils.isEmpty(rateInfo)) {