From eb9da1ad5c4054d9ce3dab2446deade9f5b09c7d Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 29 一月 2019 10:25:18 +0800 Subject: [PATCH] Merge branch 'div' --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java index 911b5ae..e325927 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java @@ -47,6 +47,7 @@ import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService; import com.yeshi.fanli.service.inter.user.SpreadUserImgService; import com.yeshi.fanli.service.inter.user.UserAccountService; +import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.FileUtil; import com.yeshi.fanli.util.StringUtil; @@ -103,6 +104,9 @@ @Resource private UserAccountMsgNotificationService userAccountMsgNotificationService; + + @Resource + private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService; @Transactional @Override @@ -698,8 +702,12 @@ if (user == null) throw new UserAccountException(4, "鐢ㄦ埛涓嶅瓨鍦�"); - if (!StringUtil.isNullOrEmpty(user.getOpenid())) + if (!StringUtil.isNullOrEmpty(user.getOpenid()) && !user.getOpenid().equalsIgnoreCase(tbOpenId)) throw new UserAccountException(5, "褰撳墠璐﹀彿宸茬粡缁戝畾浜嗘窐瀹濓紝璇峰厛瑙ｇ粦"); + + //缁戝畾鍚屼竴涓窐瀹濆彿 + if (!StringUtil.isNullOrEmpty(user.getOpenid()) && user.getOpenid().equalsIgnoreCase(tbOpenId)) + return; UserInfo taoBaoUser = getUserInfoByTaoBaoOpenId(user.getAppId(), tbOpenId); if (taoBaoUser != null) @@ -740,6 +748,8 @@ } userInfoMapper.updateByPrimaryKeySelective(update); + + userExtraTaoBaoInfoService.unBindUid(uid); userAccountMsgNotificationService.unBindingSuccess(uid, MsgAccountDetailFactory.TYPE_TB); } -- Gitblit v1.8.0