From 6513f627f8ef16e207a26e714777cf2fe6ecbf17 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Tue, 17 Dec 2019 11:21:15 +0800 Subject: [PATCH] =?UTF-8?q?[R]=20=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/kyc/bean/KycPartnersQuery.java | 15 ++++++++------- .../manage/signin/web/SignInController.java | 2 +- .../system/ClientComplianceCompanyMapper.xml | 1 + src/main/ui/static/boot/indexMainApp.js | 2 +- src/main/ui/static/payment/kyc/kyc-manage.js | 9 +++++++++ src/main/ui/static/payment/kyc/kyc.js | 6 +++++- .../payment/kyc/templates/bd_client_progress.html | 4 ++-- .../kyc/templates/bd_help_client_progress.html | 2 +- .../kyc/templates/client_kyc_files_progress.html | 4 ++-- .../templates/client_compliance_to_perfect.html | 2 +- .../templates/compliance_files_advice.html | 9 ++++++++- 11 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/kyc/bean/KycPartnersQuery.java b/src/main/java/au/com/royalpay/payment/manage/kyc/bean/KycPartnersQuery.java index e627150e0..37ddd5fc2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/kyc/bean/KycPartnersQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/kyc/bean/KycPartnersQuery.java @@ -7,18 +7,19 @@ import org.apache.commons.lang3.StringUtils; * Created by yishuqian on 8/30/16. */ public class KycPartnersQuery { - private String clientMoniker; + private String client_moniker; private String status; private int page = 1; private int limit = 10; private boolean onlyMe = false; - public String getClientMoniker() { - return clientMoniker; + + public String getClient_moniker() { + return client_moniker; } - public void setClientMoniker(String title) { - this.clientMoniker = title; + public void setClient_moniker(String client_moniker) { + this.client_moniker = client_moniker; } public String getStatus() { @@ -55,8 +56,8 @@ public class KycPartnersQuery { public JSONObject toJsonParam() { JSONObject param = new JSONObject(); - if (StringUtils.isNotBlank(clientMoniker)) { - param.put("clientMoniker", getClientMoniker()); + if (StringUtils.isNotBlank(client_moniker)) { + param.put("client_moniker", getClient_moniker()); } if (StringUtils.isNotBlank(status)) { param.put("status", getStatus()); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java index 82a4b5a0f..5f5fb0edb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java @@ -192,7 +192,7 @@ public class SignInController { public JSONObject partnerLoginStatus(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) { partner.put("has_incremental_setvice",clientManager.partnerIncrementalService(partner.getString("client_moniker")).getJSONArray("all_service").size()>0); partner.put("lessKycFiles",clientManager.isPartnerKycfilesComplete(partner.getString("client_moniker"))); - partner.put("complianceFiles",signInAccountService.checkAuthFileStatus(partner.getJSONObject("client")) ); + partner.put("lessComplianceFiles",signInAccountService.checkAuthFileStatus(partner.getJSONObject("client")).getBoolean("client_less_file") ); return partner; } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml index b2303f8e7..516572600 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml @@ -14,6 +14,7 @@ and a.type = #{type} + and a.status != 9 diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index 8026a16a5..4f9cfe937 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/src/main/ui/static/boot/indexMainApp.js @@ -62,7 +62,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo }) }; //todo 这边需要调整 或者关系 不能做两个if,字段放到client里，位置要一致，有bug当补充合规材料提交后不提示弹窗，弹窗样式要修改 - if(($scope.currentUser.complianceFiles.client_less_file ||$scope.currentUser.lessKycFiles) && complianceNoticeCount==0 && $scope.currentUser.role!=3) { + if(($scope.currentUser.lessComplianceFiles ||$scope.currentUser.lessKycFiles) && complianceNoticeCount==0 && $scope.currentUser.role!=3) { $scope.ComplianceToperfect(); complianceNoticeCount++; } diff --git a/src/main/ui/static/payment/kyc/kyc-manage.js b/src/main/ui/static/payment/kyc/kyc-manage.js index 8b74795bc..c53f23bc6 100644 --- a/src/main/ui/static/payment/kyc/kyc-manage.js +++ b/src/main/ui/static/payment/kyc/kyc-manage.js @@ -39,6 +39,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.loadClientProgressing = function (page,status) { var params = angular.copy($scope.params); params.status = status; + params.client_moniker = params.progress_client_moniker; params.page = page || $scope.progressPagination.page || 1; $http.get('/sys/kyc/manage/partner/progressing', {params: params}).then(function (resp) { $scope.approving = resp.data.data; @@ -48,6 +49,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.loadClientCompleted = function (page) { var params = angular.copy($scope.params); + params.client_moniker = params.completed_client_moniker; params.page = page || $scope.completedPagination.page || 1; $http.get('/sys/kyc/manage/partner/completed', {params: params}).then(function (resp) { $scope.completed_contract = resp.data.data; @@ -142,6 +144,13 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }]); app.controller('bdHelpKYCProgressCtrl', [ '$scope', '$http', '$state', 'file', 'commonDialog', '$location', '$anchorScroll','Upload',function ($scope, $http, $state, file, commonDialog, $location, $anchorScroll, Upload) { $scope.file = angular.copy(file.data) || {}; + if(!$scope.file.file_company.id_type){ + $scope.file.file_company.id_type = sessionStorage.getItem($scope.file.client.client_moniker+'_idType'); + } + $scope.setSession = function(idType){ + sessionStorage.setItem($scope.file.client.client_moniker+'_idType',idType); + } + $scope.uploadBankFile = function (file) { if (file != null) { if (file.size > 3 * 1024 * 1024) { diff --git a/src/main/ui/static/payment/kyc/kyc.js b/src/main/ui/static/payment/kyc/kyc.js index 32d2188a8..8a2a3ea70 100644 --- a/src/main/ui/static/payment/kyc/kyc.js +++ b/src/main/ui/static/payment/kyc/kyc.js @@ -22,10 +22,14 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS if($scope.file.file_company){ $scope.file.id_type = $scope.file.file_company.id_type||""; }else{ - $scope.file.id_type = ""; + $scope.file.id_type = sessionStorage.getItem($scope.partner.client_moniker+'_idType'); } $scope.file.need_bd = true; + $scope.setSession = function(idType){ + sessionStorage.setItem($scope.partner.client_moniker+'_idType',idType); + } + //audit files $scope.uploadBankFile = function (file) { if (file != null) { diff --git a/src/main/ui/static/payment/kyc/templates/bd_client_progress.html b/src/main/ui/static/payment/kyc/templates/bd_client_progress.html index cfe7e3024..2855ea60c 100644 --- a/src/main/ui/static/payment/kyc/templates/bd_client_progress.html +++ b/src/main/ui/static/payment/kyc/templates/bd_client_progress.html @@ -177,7 +177,7 @@
+ ng-model="params.progress_client_moniker">
@@ -292,7 +292,7 @@
+ ng-model="params.completed_client_moniker">
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 642ebb090..8f1a2c43c 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 @@ -89,7 +89,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 54854d639..69d92bc6c 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 @@ -22,7 +22,7 @@ ({{file.file_company.description}})
-

前去补充合规文件:点击前往

+

前去补充合规文件:点击前往

@@ -55,7 +55,7 @@
- diff --git a/src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html b/src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html index e0afbc9b3..81ac7f635 100644 --- a/src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html +++ b/src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html @@ -22,7 +22,7 @@ ({{file.client_refuse_reason}})
-

前去补充KYC文件：点击前往

+

前去补充KYC文件：点击前往

diff --git a/src/main/ui/static/payment/partner/templates/compliance_files_advice.html b/src/main/ui/static/payment/partner/templates/compliance_files_advice.html index 2388086f1..c72cadc03 100644 --- a/src/main/ui/static/payment/partner/templates/compliance_files_advice.html +++ b/src/main/ui/static/payment/partner/templates/compliance_files_advice.html @@ -1,3 +1,10 @@ + +

Merchant Supplement Compliance File Notification

商户资料文件补充通知

@@ -17,7 +24,7 @@
-
EN | 中文
 +
EN | 中文

RoyalPayMerchant Supplement