微信和apple登录绑定手机号判断提示修改

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -416,7 +416,9 @@ public class LoginServiceImpl implements LoginService {
             throw new PicaException(AccountExceptionEnum.PICA_WECHAT_UNBIND.getCode(), AccountExceptionEnum.PICA_WECHAT_UNBIND.getMessage());
         }
         AccountUnionEntity accountUnionEntityAccount = accountUnionMapper.selectByAcctId(acctId);
-        if (accountUnionEntityAccount != null) {
+        if (accountUnionEntityAccount != null &&
+                StringUtils.isNotEmpty(accountUnionEntityAccount.getUnionId()) &&
+                accountUnionEntityAccount.getUnionType() == AccountTypeEnum.UNION_LOGIN_WE_CHAT.getCode()) {
             throw new PicaException(AccountExceptionEnum.PICA_WECHAT_BIND_OTHER.getCode(), AccountExceptionEnum.PICA_WECHAT_BIND_OTHER.getMessage());
         }
         AccountUnionEntity accountUnionEntity = new AccountUnionEntity();
@@ -799,7 +801,9 @@ public class LoginServiceImpl implements LoginService {
                     AccountExceptionEnum.PICA_APPLE_BIND_OTHER.getMessage());
         }
         AccountUnionEntity accountUnionEntityAccount = accountUnionMapper.selectByAcctId(acctId);
-        if (accountUnionEntityAccount != null) {
+        if (accountUnionEntityAccount != null &&
+                StringUtils.isNotEmpty(accountUnionEntityAccount.getUnionId()) &&
+                accountUnionEntityAccount.getUnionType() == AccountTypeEnum.UNION_LOGIN_APPLE.getCode()) {
             throw new PicaException(
                     AccountExceptionEnum.PICA_MOBILE_BIND_OTHER.getCode(),
                     AccountExceptionEnum.PICA_MOBILE_BIND_OTHER.getMessage());