From 3e9d5827f47bf31ec345b3fa14b6704ea55d6309 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 6 Nov 2019 09:15:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20findAccountByPhone=E6=9F=A5=E5=88=B0?=
 =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../manage/appclient/core/impls/RetailAppServiceImp.java      | 2 +-
 .../application/core/impls/SimpleClientApplyServiceImpl.java  | 4 ++--
 .../payment/manage/mappers/system/ClientAccountMapper.java    | 2 +-
 .../manage/merchants/core/impls/ClientManagerImpl.java        | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b27c7e85..450d94aca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.2.69</version>
+    <version>1.2.70</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.6.1</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 8d9bf838c..1e12421b4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -2195,7 +2195,7 @@ public class RetailAppServiceImp implements RetailAppService {
         if (!StringUtils.equals(captcha, params.getString("captcha"))) {
             throw new BadRequestException("Verification code is wrong");
         }
-        JSONObject account = clientAccountMapper.findByPhone(contactPhone, "+" + nationCode);
+        List<JSONObject> account = clientAccountMapper.findByPhone(contactPhone, "+" + nationCode);
         if (account != null) {
             throw new BadRequestException("Mobile phone number has been bound to other users, please unbind it before binding");
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
index 48f52bd43..33cb0305b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
@@ -280,7 +280,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         if (!nation_code.startsWith("+")) {
             nation_code = "+" + nation_code;
         }
-        JSONObject account = clientAccountMapper.findByPhone(contact_phone, nation_code);
+        List<JSONObject> account = clientAccountMapper.findByPhone(contact_phone, nation_code);
         if (account != null) {
             throw new ForbiddenException("用户名已被注册");
         }
@@ -598,7 +598,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         }
         JSONObject apply = sysClientPreMapperMapper.findByUserName(username);
 
-        JSONObject account = clientAccountMapper.findByPhone(apply.getString("contact_phone"), "+61");
+        List<JSONObject> account = clientAccountMapper.findByPhone(apply.getString("contact_phone"), "+61");
         if (account != null) {
             throw new ForbiddenException("The user name has been registered");
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java
index dcf2ad82f..2005ca0fc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java
@@ -28,7 +28,7 @@ public interface ClientAccountMapper {
 
     @AutoSql(type = SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid=1")
-    JSONObject findByPhone(@Param("contact_phone") String contact_phone,@Param("nation_code")String nation_code);
+    List<JSONObject> findByPhone(@Param("contact_phone") String contact_phone,@Param("nation_code")String nation_code);
 
     @AutoSql(type = SqlType.SELECT)
     JSONObject findDetail(@Param("account_id") String accountId);
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 d6dea6438..16d9a65e3 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
@@ -1582,7 +1582,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (clientAccountMapper.findByPhone(account.getContactPhone(), "+" + account.getNation_code()) != null) {
             throw new BadRequestException("Mobile phone number has been bound to other accounts");
         }
-        ;
     }
 
     @Override