券推送插入

yujian

2019-04-22 b6c37e4bc38db88a360d0f2c6099183f9bb75bdc

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

@@ -931,7 +931,7 @@
            throw new UserAccountException(1, "验证码错误，重新输入");

         }

      }

		


      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

      logInfo.put("phone", phone);

@@ -944,13 +944,11 @@
      if (identifyCode1 != null && identifyCode1.getEffective() != null && identifyCode1.getEffective()) {

         throw new UserAccountException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC);

      }

		
		


      // 清空限制

      redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

      // 清理次数

      redisManager.removeCommonString("sendMSNLoginCount" + phone);

		


      // 查询是否存在该电话历史用户

      UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByPhone(phone);

@@ -1007,9 +1005,13 @@
      UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());

      // 直接用的微信登录

      if (userInfo != null) {

         LogHelper.test("微信unionID存在:"+weiXinUser.getUnionid());

         // 更新账户登录信息

         updateLonginInfo(userInfo, loginType, request);

         // 删除邀请分享图

         spreadUserImgService.deleteImgUrl(userInfo.getId());

      } else {

         LogHelper.test("微信unionID不存在:"+weiXinUser.getUnionid());

         // 创建新账户

         userInfo = new UserInfo();

         userInfo.setPortrait(weiXinUser.getHeadimgurl());