admin
2019-08-27 fe879975a3e8a0a1aa280fb839e02d159bfbcff8
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -20,6 +20,7 @@
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.task.TaskExecutor;
import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Service;
@@ -40,15 +41,13 @@
import com.yeshi.fanli.dao.mybatis.share.ShareMapper;
import com.yeshi.fanli.dao.user.UserInfoDao;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
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.UserInfoModifyRecord.ModifyTypeEnum;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.exception.ThreeSaleException;
import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;
import com.yeshi.fanli.exception.user.UserInfoException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -60,6 +59,7 @@
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserRankService;
import com.yeshi.fanli.util.Constant;
@@ -132,6 +132,11 @@
   @Resource
   private BindingAccountService bindingAccountService;
   @Lazy
   @Resource
   private UserInfoModifyRecordService userInfoModifyRecordService;
   public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {
      List<UserInfo> list = null;
@@ -726,17 +731,23 @@
         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); }
       */
       //显示用户微信 淘宝 老版本存在
       String wxUnionId = userInfoVO.getWxUnionId();
       if (wxUnionId == null || wxUnionId.trim().length() == 0) {
          userInfoVO.setWxName(null);
       }
       // 是否绑定支付宝(购买 +  分享权限)
       String taoBaoUid = userInfoVO.getTaoBaoUid();
       String tbSpecialId = userInfoVO.getTbSpecialId();
       String tbRelationId = userInfoVO.getTbRelationId();
       if (StringUtil.isNullOrEmpty(taoBaoUid) || StringUtil.isNullOrEmpty(tbSpecialId) || StringUtil.isNullOrEmpty(tbRelationId)) {
          userInfoVO.setTbName(null);
          userInfoVO.setTaoBaoUid(null);
       }
      Long uid = userInfoVO.getId();
      /* 绑定收款账号信息 */
      List<BindingAccount> account = bindingAccountMapper.selectByUid(uid);
      if (account != null && account.size() > 0) {
@@ -965,7 +976,9 @@
      if (!StringUtil.isNullOrEmpty(portrait) && portrait.contains("/img/user/")) {
         COSManager.getInstance().deleteFile(portrait);
      }
      userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.portrait, fileLink);
      executor.execute(new Runnable() {
         @Override
         public void run() {