From 7b0e172c50156519cde625f25b2b15810deb6f20 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Thu, 26 Dec 2019 11:09:52 +0800 Subject: [PATCH] =?UTF-8?q?[R]=20APP=E7=AB=AF=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/RetailAppServiceImp.java | 35 +++++-- .../core/impl/ClientComplianceApplyImpl.java | 2 +- .../manage/kyc/core/impls/KycServiceImpl.java | 4 +- .../manage/kyc/enums/FilesAuthEnum.java | 2 +- .../manage/kyc/enums/FilesAuthStatusEnum.java | 39 ++++++++ .../merchants/beans/ClientKycFilesInfo.java | 10 +- .../core/impls/ClientManagerImpl.java | 6 +- .../core/impls/SignInAccountServiceImpl.java | 3 +- .../mappers/system/ClientFilesMapper.xml | 4 +- src/main/resources/i18n/msg_en.properties | 5 +- src/main/resources/i18n/msg_zh.properties | 5 +- src/main/ui/static/payment/kyc/kyc-manage.js | 17 ++-- src/main/ui/static/payment/kyc/kyc.js | 24 ++--- .../templates/bd_help_client_progress.html | 10 +- .../templates/client_kyc_files_progress.html | 28 ++++-- .../kyc/templates/partner_kyc_files.html | 14 +-- .../static/payment/partner/partner-manage.js | 19 ++-- .../templates/client_kyc_files_to_auth.html | 17 +++- .../templates/compliance_files_advice.html | 91 ++++++++++++------- 19 files changed, 215 insertions(+), 120 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/kyc/enums/FilesAuthStatusEnum.java 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 f8a9ff9e6..034423728 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 @@ -17,6 +17,7 @@ import au.com.royalpay.payment.manage.customers.core.CouponValidateService; import au.com.royalpay.payment.manage.device.core.DeviceManager; import au.com.royalpay.payment.manage.fund.core.impls.XPlanFundConfigServiceImpl; import au.com.royalpay.payment.manage.kyc.core.KycService; +import au.com.royalpay.payment.manage.kyc.enums.FilesAuthStatusEnum; import au.com.royalpay.payment.manage.kyc.enums.FilesAuthTypeEnum; import au.com.royalpay.payment.manage.management.clearing.core.CleanService; import au.com.royalpay.payment.manage.mappers.client.AuthAppMessageMapper; @@ -224,6 +225,8 @@ public class RetailAppServiceImp implements RetailAppService { @Resource private ClientFilesMapper clientFilesMapper; @Resource + private RetailAppService retailAppService; + @Resource private DeviceManager deviceManager; private final String CBBANK_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2019/08/05/1564972204689_uwZvpTBjtLUMcN8c540xcZvux1Rd3O.pdf"; private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf"; @@ -2524,6 +2527,8 @@ public class RetailAppServiceImp implements RetailAppService { return null; } if(complianceFilesNotice != null){ + JSONObject complianceStatus = retailAppService.getClientAuthFileStatus(device); + complianceFilesNotice.putAll(complianceStatus); supplement_array.add(complianceFilesNotice); } if(kycFilesNotice != null){ @@ -2546,6 +2551,9 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject file = checkKycFileStatusForApp(client); JSONObject compliance = clientComplianceCompanyMapper.findKycFileByClientId(device.getIntValue("client_id")); file.put("file_company", compliance); + if(compliance != null){ + file.put("id_type", compliance.getString("id_type")); + } return file; } @@ -2562,7 +2570,8 @@ public class RetailAppServiceImp implements RetailAppService { result.put("help_success", messageSource.getMessage("client.auth.file.help_success", null, RequestEnvironment.getLocale())); result.put("client_less_file", lessKycFiles); - if (lessKycFiles) { + JSONObject compliance = clientComplianceCompanyMapper.findKycFileByClientId(client.getIntValue("client_id")); + if (lessKycFiles || compliance != null) { List kycFiles = new ArrayList<>(); kycFiles = clientFilesMapper.findKycClientFileByClient(client.getIntValue("client_id")); for (JSONObject file : kycFiles) { @@ -2593,19 +2602,22 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject complianceFilesNotice = new JSONObject(); JSONObject complianceFileStatus = signInAccountService.checkAuthFileStatus(client); - if(!complianceFileStatus.getBoolean("client_less_file")){ + /*if(!complianceFileStatus.getBoolean("client_less_file")){ return null; - } + }*/ JSONObject compliance = clientComplianceCompanyMapper.findFileByClientId(account.getIntValue("client_id")); complianceFilesNotice.put("auth_type",FilesAuthTypeEnum.COMPLIANCE.getAuthType()); complianceFilesNotice.put("type", messageSource.getMessage("client.auth.file.compliance.type", null, RequestEnvironment.getLocale())); - complianceFilesNotice.put("deadline","2020-01-31"); - /* complianceFilesNotice.put("root_url","111");*/ + /*complianceFilesNotice.put("deadline","2020-01-31");*/ + /*complianceFilesNotice.put("root_url","111");*/ complianceFilesNotice.put("client_less_file",complianceFileStatus.getBoolean("client_less_file")); if(compliance != null){ - complianceFilesNotice.put("refused_reason",compliance.getString("description")); + complianceFilesNotice.put("client_refuse_reason",compliance.getString("description")); complianceFilesNotice.put("status",compliance.getString("status")); + complianceFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(compliance.getIntValue("status")) ); + }else{ + complianceFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(-1) ); } return complianceFilesNotice; @@ -2616,18 +2628,21 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject kycFileStatus = signInAccountService.checkKycFileStatusForApp(client,account); JSONObject compliance = clientComplianceCompanyMapper.findKycFileByClientId(account.getIntValue("client_id")); - if(!kycFileStatus.getBoolean("client_less_file")){ + /* if(!kycFileStatus.getBoolean("client_less_file")){ return null; - } + }*/ kycFilesNotice.put("auth_type",FilesAuthTypeEnum.KYC.getAuthType()); kycFilesNotice.put("type", messageSource.getMessage("client.auth.file.kyc.type", null, RequestEnvironment.getLocale())); - kycFilesNotice.put("deadline", "2020-01-31"); + /* kycFilesNotice.put("deadline", "2020-01-31");*/ /* kycFilesNotice.put("root_url","111");*/ kycFilesNotice.put("client_less_file",kycFileStatus.getBoolean("client_less_file")); if(compliance != null){ - kycFilesNotice.put("refused_reason",compliance.getString("description")); + kycFilesNotice.put("client_refuse_reason",compliance.getString("description")); kycFilesNotice.put("status",compliance.getString("status")); + kycFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(compliance.getIntValue("status")) ); + }else{ + kycFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(-1) ); } return kycFilesNotice; } diff --git a/src/main/java/au/com/royalpay/payment/manage/complianceAudit/core/impl/ClientComplianceApplyImpl.java b/src/main/java/au/com/royalpay/payment/manage/complianceAudit/core/impl/ClientComplianceApplyImpl.java index 307fe856c..d92cb2b5d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/complianceAudit/core/impl/ClientComplianceApplyImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/complianceAudit/core/impl/ClientComplianceApplyImpl.java @@ -137,7 +137,7 @@ public class ClientComplianceApplyImpl implements ClientComplianceApply FilesAuthEnum.PASS_OPR.getAfterStatus(), FilesAuthEnum.PASS_OPR.getBeforeStatus(), FilesAuthEnum.PASS_OPR.getAuthType("kyc")); - String[] unrepeatFiles = {"client_bank_file","client_id_file"}; + String[] unrepeatFiles = {"client_company_file","client_id_file"}; for(String fileName : unrepeatFiles){ clientFilesMapper.updateRepeatFilesAfterCommit(clientId,fileName); } diff --git a/src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java index c55ceae97..14c39c7cf 100644 --- a/src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/kyc/core/impls/KycServiceImpl.java @@ -226,10 +226,10 @@ public class KycServiceImpl implements KycService { if (clientAllAuthFiles == null || clientAllAuthFiles.size() == 0) { throw new BadRequestException("Please check the information is uploaded completely"); } - String[] fileKeys = {"client_bank_file", "client_id_file"}; + String[] fileKeys = {"client_company_file", "client_id_file"}; String[] fileNames = {"ASIC File", "ID"}; if(StringUtils.equalsIgnoreCase("passport",account.getString("id_type")) ){ - String[] fileKeysPassport = {"client_bank_file", "kyc_utility_bill_file", "client_id_file"}; + String[] fileKeysPassport = {"client_company_file", "kyc_utility_bill_file", "client_id_file"}; String[] fileNamesPassport = {"ASIC File", "Utility Bill Files", "ID"}; fileKeys = fileKeysPassport; fileNames = fileNamesPassport; diff --git a/src/main/java/au/com/royalpay/payment/manage/kyc/enums/FilesAuthEnum.java b/src/main/java/au/com/royalpay/payment/manage/kyc/enums/FilesAuthEnum.java index 6ef0495ae..549ebd8ba 100644 --- a/src/main/java/au/com/royalpay/payment/manage/kyc/enums/FilesAuthEnum.java +++ b/src/main/java/au/com/royalpay/payment/manage/kyc/enums/FilesAuthEnum.java @@ -30,7 +30,7 @@ package au.com.royalpay.payment.manage.kyc.enums; public String[] getAuthType(String type) { switch (type) { case "kyc": - return new String[]{"client_bank_file","client_id_file","kyc_utility_bill_file"}; + return new String[]{"client_company_file","client_id_file","kyc_utility_bill_file"}; case "compliance": return new String[]{"client_bank_file","client_id_file","client_agree_file","client_company_file"}; default: diff --git a/src/main/java/au/com/royalpay/payment/manage/kyc/enums/FilesAuthStatusEnum.java b/src/main/java/au/com/royalpay/payment/manage/kyc/enums/FilesAuthStatusEnum.java new file mode 100644 index 000000000..708dc3b9e --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/kyc/enums/FilesAuthStatusEnum.java @@ -0,0 +1,39 @@ + +package au.com.royalpay.payment.manage.kyc.enums; + + /** + * @Author: liuxinxin + * @Date: 2019-12-25 + */ + public enum FilesAuthStatusEnum { + + STATUS(0); + + private final int TYPE; + + public int getTYPE() { + return TYPE; + } + + FilesAuthStatusEnum(int TYPE) { + this.TYPE = TYPE; + } + + public String getAuthStatus(int status) { + switch (status) { + case 0: + return "WAIT_AUTH"; + case 1: + return "PASSED"; + case 2: + return "REFUSED"; + case 9: + return "BD_HELP"; + case -1: + return "NOT_SUBMITTED"; + default: + return null; + } + } + } + diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientKycFilesInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientKycFilesInfo.java index 4f5209f71..c699f42dd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientKycFilesInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientKycFilesInfo.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject; */ public class ClientKycFilesInfo { - private String file_bank_info; + private String file_company_info; private String file_id_info; @@ -19,12 +19,12 @@ public class ClientKycFilesInfo { return (JSONObject)JSONObject.toJSON(this); } - public String getFile_bank_info() { - return file_bank_info; + public String getFile_company_info() { + return file_company_info; } - public void setFile_bank_info(String file_bank_info) { - this.file_bank_info = file_bank_info; + public void setFile_company_info(String file_company_info) { + this.file_company_info = file_company_info; } public String getFile_id_info() { 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 688269b9d..59daf634f 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 @@ -3452,7 +3452,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Override public JSONObject getAllKycFiles(JSONObject manager, String clientMoniker) { JSONObject client = getClientInfoByMoniker(clientMoniker); - String[] fileKeys = {"client_bank_file", "kyc_utility_bill_file", "client_id_file"}; + String[] fileKeys = {"client_company_file", "kyc_utility_bill_file", "client_id_file"}; if (client == null) { throw new InvalidShortIdException(); } @@ -3563,7 +3563,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } int clientId = client.getIntValue("client_id"); try { - updateSysClientFiles(manager, clientId, CLIENT_BANK_FILE, filesInfo.getFile_bank_info()); + updateSysClientFiles(manager, clientId, CLIENT_COMPANY_FILE, filesInfo.getFile_company_info()); updateSysClientFiles(manager, clientId, CLIENT_ID_FILE, filesInfo.getFile_id_info()); updateSysClientFiles(manager, clientId, KYC_UTILITY_BILL_FILE, filesInfo.getUtility_bill_info()); } catch (Exception e) { @@ -3603,7 +3603,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } int clientId = client.getIntValue("client_id"); try { - updateFilesForWaitAuditWithoutRepeat(manager, clientId, CLIENT_BANK_FILE, filesInfo.getFile_bank_info(),fileResult); + updateFilesForWaitAuditWithoutRepeat(manager, clientId, CLIENT_COMPANY_FILE, filesInfo.getFile_company_info(),fileResult); updateFilesForWaitAuditWithoutRepeat(manager, clientId, CLIENT_ID_FILE, filesInfo.getFile_id_info(),fileResult); updateSysClientFilesForWaitCompliance(manager, clientId, KYC_UTILITY_BILL_FILE, filesInfo.getUtility_bill_info(),fileResult); } catch (Exception e) { 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 abb96f9bf..9d693d12b 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 @@ -757,7 +757,8 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati lessKycFiles = false; } result.put("client_less_file", lessKycFiles); - if (lessKycFiles || account.containsKey("manager_id")) { + JSONObject compliance = clientComplianceCompanyMapper.findKycFileByClientId(account.getIntValue("client_id")); + if (lessKycFiles || account.containsKey("manager_id") || compliance != null) { List kycFiles = new ArrayList<>(); if ("client".equals(sourceType.toLowerCase())) { kycFiles = clientFilesMapper.findKycClientFileByClient(client.getIntValue("client_id")); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.xml index ba3a910d7..5ce894dbc 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.xml @@ -46,13 +46,13 @@ diff --git a/src/main/resources/i18n/msg_en.properties b/src/main/resources/i18n/msg_en.properties index 9900c4061..0e71cc47d 100644 --- a/src/main/resources/i18n/msg_en.properties +++ b/src/main/resources/i18n/msg_en.properties @@ -117,8 +117,7 @@ sys.mondelay.cancel.waring=Are you sure to quit this activity? client.auth.file.title=RoyalPay is committed to providing a secure and safe platform for Chinese payments. As a part of this we regularly participate in communication with Austrac and China's Foreign Exchange Regulator. To ensure your business is fully compliant, we require certain documents from you by the 31st of October. If you believe you may not be able to submit these documents on time please get in touch with us as soon as possible. client.auth.file.aggregate.title=Notice Of Supplementary Files -client.auth.file.compliance.type=Compliance Files -client.auth.file.kyc.type=KYC Files -client.auth.file.aggregate.deadline=Deadline 2020-1-20 +client.auth.file.compliance.type=2019-10 KYC Certification Information Supplement(1) +client.auth.file.kyc.type=2020-01 KYC Certification Information Supplement(2) client.auth.file.help_confirm=Please confirm whether you need help from customer service ? client.auth.file.help_success=Successful notification, please wait for customer service to contact you. diff --git a/src/main/resources/i18n/msg_zh.properties b/src/main/resources/i18n/msg_zh.properties index 19c0318c4..a38ebdb5b 100644 --- a/src/main/resources/i18n/msg_zh.properties +++ b/src/main/resources/i18n/msg_zh.properties @@ -110,8 +110,7 @@ sys.mondelay.cancel.waring=是否确认退出活动 client.auth.file.title=应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2019年10月31日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。 client.auth.file.aggregate.title=补充材料通知 -client.auth.file.compliance.type=合规材料 -client.auth.file.kyc.type=KYC材料 -client.auth.file.aggregate.deadline=截止时间 2020-1-20 +client.auth.file.compliance.type=2019-10月KYC材料认证补充(1) +client.auth.file.kyc.type=2020-01月KYC材料认证补充(2) client.auth.file.help_confirm=请确认您是否需要客服的帮助？ client.auth.file.help_success=通知成功，请等待客服与您联系。 diff --git a/src/main/ui/static/payment/kyc/kyc-manage.js b/src/main/ui/static/payment/kyc/kyc-manage.js index eda02cfb8..5c1bc20bb 100644 --- a/src/main/ui/static/payment/kyc/kyc-manage.js +++ b/src/main/ui/static/payment/kyc/kyc-manage.js @@ -151,7 +151,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS sessionStorage.setItem($scope.file.client.client_moniker+'_idType',idType); } - $scope.uploadBankFile = function (file) { + $scope.uploadCompanyFile = function (file) { if (file != null) { if (file.size > 3 * 1024 * 1024) { commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) @@ -162,12 +162,12 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS data: {file: file} }).then(function (resp) { delete $scope.bankFileProgress; - $scope.file.file_bank_info = resp.data.url; + $scope.file.file_company_info = resp.data.url; $scope.updateFile(); - if ($scope.file.file_bank_info.endsWith('pdf')) { - $scope.bankIsImage = false; + if ($scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false; } else { - $scope.bankIsImage = true; + $scope.companyIsImage = true; } }, function (resp) { delete $scope.bankFileProgress; @@ -205,7 +205,8 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS } } }; - $scope.uploadCompanyFile = function (file) { + + $scope.uploadBillFile = function (file) { if (file != null) { if (file.size > 3 * 1024 * 1024) { commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) @@ -263,8 +264,8 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }) }; $scope.clientComplianceViewCommit = function () { - if (!$scope.file.file.client_bank_file && !$scope.file.file_company.bd_handle) { - commonDialog.alert({title: 'Error', content: '请提交* ASIC File', type: 'error'}); + if (!$scope.file.file.client_company_file && !$scope.file.file_company.bd_handle) { + commonDialog.alert({title: 'Error', content: '请提交* Certificate of Registration(ASIC File)', type: 'error'}); return; } if (!$scope.file.file.client_id_file && !$scope.file.file_company.bd_handle) { diff --git a/src/main/ui/static/payment/kyc/kyc.js b/src/main/ui/static/payment/kyc/kyc.js index b73910ab4..ce1977bb0 100644 --- a/src/main/ui/static/payment/kyc/kyc.js +++ b/src/main/ui/static/payment/kyc/kyc.js @@ -31,7 +31,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS } //audit files - $scope.uploadBankFile = function (file) { + $scope.uploadCompanyFile = function (file) { if (file != null) { if (file.size > 3 * 1024 * 1024) { commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) @@ -42,12 +42,12 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS data: {file: file} }).then(function (resp) { delete $scope.bankFileProgress; - $scope.file.file_bank_info = resp.data.url; + $scope.file.file_company_info = resp.data.url; $scope.updateFile(); - if ($scope.file.file_bank_info.endsWith('pdf')) { - $scope.bankIsImage = false; + if ($scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false; } else { - $scope.bankIsImage = true; + $scope.companyIsImage = true; } }, function (resp) { delete $scope.bankFileProgress; @@ -89,7 +89,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }; //上传账单流水 - $scope.uploadCompanyFile = function (file) { + $scope.uploadBillFile = function (file) { if (file != null) { if (file.size > 3 * 1024 * 1024) { commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) @@ -117,16 +117,16 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS } }; - $scope.bankIsImage = true; - if ($scope.file.file_bank_info && $scope.file.file_bank_info.endsWith('pdf')) { - $scope.bankIsImage = false; + $scope.companyIsImage = true; + if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false; } $scope.idIsImage = true; if ($scope.file.file_id_info && $scope.file.file_id_info.endsWith('pdf')) { $scope.idIsImage = false; } $scope.billIsImage = true; - if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { + if ($scope.file.utility_bill_info && $scope.file.utility_bill_info.endsWith('pdf')) { $scope.billIsImage = false; } @@ -161,8 +161,8 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }) }; $scope.clientComplianceViewCommit = function () { - if (!$scope.file.client_bank_file) { - commonDialog.alert({title: 'Error', content: '请提交* ASIC File', type: 'error'}); + if (!$scope.file.client_company_file) { + commonDialog.alert({title: 'Error', content: '请提交* Certificate of Registration(ASIC File)', type: 'error'}); return; } if (!$scope.file.client_id_file) { diff --git a/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html b/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html index 7650581f2..6cfecbe3f 100644 --- a/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html +++ b/src/main/ui/static/payment/kyc/templates/bd_help_client_progress.html @@ -61,17 +61,17 @@
- +
- - +
@@ -140,7 +140,7 @@
diff --git a/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html b/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html index 90a58616a..926c73f0c 100644 --- a/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html +++ b/src/main/ui/static/payment/kyc/templates/client_kyc_files_progress.html @@ -27,18 +27,19 @@
- +
- - +
@@ -56,11 +57,17 @@
- +
+

Passport

+

Driver's license

+

Please select the file type for uploading the ID.
Uploading your passport file requires you to upload your utility bill file.
@@ -78,12 +85,13 @@

- +
@@ -122,6 +131,7 @@ onerror="this.src='/static/images/file_close.png'"> @@ -150,9 +160,11 @@
diff --git a/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html b/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html index 43c3f2392..319bd889b 100644 --- a/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html +++ b/src/main/ui/static/payment/kyc/templates/partner_kyc_files.html @@ -19,7 +19,7 @@
- +
- - + - - - - - - + + - + - - - + + - +
1 + @@ -85,7 +82,7 @@
1 + @@ -116,7 +113,7 @@
@@ -168,4 +165,3 @@
- diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index abe9ae776..0d09d33e8 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -4058,7 +4058,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.file = file.data || {}; //kyc files - $scope.uploadBankFile = function (file) { + $scope.uploadCompanyFile = function (file) { if (file != null) { if (file.size > 3 * 1024 * 1024) { commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) @@ -4069,12 +4069,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter data: {file: file} }).then(function (resp) { delete $scope.bankFileProgress; - $scope.file.file_bank_info = resp.data.url; + $scope.file.file_company_info = resp.data.url; $scope.updateFile(); - if ($scope.file.file_bank_info.endsWith('pdf')) { - $scope.bankIsImage = false; + if ($scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false; } else { - $scope.bankIsImage = true; + $scope.companyIsImage = true; } }, function (resp) { delete $scope.bankFileProgress; @@ -4086,10 +4086,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } }; - $scope.bankIsImage = true; - if ($scope.file.file_bank_info && $scope.file.file_bank_info.endsWith('pdf')) { - $scope.bankIsImage = false; + $scope.companyIsImage = true; + if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false; } + $scope.idIsImage = true; if ($scope.file.file_id_info && $scope.file.file_id_info.endsWith('pdf')) { $scope.idIsImage = false; @@ -4129,7 +4130,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; //上传账单流水 - $scope.uploadCompanyFile = function (file) { + $scope.uploadBillFile = function (file) { if (file != null) { if (file.size > 3 * 1024 * 1024) { commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) diff --git a/src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html b/src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html index 648ecc41e..bca089e7c 100644 --- a/src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html +++ b/src/main/ui/static/payment/partner/templates/client_kyc_files_to_auth.html @@ -62,18 +62,29 @@
-
+
+ +
+
+

Passport

+

Driver's license

+ +
+
+
+
List Of Information To Be Supplemented
Supplement TypeDeadline Status Operation
Supplement Compliance File2020-01-31
2019-10 KYC Certification Information Supplement(1) -

- Refused +

+ Refused ({{file.file_company.description}})

+

+ Pending examination and approval +

+

+ Done +

Not Submitted

Go to replenish>>

 +

Go to replenish>>

+

View>>

+
KYC Certification Information Supplement2020-01-31
2020-01 KYC Certification Information Supplement(2) -

- Refused +

+ Refused ({{kycFile.file_company.description}})

+

+ Pending examination and approval +

+

+ Done +

Not Submitted

Go to replenish>>

 +

Go to replenish>>

+

View>>

+
@@ -118,39 +124,54 @@ 待补充资料列表 资料类型 - 截止时间 状态 操作 - - 合规资料补充 - 2020-01-31 + + 2019-10月KYC材料认证补充(1) -

- 打回 +

+ 打回 ({{file.file_company.description}})

+

+ 待审核 +

+

+ 已完成 +

未提交

-

前往补充>>

+ +

前往补充>>

+

查看>>

+ - - KYC认证资料补充 - 2020-01-31 + + 2020-01月KYC材料认证补充(2) -

- 打回 +

+ 打回 ({{kycFile.file_company.description}})

+

+ 待审核 +

+

+ 已完成 +

未提交

-

前往补充>>

+ +

前往补充>>

+

查看>>

+