检测账号

src/main/java/com/caimei365/user/controller/RegisterApi.java

@@ -23,6 +23,21 @@ import org.springframework.web.bind.annotation.*;
 public class RegisterApi {
     private final RegisterService registerService;
 
+
+    /**
+     * 检查账号可以注册
+     *
+     * spi旧接口：/seller/club/check
+     *
+     * @param mobileOrEmail 手机号或邮箱
+     */
+    @ApiOperation("检查账号可以注册")
+    @ApiImplicitParam(required = true, name = "mobileOrEmail", value = "手机号或邮箱")
+    @GetMapping("/check")
+    public ResponseJson registerCheck(String mobileOrEmail) {
+        return registerService.registerCheck(mobileOrEmail);
+    }
+
     /**
      * 普通机构入驻(注册)
      *

src/main/java/com/caimei365/user/service/RegisterService.java

@@ -13,6 +13,13 @@ import org.springframework.http.HttpHeaders;
  * @date : 2021/3/8
  */
 public interface RegisterService {
+
+    /**
+     * 检查账号可以注册
+     * @param mobileOrEmail 手机号或邮箱
+     * @return sucess
+     */
+    ResponseJson registerCheck(String mobileOrEmail);
     /**
      * 普通机构入驻(注册)
      *
@@ -67,8 +74,6 @@ public interface RegisterService {
     /**
      * 协销拉机构上线
      *
-     * spi旧接口：/seller/club/register
-     *
      * @param onlineDto ClubOnlineDto:{
      *                  source                  注册来源: 0网站 1小程序
      *                  userId                  协销用户ID(userID)
@@ -134,4 +139,5 @@ public interface RegisterService {
      * @return ShopPo
      */
     ResponseJson updateShopApply(ShopApplyDto shopApplyDto, HttpHeaders headers);
+
 }

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -420,7 +420,7 @@ public class LoginServiceImpl implements LoginService {
      * @param userId    要绑定的用户Id(userID)
      * @param mobile    手机号
      * @param smsCode   手机验证码(verificationCode)
-     * @param smsCode   微信unionId
+     * @param unionId   微信unionId
      * @return OperationPo
      */
     @Override

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -46,6 +46,23 @@ public class RegisterServiceImpl implements RegisterService {
     @Resource
     private RegisterMapper registerMapper;
 
+    /**
+     * 检查账号可以注册
+     *
+     * @param mobileOrEmail 手机号或邮箱
+     * @return sucess
+     */
+    @Override
+    public ResponseJson registerCheck(String mobileOrEmail) {
+        // 手机号验证
+        String mobileResult = mobileAndCodeValidate(mobileOrEmail, null);
+        if (mobileResult != null) {return ResponseJson.error(mobileResult);}
+        // 邮箱验证
+        String emailResult = emailValidate(mobileOrEmail);
+        if (emailResult != null) {return ResponseJson.error(emailResult);}
+        return ResponseJson.success("该账号可以注册");
+    }
+
     /**
      * 普通机构入驻(注册)
      *
@@ -341,8 +358,6 @@ public class RegisterServiceImpl implements RegisterService {
     /**
      * 协销拉机构上线
      *
-     * spi旧接口：/seller/club/register
-     *
      * @param onlineDto ClubOnlineDto:{
      *                  source                  注册来源: 0网站 1小程序
      *                  userId                  协销用户ID(userID)
@@ -385,15 +400,11 @@ public class RegisterServiceImpl implements RegisterService {
             return ResponseJson.error("请勾选同意协议");
         }
         // 是否填写升级资料
-        if (StringUtils.isNotBlank(onlineDto.getContractEmail())) {
+        String email = onlineDto.getContractEmail();
+        if (StringUtils.isNotBlank(email)) {
             // 邮箱验证
-            if (ValidateUtil.validateEmail(onlineDto.getContractEmail())) {
-                return ResponseJson.error("邮箱格式不正确");
-            }
-            Integer userIdByEmail = baseMapper.getUserIdByEmail(onlineDto.getContractEmail());
-            if (null != userIdByEmail && userIdByEmail > 0 ) {
-                return ResponseJson.error("该邮箱已被使用");
-            }
+            String emailCheck = emailValidate(email);
+            if (emailCheck != null) {return ResponseJson.error(emailCheck);}
             // 机构名称检查
             ResponseJson responseJson = ValidateUtil.validateClubName(onlineDto.getName());
             if (0 != responseJson.getCode()) {
@@ -454,13 +465,13 @@ public class RegisterServiceImpl implements RegisterService {
         // 协销状态
         user.setServiceProviderStatus(serviceProvider.getStatus());
         // 会员机构，填写升级资料
-        if (StringUtils.isNotBlank(onlineDto.getContractEmail())) {
+        if (StringUtils.isNotBlank(email)) {
             // 状态：待审查资料
             user.setClubStatus(1);
             // 组织名称
             user.setName(onlineDto.getName());
             // 邮箱
-            user.setEmail(onlineDto.getContractEmail());
+            user.setEmail(email);
         }
         /* 保存数据库 user */
         int insertUserFlag = registerMapper.insertClubUser(user);
@@ -486,13 +497,13 @@ public class RegisterServiceImpl implements RegisterService {
         // 注册时间
         club.setAddTime(current);
         // 会员机构，填写升级资料
-        if (StringUtils.isNotBlank(onlineDto.getContractEmail())) {
+        if (StringUtils.isNotBlank(email)) {
             // 机构名称
             club.setName(onlineDto.getName());
             // 机构简称
             club.setShortName(onlineDto.getShortName());
             // 邮箱
-            club.setContractEmail(onlineDto.getContractEmail());
+            club.setContractEmail(email);
             // 待审查资料
             club.setStatus(1);
             // 地址
@@ -544,7 +555,7 @@ public class RegisterServiceImpl implements RegisterService {
          */
         String logTxt = "【协销拉机构上线】短信内容:>>>欢迎成为采美 %s 用户，您的登录账号为：%s，初始密码为：%s";
         int smsType = 7;
-        if (StringUtils.isNotBlank(onlineDto.getContractEmail())) {
+        if (StringUtils.isNotBlank(email)) {
             // 会员机构
             logTxt = String.format(logTxt, "会员机构", mobile, initPassword);
             smsType = 6;
@@ -754,6 +765,21 @@ public class RegisterServiceImpl implements RegisterService {
 
     }
 
+    /**
+     * 校验邮箱
+     * @param email 邮箱
+     * @return errorMsg
+     */
+    private String emailValidate(String email) {
+        if (!ValidateUtil.validateEmail(email)) {
+            return  "邮箱格式不正确";
+        }
+        Integer userIdByEmail = baseMapper.getUserIdByEmail(email);
+        if (null != userIdByEmail && userIdByEmail > 0 ) {
+            return "该邮箱已被使用";
+        }
+        return null;
+    }
     /**
      * 校验手机号与验证码
      * @param mobile 手机号