|
|
|
@ -2526,8 +2526,16 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
authFileStatus.put("content", messageSource.getMessage("client.auth.file.title", null, RequestEnvironment.getLocale()));
|
|
|
|
|
|
|
|
|
|
List<JSONObject> supplement_array = new ArrayList<>();
|
|
|
|
|
JSONObject complianceFilesNotice = complianceFilesNotice(client, account);
|
|
|
|
|
JSONObject kycFilesNotice = kycFilesNotice(client, account);
|
|
|
|
|
JSONObject complianceFilesNotice = complianceFilesNotice(client,account);
|
|
|
|
|
JSONObject kycFilesNotice = kycFilesNotice(client,account);
|
|
|
|
|
|
|
|
|
|
if(complianceFilesNotice != null && kycFilesNotice != null){
|
|
|
|
|
if( !kycFilesNotice.getBoolean("client_less_file") && !complianceFilesNotice.getBoolean("client_less_file")){
|
|
|
|
|
authFileStatus.put("isNeedShowKycAlert",false);
|
|
|
|
|
}else{
|
|
|
|
|
authFileStatus.put("isNeedShowKycAlert",true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
@ -2609,15 +2617,17 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
|
|
|
|
|
complianceFilesNotice.put("auth_type", FilesAuthTypeEnum.COMPLIANCE.getAuthType());
|
|
|
|
|
complianceFilesNotice.put("type", messageSource.getMessage("client.auth.file.compliance.type", null, RequestEnvironment.getLocale()));
|
|
|
|
|
complianceFilesNotice.put("client_less_file", complianceFileStatus.getBoolean("client_less_file"));
|
|
|
|
|
if (compliance != null) {
|
|
|
|
|
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 if (!complianceFileStatus.getBoolean("client_less_file")) {
|
|
|
|
|
complianceFilesNotice.put("status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(1));
|
|
|
|
|
} else {
|
|
|
|
|
complianceFilesNotice.put("status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(-1));
|
|
|
|
|
complianceFilesNotice.put("client_less_file",complianceFileStatus.getBoolean("client_less_file"));
|
|
|
|
|
if(compliance != null){
|
|
|
|
|
if(complianceFileStatus.getBoolean("client_less_file")){
|
|
|
|
|
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 if( !complianceFileStatus.getBoolean("client_less_file")){
|
|
|
|
|
complianceFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(1) );
|
|
|
|
|
}else{
|
|
|
|
|
complianceFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(-1) );
|
|
|
|
|
}
|
|
|
|
|
complianceFilesNotice.put("status_type_description", messageSource.getMessage("client.auth.file.status." + complianceFilesNotice.getString("status_type").toLowerCase(), null, RequestEnvironment.getLocale()));
|
|
|
|
|
return complianceFilesNotice;
|
|
|
|
@ -2635,13 +2645,15 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
|
|
|
|
|
kycFilesNotice.put("auth_type", FilesAuthTypeEnum.KYC.getAuthType());
|
|
|
|
|
kycFilesNotice.put("type", messageSource.getMessage("client.auth.file.kyc.type", null, RequestEnvironment.getLocale()));
|
|
|
|
|
kycFilesNotice.put("client_less_file", kycFileStatus.getBoolean("client_less_file"));
|
|
|
|
|
if (compliance != null) {
|
|
|
|
|
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));
|
|
|
|
|
kycFilesNotice.put("client_less_file",kycFileStatus.getBoolean("client_less_file"));
|
|
|
|
|
if(compliance != null){
|
|
|
|
|
if(kycFilesNotice.getBoolean("client_less_file")){
|
|
|
|
|
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) );
|
|
|
|
|
}
|
|
|
|
|
kycFilesNotice.put("status_type_description", messageSource.getMessage("client.auth.file.status." + kycFilesNotice.getString("status_type").toLowerCase(), null, RequestEnvironment.getLocale()));
|
|
|
|
|
return kycFilesNotice;
|
|
|
|
|