From 31130688596dc2c74f43f6aaac2ffd9a3c2af2cd Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Fri, 24 Aug 2018 17:12:00 +0800 Subject: [PATCH 1/2] fixbug parent client invalid --- .../manage/signin/core/impls/SignInAccountServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index f874211e4..661e0b650 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -141,7 +141,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati client.putAll(clientConfigService.find(client_id)); client = clientInfoWithNoSecretInfo(client); if (client.getInteger("parent_client_id") != null) { - JSONObject rootPartner = clientManager.getClientInfo(client.getIntValue("parent_client_id")); + JSONObject rootPartner = clientManager.getClientInfoIgnoreInvalid(client.getIntValue("parent_client_id")); rootPartner.putAll(clientConfigService.find(client.getIntValue("parent_client_id"))); rootPartner = clientInfoWithNoSecretInfo(rootPartner); account.put("parent_client", rootPartner); @@ -253,7 +253,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati client.putAll(clientConfigService.find(client.getIntValue("client_id"))); client = clientInfoWithNoSecretInfo(client); if (client.getInteger("parent_client_id") != null) { - JSONObject rootPartner = clientManager.getClientInfo(client.getIntValue("parent_client_id")); + JSONObject rootPartner = clientManager.getClientInfoIgnoreInvalid(client.getIntValue("parent_client_id")); rootPartner.putAll(clientConfigService.find(client.getIntValue("parent_client_id"))); rootPartner = clientInfoWithNoSecretInfo(rootPartner); account.put("parent_client", rootPartner); From 7c7ae527c5d7aaf7106d71ddb6f649fdc0d78820 Mon Sep 17 00:00:00 2001 From: "james.zhao" Date: Fri, 24 Aug 2018 17:17:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/mappers/system/ClientMapper.java | 3 +++ .../manage/merchants/core/impls/ClientManagerImpl.java | 2 +- .../ui/static/payment/partner/templates/partner_detail.html | 6 ++++-- src/main/ui/static/payment/partner/templates/partners.html | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index cee3b2458..a99bd852c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -32,6 +32,9 @@ public interface ClientMapper { @AdvanceSelect(addonWhereClause = "is_valid=1") JSONObject findClientByMoniker(@Param("client_moniker") String clientMoniker); + @AutoSql(type = SqlType.SELECT) + JSONObject findClientByMonikerAll(@Param("client_moniker") String clientMoniker); + PageList listPartners(JSONObject params, PageBounds pagination); List listClientsIdAndMoniker(); 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 c86ab51cc..d7c68ed6a 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 @@ -341,7 +341,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Override @Cacheable(value = ":app_client_info_moniker:", key = "#clientMoniker") public JSONObject getClientInfoByMoniker(String clientMoniker) { - return clientMapper.findClientByMoniker(clientMoniker); + return clientMapper.findClientByMonikerAll(clientMoniker); } @Override diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index 0c1b85386..701e4324c 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -39,7 +39,7 @@ + class="fa fa-share">(已禁用)
  1. @@ -76,6 +76,7 @@ 不通过 绿色通道申请中 + (已禁用)
    @@ -284,6 +285,7 @@ ) + (已禁用)

    @@ -767,4 +769,4 @@ - \ No newline at end of file + diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html index 2fe4bd44a..a1caff67c 100644 --- a/src/main/ui/static/payment/partner/templates/partners.html +++ b/src/main/ui/static/payment/partner/templates/partners.html @@ -476,12 +476,12 @@ + ng-class="{pass_timeout:partner.pass_timeout,success:partner.source==5,warning:partner.approve_result==5 && ('100'|withRole)}"> - + (已禁用) - \ No newline at end of file +