From ed28003e69c41ba59e9fa3e7e5ed16ccb1ac4e3f Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Mon, 11 Jun 2018 20:08:04 +0800 Subject: [PATCH 1/5] update --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 ++ 1 file changed, 2 insertions(+) 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 ba4c713b0..9a5aebc0a 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 @@ -429,6 +429,8 @@ public class RetailAppServiceImp implements RetailAppService { res.put("skip_clearing", !res.getBoolean("skip_clearing")); } + res.put("base_info_lack", false); + res.put("compliance_info_lack", false); if(StringUtils.isEmpty(clientWithConfig.getString("business_structure"))|| StringUtils.isEmpty(clientWithConfig.getString("logo_url"))|| StringUtils.isEmpty(clientWithConfig.getString("description")) || From 531ffd16b6f68eb1190a2f058253db2ab79498b3 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Mon, 11 Jun 2018 20:12:30 +0800 Subject: [PATCH 2/5] update --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 +- 1 file changed, 1 insertion(+), 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 9a5aebc0a..9a20834dc 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 @@ -428,7 +428,7 @@ public class RetailAppServiceImp implements RetailAppService { if (clientType.equals("iphone")) { res.put("skip_clearing", !res.getBoolean("skip_clearing")); } - + res.put("refuse_remark",clientWithConfig.getString("refuse_remark")); res.put("base_info_lack", false); res.put("compliance_info_lack", false); if(StringUtils.isEmpty(clientWithConfig.getString("business_structure"))|| From 7af74cb5931961c5dd3592cdad69a9135737137f Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Mon, 11 Jun 2018 20:24:52 +0800 Subject: [PATCH 3/5] add apply source --- .../application/beans/ClientPreApplyStep1Bean.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyStep1Bean.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyStep1Bean.java index 23b1a0a18..9d1dfd0c1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyStep1Bean.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyStep1Bean.java @@ -21,6 +21,7 @@ public class ClientPreApplyStep1Bean { private String contact_email; @NotEmpty(message = "phoneCodeKey can't be null") private String phoneCodeKey; + private String apply_source = "pc"; public JSONObject insertObject() { @@ -75,4 +76,12 @@ public class ClientPreApplyStep1Bean { public void setPhoneCodeKey(String phoneCodeKey) { this.phoneCodeKey = phoneCodeKey; } + + public String getApply_source() { + return apply_source; + } + + public void setApply_source(String apply_source) { + this.apply_source = apply_source; + } } From eff977631edad1e3a85a3d5543515b18a90f217a Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Mon, 11 Jun 2018 20:38:19 +0800 Subject: [PATCH 4/5] update --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 +- 1 file changed, 1 insertion(+), 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 9a20834dc..4205f876b 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 @@ -421,7 +421,7 @@ public class RetailAppServiceImp implements RetailAppService { public JSONObject getClientInfo(JSONObject device) { String clientType = device.getString("client_type"); deviceSupport.findRegister(clientType); - JSONObject clientWithConfig = clientManager.getClientInfo(device.getIntValue("client_id")); + JSONObject clientWithConfig = clientMapper.findClient(device.getIntValue("client_id")); clientWithConfig.putAll(clientConfigService.find(device.getIntValue("client_id"))); JSONObject res = SignInAccountServiceImpl.clientInfoWithNoSecretInfo(clientWithConfig); res.put("is_skip_clearing", res.getBoolean("skip_clearing")); From e27ec59a6a501092c1287932e035bb47577ab087 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Mon, 11 Jun 2018 20:43:15 +0800 Subject: [PATCH 5/5] update --- .../core/impls/RetailAppServiceImp.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) 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 4205f876b..41530e3b7 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 @@ -428,22 +428,24 @@ public class RetailAppServiceImp implements RetailAppService { if (clientType.equals("iphone")) { res.put("skip_clearing", !res.getBoolean("skip_clearing")); } - res.put("refuse_remark",clientWithConfig.getString("refuse_remark")); - res.put("base_info_lack", false); - res.put("compliance_info_lack", false); - if(StringUtils.isEmpty(clientWithConfig.getString("business_structure"))|| - StringUtils.isEmpty(clientWithConfig.getString("logo_url"))|| - StringUtils.isEmpty(clientWithConfig.getString("description")) || - ("Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("acn")))|| - (!"Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("abn")))|| - (StringUtils.isEmpty(clientWithConfig.getString("company_website")) && StringUtils.isEmpty(clientWithConfig.getString("company_photo")) &&StringUtils.isEmpty(clientWithConfig.getString("store_photo")))) { - res.put("base_info_lack", true); - - } - JSONObject file = clientManager.getAuthFiles(null, clientWithConfig.getString("client_moniker")); - for (String s : fileName) { - if (file.getString(s) == null) { - res.put("compliance_info_lack", true); + if("4".equals(clientWithConfig.getString("source"))) { + res.put("refuse_remark", clientWithConfig.getString("refuse_remark")); + res.put("base_info_lack", false); + res.put("compliance_info_lack", false); + if (StringUtils.isEmpty(clientWithConfig.getString("business_structure")) || + StringUtils.isEmpty(clientWithConfig.getString("logo_url")) || + StringUtils.isEmpty(clientWithConfig.getString("description")) || + ("Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("acn"))) || + (!"Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("abn"))) || + (StringUtils.isEmpty(clientWithConfig.getString("company_website")) && StringUtils.isEmpty(clientWithConfig.getString("company_photo")) && StringUtils.isEmpty(clientWithConfig.getString("store_photo")))) { + res.put("base_info_lack", true); + + } + JSONObject file = clientManager.getAuthFiles(null, clientWithConfig.getString("client_moniker")); + for (String s : fileName) { + if (file.getString(s) == null) { + res.put("compliance_info_lack", true); + } } } return res;