大淘客搜索接口升级

admin

2020-11-28 dc5be7d38446f70e6ff86df311119c32b41fe7f8

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

@@ -15,6 +15,8 @@


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import com.yeshi.fanli.util.*;

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -23,10 +25,10 @@
import org.yeshi.utils.FileUtil;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.entity.FileUploadResult;

import org.yeshi.utils.entity.wx.WeiXinUser;

import org.yeshi.utils.tencentcloud.COSManager;



import com.aliyun.openservices.ons.api.Message;

import com.aliyun.openservices.ons.api.Producer;

import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;

import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;

import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;

@@ -38,7 +40,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

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

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

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

import com.yeshi.fanli.entity.bus.user.notify.UserActivedRecord;

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

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

@@ -56,17 +57,13 @@
import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;

import com.yeshi.fanli.service.inter.user.notify.UserActivedRecordService;

import com.yeshi.fanli.service.manger.msg.RocketMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

import com.yeshi.fanli.util.InviteCodeFilterUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;

import com.yeshi.fanli.util.rocketmq.MQTopicName;

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

import com.yeshi.fanli.vo.user.UserInfoExtraVO;



import net.coobird.thumbnailator.Thumbnails;

import org.yeshi.utils.wx.WXAppLoginUtil;



@Service

public class UserInfoExtraServiceImpl implements UserInfoExtraService {

@@ -119,11 +116,13 @@
         throw new UserInfoExtraException(1, "用户附加信息不存在");

      }



      SystemEnum system= userInfoService.getUserSystem(uid);



      // 等级对照表

      String contrast = configService.get(ConfigKeyEnum.userRankContrast.getKey());

      String contrast = configService.getValue(ConfigKeyEnum.userRankContrast.getKey(),system);

      extraVO.setRankContrast(contrast);

      // 特别提醒

      String rankTip = configService.get(ConfigKeyEnum.userRankTip.getKey());

      String rankTip = configService.getValue(ConfigKeyEnum.userRankTip.getKey(),system);

      extraVO.setRankTip(rankTip);



      Integer rankOrderNum = extraVO.getRankOrderNum();

@@ -384,7 +383,7 @@
         throw new UserInfoExtraException(1, "已经激活, 无需再次激活");



      // 获取微信信息

      WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code, wxAccount.getAppId(), wxAccount.getAppSecret());

      WeiXinUser weiXinUser = WXAppLoginUtil.getWeiXinUser(code, wxAccount.getAppId(), wxAccount.getAppSecret());

      if (weiXinUser == null) {

         throw new UserInfoExtraException(1, "微信授权失败");

      }

@@ -396,7 +395,7 @@
      // 验证数据

      String wxUnionIdExist = invitee.getWxUnionId();

      if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {

         UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());

         UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid(),invitee.getSystem());

         if (newUser != null) {

            throw new UserInfoExtraException(1, "此微信已被其他帐号绑定");

         }

@@ -480,7 +479,7 @@
      // 验证数据

      String wxUnionIdExist = invitee.getWxUnionId();

      if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {

         UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());

         UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid(),invitee.getSystem());

         if (newUser != null) {

            throw new UserInfoExtraException(1, "此微信已被其他帐号绑定");

         }

@@ -772,7 +771,7 @@
      // 验证数据

      String wxUnionIdExist = invitee.getWxUnionId();

      if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {

         UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(wxUnionId);

         UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(wxUnionId,invitee.getSystem());

         if (newUser != null) {

            throw new UserInfoExtraException(1, "此微信已被其他帐号绑定");

         }