|
@@ -90,16 +90,26 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
String ip = headers.getFirst("X-CLIENT-IP");
|
|
|
log.info("机构注册 X-CLIENT-IP : " + ip);
|
|
|
// 参数校验
|
|
|
- if (null == clubRegisterDto.getIsAgreed() || StringUtils.isBlank(clubRegisterDto.getUserName()) || StringUtils.isBlank(clubRegisterDto.getBindMobile())
|
|
|
- || StringUtils.isBlank(clubRegisterDto.getPassword()) || StringUtils.isBlank(clubRegisterDto.getPassWordConfirm()) ||
|
|
|
- StringUtils.isBlank(clubRegisterDto.getSmsCode())) {
|
|
|
- return ResponseJson.error("参数异常");
|
|
|
+ if (StringUtils.isBlank(clubRegisterDto.getUserName())) {
|
|
|
+ return ResponseJson.error("参数异常:用户名不能为空!");
|
|
|
}
|
|
|
- if (1 != clubRegisterDto.getIsAgreed()) {
|
|
|
+ if (StringUtils.isBlank(clubRegisterDto.getBindMobile())) {
|
|
|
+ return ResponseJson.error("参数异常:企业绑定手机号不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(clubRegisterDto.getPassword())) {
|
|
|
+ return ResponseJson.error("参数异常:密码不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(clubRegisterDto.getPassWordConfirm())) {
|
|
|
+ return ResponseJson.error("参数异常:确认密码不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(clubRegisterDto.getSmsCode())) {
|
|
|
+ return ResponseJson.error("参数异常:短信验证码不能为空!");
|
|
|
+ }
|
|
|
+ if (null == clubRegisterDto.getIsAgreed() || 1 != clubRegisterDto.getIsAgreed()) {
|
|
|
return ResponseJson.error("请勾选同意协议");
|
|
|
}
|
|
|
if (!clubRegisterDto.getPassword().equals(clubRegisterDto.getPassWordConfirm())) {
|
|
|
- return ResponseJson.error("输入的密码不一致");
|
|
|
+ return ResponseJson.error("两次输入的密码不一致");
|
|
|
}
|
|
|
// 手机号与验证码校验
|
|
|
String result = commonService.mobileAndCodeValidate(clubRegisterDto.getBindMobile(), clubRegisterDto.getSmsCode());
|
|
@@ -278,9 +288,26 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
String ip = headers.getFirst("X-CLIENT-IP");
|
|
|
log.info("机构升级 X-CLIENT-IP : " + ip);
|
|
|
// 参数校验
|
|
|
- if (upgradeDto.getUserId() == null || upgradeDto.getClubId() == null || StringUtils.isBlank(upgradeDto.getContractEmail()) || StringUtils.isBlank(upgradeDto.getName())
|
|
|
- || StringUtils.isBlank(upgradeDto.getBusinessLicense()) || upgradeDto.getTownId() == null || upgradeDto.getFirstClubType() == null) {
|
|
|
- return ResponseJson.error("参数异常");
|
|
|
+ if (null == upgradeDto.getUserId()) {
|
|
|
+ return ResponseJson.error("参数异常:用户Id不能为空!");
|
|
|
+ }
|
|
|
+ if (null == upgradeDto.getClubId()) {
|
|
|
+ return ResponseJson.error("参数异常:机构Id不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(upgradeDto.getContractEmail())) {
|
|
|
+ return ResponseJson.error("参数异常:联系邮箱不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(upgradeDto.getName())) {
|
|
|
+ return ResponseJson.error("参数异常:机构名称不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(upgradeDto.getBusinessLicense())) {
|
|
|
+ return ResponseJson.error("参数异常:营业执照不能为空!");
|
|
|
+ }
|
|
|
+ if (null == upgradeDto.getTownId()) {
|
|
|
+ return ResponseJson.error("参数异常:请选择地址!");
|
|
|
+ }
|
|
|
+ if (null == upgradeDto.getFirstClubType()) {
|
|
|
+ return ResponseJson.error("参数异常:一级分类不能为空!");
|
|
|
}
|
|
|
if (upgradeDto.getFirstClubType() == 1){
|
|
|
if (upgradeDto.getSecondClubType() == null || StringUtils.isBlank(upgradeDto.getMedicalPracticeLicense())) {
|
|
@@ -403,16 +430,22 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
// 手机号
|
|
|
String mobile = onlineDto.getBindMobile();
|
|
|
// 参数校验
|
|
|
- if (onlineDto.getUserId() == null || StringUtils.isBlank(onlineDto.getLinkMan()) || StringUtils.isBlank(mobile)
|
|
|
- || isAgreed == null) {
|
|
|
- return ResponseJson.error("参数异常");
|
|
|
+ if (null == onlineDto.getUserId()) {
|
|
|
+ return ResponseJson.error("参数异常:用户Id不能为空!");
|
|
|
}
|
|
|
- if (1 != isAgreed) {
|
|
|
+ if (StringUtils.isBlank(mobile)) {
|
|
|
+ return ResponseJson.error("参数异常:企业绑定手机号不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(onlineDto.getLinkMan())) {
|
|
|
+ return ResponseJson.error("参数异常:联系人不能为空!");
|
|
|
+ }
|
|
|
+ if (null == isAgreed || 1 != isAgreed) {
|
|
|
return ResponseJson.error("请勾选同意协议");
|
|
|
}
|
|
|
// 是否填写升级资料
|
|
|
+ String businessLicense = onlineDto.getBusinessLicense();
|
|
|
String email = onlineDto.getContractEmail();
|
|
|
- if (StringUtils.isNotBlank(email)) {
|
|
|
+ if (StringUtils.isNotBlank(businessLicense)) {
|
|
|
// 邮箱验证
|
|
|
String emailCheck = commonService.emailValidate(email);
|
|
|
if (emailCheck != null) {return ResponseJson.error(emailCheck);}
|
|
@@ -476,7 +509,7 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
// 协销状态
|
|
|
user.setServiceProviderStatus(serviceProvider.getStatus());
|
|
|
// 会员机构,填写升级资料
|
|
|
- if (StringUtils.isNotBlank(email)) {
|
|
|
+ if (StringUtils.isNotBlank(businessLicense)) {
|
|
|
// 状态:待审查资料
|
|
|
user.setClubStatus(1);
|
|
|
// 组织名称
|
|
@@ -513,7 +546,7 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
// 注册时间
|
|
|
club.setAddTime(current);
|
|
|
// 会员机构,填写升级资料
|
|
|
- if (StringUtils.isNotBlank(email)) {
|
|
|
+ if (StringUtils.isNotBlank(businessLicense)) {
|
|
|
// 机构名称
|
|
|
club.setName(onlineDto.getName());
|
|
|
// 机构简称
|
|
@@ -530,7 +563,7 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
// 门头照
|
|
|
club.setShopPhoto(onlineDto.getShopPhoto());
|
|
|
// 营业执照
|
|
|
- club.setBusinessLicense(onlineDto.getBusinessLicense());
|
|
|
+ club.setBusinessLicense(businessLicense);
|
|
|
// 统一社会信用代码
|
|
|
club.setSocialCreditCode(onlineDto.getSocialCreditCode());
|
|
|
// 分类: 1医美, 2生美
|
|
@@ -630,11 +663,19 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
String ip = headers.getFirst("X-CLIENT-IP");
|
|
|
log.info("供应商注册 X-CLIENT-IP : " + ip);
|
|
|
// 参数校验
|
|
|
- if (StringUtils.isBlank(shopRegisterDto.getBindMobile()) || StringUtils.isBlank(smsCode)
|
|
|
- || StringUtils.isBlank(shopRegisterDto.getPassword()) || StringUtils.isBlank(passWordConfirm)) {
|
|
|
- return ResponseJson.error("参数异常");
|
|
|
+ if (StringUtils.isBlank(shopRegisterDto.getBindMobile())) {
|
|
|
+ return ResponseJson.error("参数异常:企业绑定手机号不能为空!");
|
|
|
}
|
|
|
- if (!shopRegisterDto.getPassword() .equals(passWordConfirm)) {
|
|
|
+ if (StringUtils.isBlank(shopRegisterDto.getPassword())) {
|
|
|
+ return ResponseJson.error("参数异常:密码不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(passWordConfirm)) {
|
|
|
+ return ResponseJson.error("参数异常:确认密码不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(smsCode)) {
|
|
|
+ return ResponseJson.error("参数异常:短信验证码不能为空!");
|
|
|
+ }
|
|
|
+ if (!shopRegisterDto.getPassword().equals(passWordConfirm)) {
|
|
|
return ResponseJson.error("两次输入的密码不一致");
|
|
|
}
|
|
|
// 手机号与验证码校验
|
|
@@ -644,8 +685,11 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
if (1 == whichStep) {
|
|
|
return ResponseJson.success(null);
|
|
|
}
|
|
|
- if (StringUtils.isBlank(shopRegisterDto.getName()) || StringUtils.isBlank(shopRegisterDto.getLinkMan())) {
|
|
|
- return ResponseJson.error("参数异常");
|
|
|
+ if (StringUtils.isBlank(shopRegisterDto.getName())) {
|
|
|
+ return ResponseJson.error("参数异常:公司名称不能为空!");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(shopRegisterDto.getLinkMan())) {
|
|
|
+ return ResponseJson.error("参数异常:联系人不能为空!");
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(shopRegisterDto.getEmail())) {
|
|
|
// 查找用户表是否存在相同邮箱
|
|
@@ -658,7 +702,7 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
if (2 == whichStep) {
|
|
|
return ResponseJson.success(null);
|
|
|
}
|
|
|
- if (null != isAgreed && 1 != isAgreed) {
|
|
|
+ if (null == isAgreed || 1 != isAgreed) {
|
|
|
return ResponseJson.error("请勾选同意协议");
|
|
|
}
|
|
|
/*
|
|
@@ -757,10 +801,13 @@ public class RegisterServiceImpl implements RegisterService{
|
|
|
*/
|
|
|
@Override
|
|
|
public ResponseJson updateShopApply(ShopApplyDto shop, HttpHeaders headers) {
|
|
|
- if (null == shop || null == shop.getUserId() || null == shop.getShopId() || null ==shop.getIsAgreed()) {
|
|
|
- return ResponseJson.error("参数异常");
|
|
|
+ if (null == shop || null == shop.getUserId()) {
|
|
|
+ return ResponseJson.error("参数异常:用户Id不能为空!");
|
|
|
+ }
|
|
|
+ if (null == shop.getShopId()) {
|
|
|
+ return ResponseJson.error("参数异常:供应商Id不能为空!");
|
|
|
}
|
|
|
- if (1 != shop.getIsAgreed()) {
|
|
|
+ if (null == shop.getIsAgreed() || 1 != shop.getIsAgreed()) {
|
|
|
return ResponseJson.error("请勾选同意协议");
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(shop.getEmail())) {
|