Merge remote-tracking branch 'origin/master'

admin

2019-01-28 e52789b7e099f6e8f10543afbc4f9010b5e94e1a

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -698,9 +698,13 @@
      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)

         throw new UserAccountException(6, "当前淘宝号已经被绑定");