喻健
2018-12-12 f47a3671ad4a5b7c11c93585c92b9677ce06c266
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -8,6 +8,7 @@
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Service;
@@ -97,9 +98,9 @@
   @Transactional
   @Override
   public LoginResult login(HttpSession session, Boolean first, String appId, String code, String phone,
   public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,
         UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException {
      HttpSession session = request.getSession();
      if (first != null && first == true)
         session.removeAttribute("LAST_LOGIN_USER");
      // 会话中上次登录的用户
@@ -154,6 +155,11 @@
                     updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
                  updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
                  updateUserInfo.setWxName(weiXinUser.getNickname());
                  // 设置登录时间与登录类型
                  updateUserInfo.setLastLoginTime(System.currentTimeMillis());
                  updateUserInfo.setLoginType(loginType);
                  updateUserInfo.setLastLoginIp(request.getRemoteHost());
                  userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
                  // 删除邀请图片
                  spreadUserImgService.deleteImgUrl(userInfo.getId());
@@ -167,6 +173,9 @@
               userInfo.setWxOpenId(weiXinUser.getOpenid());
               userInfo.setWxUnionId(weiXinUser.getUnionid());
               userInfo.setWxPic(weiXinUser.getHeadimgurl());
               userInfo.setLastLoginTime(System.currentTimeMillis());
               userInfo.setLoginType(loginType);
               userInfo.setLastLoginIp(request.getRemoteHost());
               addUser(userInfo);
               return new LoginResult(LoginResult.TYPE_NORMAL, userInfo);
@@ -247,6 +256,8 @@
                     userInfo.setTbPic(lastUser.getTbPic());
                  }
                  userInfo.setLastLoginTime(System.currentTimeMillis());
                  userInfo.setLoginType(loginType);
                  userInfo.setLastLoginIp(request.getRemoteHost());
                  addUser(userInfo);
                  session.removeAttribute("LAST_LOGIN_USER");
                  return new LoginResult(LoginResult.TYPE_NORMAL, userInfo);