From 3aaf2d9953f2a88424d24df0f131e2920a8cbeeb Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Fri, 12 Jul 2019 11:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=87=8F=E5=BC=80=E9=80=9ACBPAY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                        | 2 +-
 .../royalpay/payment/manage/mappers/system/ClientMapper.xml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 66e00f2be..de74e29ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
-        <docker-image.version>1.1.13</docker-image.version>
+        <docker-image.version>1.1.14</docker-image.version>
     </properties>
 
     <dependencies>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index 0d53d156e..e81f17cac 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -658,7 +658,8 @@
                                FROM sys_client_rates scr
                                WHERE scr.rate_name = 'CB_BankPay'
                                  AND (scr.expiry_time IS NULL
-                                   OR scr.expiry_time >= NOW()));
+                                   OR scr.expiry_time >= NOW()))
+          AND cb_bankpay_url IS NULL;
 
     </select>
 </mapper>