From d28f40fb67a3cd67d0d3c88de4821b921edea70f Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 21 Feb 2020 11:18:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B7=A8=E5=A2=83=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../payment/manage/merchants/core/impls/ClientManagerImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4ab4f0887..632c03ddd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.53</version>
+    <version>1.3.54</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 c34517638..e4533d82b 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
@@ -6495,7 +6495,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         JSONObject clientConfig = clientConfigMapper.find(client.getIntValue("client_id"));
-        JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannelIsValid(client.getInteger("client_id"), channel);
+        JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannel(client.getInteger("client_id"), channel);
         if (!clientConfig.getBooleanValue("geek_shop_status")) {
             throw new BadRequestException("Merchant service not opened");
         }