Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java

@@ -14,6 +14,7 @@
import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.wx.WXMPUserLoginService;

@@ -31,6 +32,9 @@


   @Resource

   private UserInfoService userInfoService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;

@@ -90,8 +94,8 @@
         } else {// 登录

            UserInfo userInfo = userAccountService.getUserInfoByPhone(loginData.getAppId(), loginData.getPhone());

            if (userInfo != null) {// 已存在的用户

               UserInfo boss = threeSaleSerivce.getBoss(userInfo.getId());

               if (boss == null) {// 需要绑定邀请码

               String inviteCode = userInfoExtraService.getInviteCodeByUid(userInfo.getId());

               if (StringUtil.isNullOrEmpty(inviteCode)) {// 需要绑定邀请码

                  if (loginData.getBoss() != null) {

                     // 绑定上级

                     return bindInviteCode(loginData.getBoss(), userInfo);

@@ -140,8 +144,8 @@
            // 通过微信网页邀请关系进来的激活生效

            threeSaleSerivce.effective(userInfo);



            UserInfo boss = threeSaleSerivce.getBoss(userInfo.getId());

            if (boss == null) {// 需要绑定邀请码

            String inviteCode = userInfoExtraService.getInviteCodeByUid(userInfo.getId());

            if (StringUtil.isNullOrEmpty(inviteCode)) {// 需要绑定邀请码

               // 提示客户端需要绑定邀请码

               return new WXMPLoginResult(WXMPLoginResult.CODE_BIND_INVITE_CODE, userInfo);

            }