[R] APP端接口调整

master
liuxinxin 5 years ago
parent 0404b35b1f
commit cc383d474b

@ -2528,6 +2528,14 @@ public class RetailAppServiceImp implements RetailAppService {
List<JSONObject> supplement_array = new ArrayList<>(); List<JSONObject> supplement_array = new ArrayList<>();
JSONObject complianceFilesNotice = complianceFilesNotice(client,account); JSONObject complianceFilesNotice = complianceFilesNotice(client,account);
JSONObject kycFilesNotice = kycFilesNotice(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) { if (PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) {
return null; return null;
} }
@ -2611,7 +2619,9 @@ public class RetailAppServiceImp implements RetailAppService {
complianceFilesNotice.put("type", messageSource.getMessage("client.auth.file.compliance.type", null, RequestEnvironment.getLocale())); complianceFilesNotice.put("type", messageSource.getMessage("client.auth.file.compliance.type", null, RequestEnvironment.getLocale()));
complianceFilesNotice.put("client_less_file",complianceFileStatus.getBoolean("client_less_file")); complianceFilesNotice.put("client_less_file",complianceFileStatus.getBoolean("client_less_file"));
if(compliance != null){ if(compliance != null){
if(complianceFileStatus.getBoolean("client_less_file")){
complianceFilesNotice.put("client_refuse_reason",compliance.getString("description")); complianceFilesNotice.put("client_refuse_reason",compliance.getString("description"));
}
complianceFilesNotice.put("status",compliance.getString("status")); complianceFilesNotice.put("status",compliance.getString("status"));
complianceFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(compliance.getIntValue("status")) ); complianceFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(compliance.getIntValue("status")) );
}else if( !complianceFileStatus.getBoolean("client_less_file")){ }else if( !complianceFileStatus.getBoolean("client_less_file")){
@ -2637,7 +2647,9 @@ public class RetailAppServiceImp implements RetailAppService {
kycFilesNotice.put("type", messageSource.getMessage("client.auth.file.kyc.type", null, RequestEnvironment.getLocale())); kycFilesNotice.put("type", messageSource.getMessage("client.auth.file.kyc.type", null, RequestEnvironment.getLocale()));
kycFilesNotice.put("client_less_file",kycFileStatus.getBoolean("client_less_file")); kycFilesNotice.put("client_less_file",kycFileStatus.getBoolean("client_less_file"));
if(compliance != null){ if(compliance != null){
if(kycFilesNotice.getBoolean("client_less_file")){
kycFilesNotice.put("client_refuse_reason",compliance.getString("description")); kycFilesNotice.put("client_refuse_reason",compliance.getString("description"));
}
kycFilesNotice.put("status",compliance.getString("status")); kycFilesNotice.put("status",compliance.getString("status"));
kycFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(compliance.getIntValue("status")) ); kycFilesNotice.put( "status_type", FilesAuthStatusEnum.STATUS.getAuthStatus(compliance.getIntValue("status")) );
}else{ }else{

Loading…
Cancel
Save