Merge remote-tracking branch 'origin/master'

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

@@ -388,7 +388,7 @@ public class RegisterServiceImpl implements RegisterService {
         }
         ResponseJson model = ValidateUtil.validateMobile(shopRegisterDto.getBindMobile());
         if (model.getCode() == -1) {
-            return model;
+            return ResponseJson.error(model.getMsg(), null);
         }
         if (!shopRegisterDto.getPassword().equals(passWordConfirm)) {
             return ResponseJson.error("输入的密码不一致", null);
@@ -545,10 +545,10 @@ public class RegisterServiceImpl implements RegisterService {
             if (StringUtils.isBlank(shopRegisterDto.getBindMobile()) || StringUtils.isBlank(shopRegisterDto.getPassword())
                     || StringUtils.isBlank(smsCode) || StringUtils.isBlank(shopRegisterDto.getPassword())
                     || StringUtils.isBlank(passWordConfirm)) {
-                return ResponseJson.error("参数异常");
+                return ResponseJson.error("参数异常", null);
             }
             if (!shopRegisterDto.getPassword() .equals(passWordConfirm)) {
-                return ResponseJson.error("两次输入的密码不一致");
+                return ResponseJson.error("两次输入的密码不一致", null);
             }
             // 查找用户表是否存在
             Integer dbUserId = baseMapper.getUserIdByMobile(shopRegisterDto.getBindMobile());
@@ -564,10 +564,10 @@ public class RegisterServiceImpl implements RegisterService {
             if (!redisSmsCode.equals(smsCode)) {
                 return ResponseJson.error("手机验证码错误", null);
             }
-            return ResponseJson.success();
+            return ResponseJson.success(null);
         } else if (2 == whichStep) {
             if (StringUtils.isBlank(shopRegisterDto.getName()) || StringUtils.isBlank(shopRegisterDto.getLinkMan())) {
-                return ResponseJson.error("参数异常");
+                return ResponseJson.error("参数异常", null);
             }
             if (StringUtils.isNotBlank(shopRegisterDto.getEmail())) {
                 // 查找用户表是否存在相同邮箱
@@ -576,9 +576,9 @@ public class RegisterServiceImpl implements RegisterService {
                     return ResponseJson.error("该邮箱已被使用", null);
                 }
             }
-            return ResponseJson.success();
+            return ResponseJson.success(null);
         } else if (1 != isAgreed) {
-            return ResponseJson.error("请勾选同意协议");
+            return ResponseJson.error("请勾选同意协议", null);
         }
         return shopRegister(shopRegisterDto, passWordConfirm, smsCode, isAgreed, headers);
     }