From c8ffdbdf738ae54e06353e8471e8a3b282d03921 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Wed, 28 Mar 2018 16:24:38 +0800 Subject: [PATCH 1/2] fix --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 741318705..99c03cb38 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 @@ -244,7 +244,11 @@ public class RetailAppServiceImp implements RetailAppService { public JSONObject getClientInfo(JSONObject device) { String clientType = device.getString("client_type"); deviceSupport.findRegister(clientType); - return SignInAccountServiceImpl.clientInfoWithNoSecretInfo(clientManager.getClientInfo(device.getIntValue("client_id"))); + JSONObject res = SignInAccountServiceImpl.clientInfoWithNoSecretInfo(clientManager.getClientInfo(device.getIntValue("client_id"))); + if (clientType.equals("iphone")) { + res.put("skip_clearing",!res.getBoolean("skip_clearing")); + } + return res; } @Override From e6e4ced9a035a5469e604e6b72b8b51dc5ff1fda Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Wed, 28 Mar 2018 17:12:12 +0800 Subject: [PATCH 2/2] fix --- .../payment/manage/appclient/core/impls/RetailAppServiceImp.java | 1 + 1 file changed, 1 insertion(+) 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 99c03cb38..0cc541f11 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 @@ -245,6 +245,7 @@ public class RetailAppServiceImp implements RetailAppService { String clientType = device.getString("client_type"); deviceSupport.findRegister(clientType); JSONObject res = SignInAccountServiceImpl.clientInfoWithNoSecretInfo(clientManager.getClientInfo(device.getIntValue("client_id"))); + res.put("is_skip_clearing",res.getBoolean("skip_clearing")); if (clientType.equals("iphone")) { res.put("skip_clearing",!res.getBoolean("skip_clearing")); }