Merge branch 'develop'

master
wangning 7 years ago
commit f765d896d3

@ -428,6 +428,24 @@ public class RetailAppServiceImp implements RetailAppService {
if (clientType.equals("iphone")) { if (clientType.equals("iphone")) {
res.put("skip_clearing", !res.getBoolean("skip_clearing")); 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")) ||
("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; return res;
} }

Loading…
Cancel
Save