券推送插入

yujian

2019-04-22 b6c37e4bc38db88a360d0f2c6099183f9bb75bdc

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

@@ -36,15 +36,21 @@
import com.yeshi.fanli.dao.user.UserInfoDao;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.entity.bus.user.InviteUser;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.exception.user.UserInfoException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

@@ -89,6 +95,20 @@


   @Resource

   private HongBaoV2CountService hongBaoV2CountService;

	
   @Resource

   private UserRankService userRankService;

	
   @Resource

   private UserActiveLogService userActiveLogService;

	
   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;

	
   @Resource

   private TaoBaoUnionAuthRecordService taoBaoUnionAuthRecordService;

	
	


   public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {

      List<UserInfo> list = null;

@@ -443,7 +463,7 @@
         find.setLoginType(Constant.WEIXIN);

         find.setRank(0);

         find.setWxOpenId(weiXinUser.getOpenid());

         System system = new System(Constant.FANLI);

         BusinessSystem system = new BusinessSystem(Constant.FANLI);

         system.setPlatform(1);

         find.setSystem(system);

      }

@@ -644,7 +664,7 @@
      if (userList == null || userList.size() == 0) {

         return null;

      }



		
      for (UserInfoVO userInfoVO : userList) {

         // 数据加工处理

         convertUserInfoVOData(userInfoVO);

@@ -654,22 +674,29 @@
   }

   

   public void convertUserInfoVOData(UserInfoVO userInfoVO) {

      String f_alipayAccount = userInfoVO.getF_alipayAccount();

		
      String rankName = userInfoVO.getRankName();

      if (rankName == null || rankName.trim().length() == 0) {

         userInfoVO.setRankName("青铜");

         userInfoVO.setRankPicture("http://img.flqapp.com/resource/rank/rank_picture_new_1.png");

      }

		
      String f_alipayAccount = userInfoVO.getAlipayAccountInvalid();

      if (f_alipayAccount != null && f_alipayAccount.trim().length() > 0) {

         userInfoVO.setAlipayAccountState(1);

      }

      

      String f_phone = userInfoVO.getF_phone();

      String f_phone = userInfoVO.getPhoneInvalid();

      if (f_phone != null && f_phone.trim().length() > 0) {

         userInfoVO.setPhoneState(1);

      }

      

      String f_taobaoUid = userInfoVO.getF_taobaoUid();

      String f_taobaoUid = userInfoVO.getTaobaoUidInvalid();

      if (f_taobaoUid != null && f_taobaoUid.trim().length() > 0) {

         userInfoVO.setTaobaoUidState(1);

      }

      

      String f_wxUnionId = userInfoVO.getF_wxUnionId();

      String f_wxUnionId = userInfoVO.getWxUnionIdInvalid();

      if (f_wxUnionId != null && f_wxUnionId.trim().length() > 0) {

         userInfoVO.setWxUnionIdState(1);

      }

@@ -680,8 +707,17 @@
         userInfoVO.setLastLoginTime(null);

      }



      /* 显示用户微信 淘宝  老版本存在

       * String wxUnionId = userInfoVO.getWxUnionId(); if (wxUnionId == null ||

       * wxUnionId.trim().length() == 0) { userInfoVO.setWxName(null); }

       * 
       * String taoBaoUid = userInfoVO.getTaoBaoUid(); if (taoBaoUid == null ||

       * taoBaoUid.trim().length() == 0) { userInfoVO.setTbName(null); }

       */

		
      

      Long uid = userInfoVO.getId();

		
      

      /* 绑定收款账号信息 */

      List<BindingAccount> account = bindingAccountMapper.selectByUid(uid);

@@ -812,4 +848,64 @@
      return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode);

   }

   

   @Override

   public UserInfo getEffectiveUserInfoByPhone(String phone) {

      return userInfoMapper.getEffectiveUserInfoByPhone(phone);

   }

	
   @Override

   public UserInfo getEffectiveUserInfoByWXUnionId(String unionId) {

      return userInfoMapper.getEffectiveUserInfoByWXUnionId(unionId);

   }

	
   @Override

   public UserInfo getUserInfo(Long uid) throws UserInfoException{

      if (uid == null) {

         throw new UserInfoException(1, "请求参数为空");

      }

		
      UserInfo userInfo = userInfoMapper.selectByPKey(uid);

      if(userInfo == null) {

         throw new UserInfoException(1, "用户不存在");

      }

		
      if (userInfo.getState() == UserInfo.STATE_FORBIDDEN) {

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

      }

		
      if (userInfo.getState()!= UserInfo.STATE_NORMAL) {

         throw new UserInfoException(1, "用户不存在");

      }

		
      // 淘宝昵称 组织

      boolean clearOpenid = true;

      UserExtraTaoBaoInfo extraTaoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid);

      if (extraTaoBaoInfo != null) {

         String specialId = extraTaoBaoInfo.getSpecialId();

         String relationId = extraTaoBaoInfo.getRelationId();

         String taoBaoNickName = extraTaoBaoInfo.getTaoBaoNickName();

			
         if(!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) {

            clearOpenid = false;

            userInfo.setOpenid(extraTaoBaoInfo.getTaoBaoUid());

				
            if(!StringUtil.isNullOrEmpty(taoBaoNickName)) {

               userInfo.setTbName(taoBaoNickName);

            } else {

               String taoBaoUserNick = taoBaoUnionAuthRecordService.getTaoBaoUserNick(uid);

               if(!StringUtil.isNullOrEmpty(taoBaoUserNick)) {

                  userInfo.setTbName(taoBaoUserNick);

               }

            }

         }

      }

		
      if (clearOpenid) {

         userInfo.setOpenid(null);

      }

		
      return userInfo;

   }

	
	
}