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

server/src/main/java/com/pica/cloud/account/account/server/mapper/AccountUnionMapper.java

@@ -3,6 +3,8 @@ package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.AccountUnionEntity;
 
+import java.util.Map;
+
 public interface AccountUnionMapper {
 
     /**
@@ -22,7 +24,7 @@ public interface AccountUnionMapper {
     AccountUnionEntity selectByUnionId(String unionId);
 
 
-    AccountUnionEntity selectByAcctId(Integer acctId);
+    AccountUnionEntity selectByAcctId(Map<String, Object> map);
 
 
     int deleteByPrimaryKey(Integer id);

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

@@ -32,6 +32,7 @@ import com.pica.cloud.foundation.utils.utils.ValidateUtils;
 import com.pica.cloud.patient.smartcontract.common.utils.HttpClientCloudUtils;
 import io.jsonwebtoken.*;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -415,10 +416,11 @@ public class LoginServiceImpl implements LoginService {
         if (accountUnionResult != null) {
             throw new PicaException(AccountExceptionEnum.PICA_WECHAT_UNBIND.getCode(), AccountExceptionEnum.PICA_WECHAT_UNBIND.getMessage());
         }
-        AccountUnionEntity accountUnionEntityAccount = accountUnionMapper.selectByAcctId(acctId);
-        if (accountUnionEntityAccount != null &&
-                StringUtils.isNotEmpty(accountUnionEntityAccount.getUnionId()) &&
-                accountUnionEntityAccount.getUnionType() == AccountTypeEnum.UNION_LOGIN_WE_CHAT.getCode()) {
+        Map<String, Object> map = new HashedMap(2);
+        map.put("acctId", acctId);
+        map.put("unionType", AccountTypeEnum.UNION_LOGIN_WE_CHAT.getCode());
+        AccountUnionEntity accountUnionEntityAccount = accountUnionMapper.selectByAcctId(map);
+        if (accountUnionEntityAccount != null) {
             throw new PicaException(AccountExceptionEnum.PICA_WECHAT_BIND_OTHER.getCode(), AccountExceptionEnum.PICA_WECHAT_BIND_OTHER.getMessage());
         }
         AccountUnionEntity accountUnionEntity = new AccountUnionEntity();
@@ -800,10 +802,11 @@ public class LoginServiceImpl implements LoginService {
                     AccountExceptionEnum.PICA_APPLE_BIND_OTHER.getCode(),
                     AccountExceptionEnum.PICA_APPLE_BIND_OTHER.getMessage());
         }
-        AccountUnionEntity accountUnionEntityAccount = accountUnionMapper.selectByAcctId(acctId);
-        if (accountUnionEntityAccount != null &&
-                StringUtils.isNotEmpty(accountUnionEntityAccount.getUnionId()) &&
-                accountUnionEntityAccount.getUnionType() == AccountTypeEnum.UNION_LOGIN_APPLE.getCode()) {
+        Map<String, Object> map = new HashedMap(2);
+        map.put("acctId", acctId);
+        map.put("unionType", AccountTypeEnum.UNION_LOGIN_APPLE.getCode());
+        AccountUnionEntity accountUnionEntityAccount = accountUnionMapper.selectByAcctId(map);
+        if (accountUnionEntityAccount != null) {
             throw new PicaException(
                     AccountExceptionEnum.PICA_MOBILE_BIND_OTHER.getCode(),
                     AccountExceptionEnum.PICA_MOBILE_BIND_OTHER.getMessage());

server/src/main/resources/mybatis/AccountUnionEntityMapper.xml

@@ -34,11 +34,13 @@
     </select>
 
     <!--通过unionId查询用户信息-->
-    <select id="selectByAcctId" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+    <select id="selectByAcctId" resultMap="BaseResultMap" parameterType="java.util.Map">
         select
         <include refid="Base_Column_List"/>
         from account_union
-        where acct_id = #{acctId,jdbcType=INTEGER} and delete_flag = 1
+        where acct_id = #{acctId,jdbcType=INTEGER}
+        and union_type = #{unionType}
+        and delete_flag = 1
         limit 1
     </select>