Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

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

@@ -44,13 +44,16 @@
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.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

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;

@@ -98,6 +101,12 @@


   @Resource

   private SpreadUserImgService spreadUserImgService;



   @Resource

   private UserAccountMsgNotificationService userAccountMsgNotificationService;

	
   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   @Transactional

   @Override

@@ -219,13 +228,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);

@@ -532,6 +545,7 @@
         moneyRecordMapper.insertSelective(moneyRecord);

      }



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

   }



   /**

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

      update.setPhone(phone);

      userInfoMapper.updateByPrimaryKeySelective(update);

      userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

   }



   @Override

@@ -677,6 +692,7 @@
      UserInfo updateUserInfo = new UserInfo(uid);

      updateUserInfo.setPhone("");

      userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);

      userAccountMsgNotificationService.unBindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);

   }



   @Override

@@ -686,8 +702,12 @@
      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)

@@ -702,6 +722,8 @@
         update.setPortrait(tbPortrait);

      }

      userInfoMapper.updateByPrimaryKeySelective(update);



      userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_TB);

   }



   @Override

@@ -726,6 +748,10 @@
      }



      userInfoMapper.updateByPrimaryKeySelective(update);

		
      userExtraTaoBaoInfoService.unBindUid(uid);



      userAccountMsgNotificationService.unBindingSuccess(uid, MsgAccountDetailFactory.TYPE_TB);

   }



   @Override

@@ -758,6 +784,8 @@
         updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());

      }

      userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);



      userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);

   }



   @Override