Merge branch 'dev-fixBug-0929' into 'release'

Dev fix bug 0929

reviewCode赵培军

See merge request !52

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

@@ -27,6 +27,7 @@ import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.foundation.utils.utils.StringUtil;
 import com.pica.cloud.foundation.utils.utils.ValidateUtils;
 import com.pica.cloud.patient.smartcontract.common.utils.HttpClientCloudUtils;
 import io.jsonwebtoken.*;
@@ -397,6 +398,11 @@ public class LoginServiceImpl implements LoginService {
             WeChatUserInfoEntity weChatUserInfoEntity = WeChatUtils.mergeWechatUserInfo(weChatUserInfo, weChatEntity.getOpenid());
             logger.info("loginByWeChat: 获取微信用户信息：{}",JSONObject.toJSONString(weChatUserInfoEntity));
             String unionId = weChatUserInfoEntity.getUnionid();
+            if(StringUtil.isEmpty(unionId)){
+                logger.error("loginByWeChat get unionId:{}",unionId);
+                intactUtil.sendIntact(batchNo,"loginByWeChat",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"微信登录无法获取unionId:");
+                throw new PicaException(AccountExceptionEnum.PICA_WECHAT_CODE_ERROR.getCode(), AccountExceptionEnum.PICA_WECHAT_CODE_ERROR.getMessage());
+            }
             AccountUnionEntity accountUnionEntity = accountUnionMapper.selectByUnionId(unionId);
             logger.info("loginByWeChat accountUnionEntity:{}",JSONObject.toJSONString(accountUnionEntity));
             //是否绑定逻辑的判断
@@ -565,9 +571,11 @@ public class LoginServiceImpl implements LoginService {
             intactUtil.sendIntact(batchNo,"processAccountUnion",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"acctId:"+acctId+",unionId:"+unionId+",productType:"+productType);
             //先查询当前产品线是否有记录？如果有就更新成delete_flag=2; 然后在插入新的绑定记录
             AccountUnionEntity accountUnionResult = accountUnionMapper.selectByUnionId(unionId);
-            if (accountUnionResult != null && entity != null) {
+            if (accountUnionResult != null) {
                 intactUtil.sendIntact(batchNo,"processAccountUnion",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"该微信号已绑定其他云鹊医账户，你可以使用微信登录云鹊医，在「设置」页解除绑定");
-                throw new PicaException(AccountExceptionEnum.PICA_WECHAT_UNBIND.getCode(), AccountExceptionEnum.PICA_WECHAT_UNBIND.getMessage());
+                if (entity != null) {
+                    throw new PicaException(AccountExceptionEnum.PICA_WECHAT_UNBIND.getCode(), AccountExceptionEnum.PICA_WECHAT_UNBIND.getMessage());
+                }
             }
             Map<String, Object> map = new HashedMap(2);
             map.put("acctId", acctId);
@@ -575,9 +583,11 @@ public class LoginServiceImpl implements LoginService {
             AccountUnionEntity accountUnionEntityAccount = accountUnionMapper.selectByAcctId(map);
             AccountWeChatInfoEntity entity2 = null;
 
-            if (accountUnionEntityAccount != null && entity != null) {
+            if (accountUnionEntityAccount != null) {
                 intactUtil.sendIntact(batchNo,"processAccountUnion",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"该手机号已绑定其他微信号，你可以在「设置」页解除绑定");
-                throw new PicaException(AccountExceptionEnum.PICA_WECHAT_BIND_OTHER.getCode(), AccountExceptionEnum.PICA_WECHAT_BIND_OTHER.getMessage());
+                if (entity != null) {
+                    throw new PicaException(AccountExceptionEnum.PICA_WECHAT_BIND_OTHER.getCode(), AccountExceptionEnum.PICA_WECHAT_BIND_OTHER.getMessage());
+                }
             }