邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

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

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

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.util.Constant;

@@ -51,6 +52,7 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.AccountDetailsFactory;

import com.yeshi.fanli.util.factory.msg.MsgAccountDetailFactory;

import com.yeshi.fanli.util.wx.WXLoginUtil;



import net.sf.json.JSONObject;

@@ -99,19 +101,23 @@
   @Resource

   private SpreadUserImgService spreadUserImgService;



   @Resource

   private UserAccountMsgNotificationService userAccountMsgNotificationService;



   @Transactional

   @Override

   public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,

         UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException {

		


      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

      logInfo.put("code", code);

      logInfo.put("phone", phone);

      logInfo.put("tbUserInfo", tbUserInfo);

      if (tbUserInfo != null)

         logInfo.put("tbUserInfo", tbUserInfo.getId());

      logInfo.put("loginType", loginType);

      LogHelper.lgoinInfo(logInfo.toString());

		


      HttpSession session = request.getSession();

      if (first != null && first == true)

         session.removeAttribute("LAST_LOGIN_USER");

@@ -218,13 +224,17 @@
                     // 绑定关系

                     UserInfo updateUserInfo = new UserInfo(userInfo.getId());



                     if (!StringUtil.isNullOrEmpty(lastUser.getPhone()))

                     if (!StringUtil.isNullOrEmpty(lastUser.getPhone())) {

                        updateUserInfo.setPhone(lastUser.getPhone());



                        userAccountMsgNotificationService.bindingSuccess(userInfo.getId(),

                              MsgAccountDetailFactory.TYPE_PHONE);

                     }

                     if (!StringUtil.isNullOrEmpty(lastUser.getOpenid())) {

                        updateUserInfo.setOpenid(lastUser.getOpenid());

                        updateUserInfo.setTbName(lastUser.getTbName());

                        updateUserInfo.setTbPic(lastUser.getTbPic());

                        userAccountMsgNotificationService.bindingSuccess(userInfo.getId(),

                              MsgAccountDetailFactory.TYPE_TB);

                     }

                     updateUserInfo.setLastLoginTime(System.currentTimeMillis());

                     userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);

@@ -319,7 +329,8 @@
      logInfo.put("appId", appId);

      logInfo.put("code", code);

      logInfo.put("phone", phone);

      logInfo.put("tbUserInfo", tbUserInfo);

      if (tbUserInfo != null)

         logInfo.put("tbUserInfo", tbUserInfo.getId());

      logInfo.put("loginType", loginType);

      LogHelper.lgoinInfo(logInfo.toString());



@@ -530,6 +541,7 @@
         moneyRecordMapper.insertSelective(moneyRecord);

      }



      userAccountMsgNotificationService.connectSuccess(mainUser.getId(), lessUser.getId());

   }



   /**

@@ -655,6 +667,7 @@
      UserInfo update = new UserInfo(user.getId());

      update.setPhone(phone);

      userInfoMapper.updateByPrimaryKeySelective(update);

      userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

   }



   @Override

@@ -675,6 +688,7 @@
      UserInfo updateUserInfo = new UserInfo(uid);

      updateUserInfo.setPhone("");

      userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);

      userAccountMsgNotificationService.unBindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

   }



   @Override

@@ -700,6 +714,8 @@
         update.setPortrait(tbPortrait);

      }

      userInfoMapper.updateByPrimaryKeySelective(update);



      userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_TB);

   }



   @Override

@@ -724,6 +740,8 @@
      }



      userInfoMapper.updateByPrimaryKeySelective(update);



      userAccountMsgNotificationService.unBindingSuccess(uid, MsgAccountDetailFactory.TYPE_TB);

   }



   @Override

@@ -756,6 +774,8 @@
         updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());

      }

      userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);



      userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);

   }



   @Override