fix

netflix-service/src/main/java/com/cyksj/service/market/task/impl/BindTaskServiceImpl.java

@@ -397,18 +397,6 @@ public class BindTaskServiceImpl implements BindTaskService {
 		String code = request.getCode();
 		Integer type = request.getType();
 		if (type == 1) {
-			//是否已注册
-			User changeUser = userMapper.selectOne(Wrappers.lambdaQuery(User.class)
-					.eq(User::getLoginPhone, account).last("limit 1"));
-			if (changeUser != null) {
-				throw BusinessRuntimeException.getInstance("您更换的手机号已注册,无法更换");
-			}
-			//是否已绑定
-			UserBindDetail changeUserBindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
-					.eq(UserBindDetail::getPhone, account).last("limit 1"));
-			if (changeUserBindDetail != null) {
-				throw BusinessRuntimeException.getInstance("您更换的手机号已被绑定,无法更换");
-			}
 			//校验手机号
 			checkPhoneCode(account, code);
 			String loginPhone = user.getLoginPhone();
@@ -416,6 +404,18 @@ public class BindTaskServiceImpl implements BindTaskService {
 			Long phoneUserId = phoneUser.getId();
 			//手机用户
 			if (StrUtil.isNotBlank(loginPhone)) {
+				//是否已注册
+				User changeUser = userMapper.selectOne(Wrappers.lambdaQuery(User.class)
+						.eq(User::getLoginPhone, account).last("limit 1"));
+				if (changeUser != null) {
+					throw BusinessRuntimeException.getInstance("您更换的手机号已注册,无法更换");
+				}
+				//是否已绑定
+				UserBindDetail changeUserBindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
+						.eq(UserBindDetail::getPhone, account).last("limit 1"));
+				if (changeUserBindDetail != null) {
+					throw BusinessRuntimeException.getInstance("您更换的手机号已被绑定,无法更换");
+				}
 				UserBindDetail userBindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
 						.eq(UserBindDetail::getPhone, loginPhone).last("limit 1"));
 				if (userBindDetail != null) {
@@ -453,18 +453,6 @@ public class BindTaskServiceImpl implements BindTaskService {
 		}
 
 		if (type == 2) {
-			//是否已注册
-			User changeUser = userMapper.selectOne(Wrappers.lambdaQuery(User.class)
-					.eq(User::getEmail, account).last("limit 1"));
-			if (changeUser != null) {
-				throw BusinessRuntimeException.getInstance("您更换的手机号已注册,无法更换");
-			}
-			//是否已绑定
-			UserBindDetail changeUserBindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
-					.eq(UserBindDetail::getEmail, account).last("limit 1"));
-			if (changeUserBindDetail != null) {
-				throw BusinessRuntimeException.getInstance("您更换的邮箱已被绑定,无法更换");
-			}
 			//校验邮箱
 			checkEmailCode(account, code);
 			String email = user.getEmail();
@@ -472,6 +460,18 @@ public class BindTaskServiceImpl implements BindTaskService {
 			Long emailUserId = emailUser.getId();
 			//邮箱用户
 			if (StrUtil.isNotBlank(email)) {
+				//是否已注册
+				User changeUser = userMapper.selectOne(Wrappers.lambdaQuery(User.class)
+						.eq(User::getEmail, account).last("limit 1"));
+				if (changeUser != null) {
+					throw BusinessRuntimeException.getInstance("您更换的邮箱已注册,无法更换");
+				}
+				//是否已绑定
+				UserBindDetail changeUserBindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
+						.eq(UserBindDetail::getEmail, account).last("limit 1"));
+				if (changeUserBindDetail != null) {
+					throw BusinessRuntimeException.getInstance("您更换的邮箱已被绑定,无法更换");
+				}
 				UserBindDetail userBindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
 						.eq(UserBindDetail::getEmail, email).last("limit 1"));
 				if (userBindDetail != null) {