|
@@ -124,6 +124,9 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
detail.setShortName(enterprise.getEnShortname());
|
|
detail.setShortName(enterprise.getEnShortname());
|
|
|
detail.setBusinessCode(enterprise.getEnBussinessCode());
|
|
detail.setBusinessCode(enterprise.getEnBussinessCode());
|
|
|
detail.setBusinessCodeImage(filePath);
|
|
detail.setBusinessCodeImage(filePath);
|
|
|
|
|
+ if (null == detail.getName()|| null == detail.getShortName() || null==detail.getBusinessCode() || null==detail.getBusinessCodeImage()){
|
|
|
|
|
+ return new ResultMap(CodeType.SYSTEM_NOT_EXIST, "参数不能为空");
|
|
|
|
|
+ }
|
|
|
detail.setArea("中国大陆");
|
|
detail.setArea("中国大陆");
|
|
|
detail.setAddress(enterprise.getEnAddress());
|
|
detail.setAddress(enterprise.getEnAddress());
|
|
|
detail.setUrl(enterprise.getEnUrl());
|
|
detail.setUrl(enterprise.getEnUrl());
|
|
@@ -136,7 +139,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
|
|
|
}
|
|
}
|
|
|
- if (result.contains("errMsg")){
|
|
|
|
|
|
|
+ if (result.contains("errMsg") || !result.contains("enuu")){
|
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -148,7 +151,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
try {
|
|
try {
|
|
|
String result = AccountUtils.validName(name);
|
|
String result = AccountUtils.validName(name);
|
|
|
JSONObject resultJSON = JSONObject.parseObject(result);
|
|
JSONObject resultJSON = JSONObject.parseObject(result);
|
|
|
- if (null !=resultJSON.get("businessCode")){
|
|
|
|
|
|
|
+ if (true == (boolean)resultJSON.get("inCloud") || true == (boolean)resultJSON.get("hasCreate")){
|
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "校验失败");
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "校验失败");
|
|
|
}else{
|
|
}else{
|
|
|
return ResultMap.success("校验成功");
|
|
return ResultMap.success("校验成功");
|
|
@@ -163,7 +166,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
try {
|
|
try {
|
|
|
String result = AccountUtils.validBusinessCode(businessCode);
|
|
String result = AccountUtils.validBusinessCode(businessCode);
|
|
|
JSONObject resultJSON = JSONObject.parseObject(result);
|
|
JSONObject resultJSON = JSONObject.parseObject(result);
|
|
|
- if (null !=resultJSON.get("name")){
|
|
|
|
|
|
|
+ if (true == (boolean)resultJSON.get("inCloud") || true == (boolean)resultJSON.get("hasCreate")){
|
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "校验失败");
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "校验失败");
|
|
|
}else{
|
|
}else{
|
|
|
return ResultMap.success("校验成功");
|
|
return ResultMap.success("校验成功");
|