Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java

@@ -8,7 +8,11 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



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

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

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

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

import com.yeshi.fanli.dto.mq.user.body.TaoBaoBindSuccessMQMsg;

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

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

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

@@ -20,6 +24,8 @@
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

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

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



@Service

public class UserExtraTaoBaoInfoServiceImpl implements UserExtraTaoBaoInfoService {

@@ -33,7 +39,10 @@
   @Resource

   private UserAccountBindingHistoryService userAccountBindingHistoryService;



   @Transactional(rollbackFor=Exception.class)

   @Resource(name = "producer")

   private Producer producer;



   @Transactional(rollbackFor = Exception.class)

   @Override

   public void addRelationId(Long uid, String relationId, String taoBaoUid, String nickName, boolean valid)

         throws UserExtraTaoBaoInfoException {

@@ -77,7 +86,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void addSpecialId(Long uid, String specialId, String taoBaoUid, String nickName, boolean valid)

         throws UserExtraTaoBaoInfoException {

@@ -121,7 +130,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void saveUserTaoBaoInfo(Long uid, String relationId, String specialId, String taoBaoUid, String nickName,

         boolean valid) throws UserExtraTaoBaoInfoException {

@@ -156,12 +165,15 @@


      // 清除之前的用户ID

      userExtraTaoBaoInfoMapper.clearUid(uid);

      Long fromUid = null;



      if (list == null || list.size() == 0) {

         // 新增

         taoBaoInfo.setCreateTime(new Date());

         userExtraTaoBaoInfoMapper.insertSelective(taoBaoInfo);

      } else {

         if (list.get(0).getUser() != null)

            fromUid = list.get(0).getUser().getId();

         // 取第一个替换uid 等信息

         taoBaoInfo.setId(list.get(0).getId());

         taoBaoInfo.setUpdateTime(new Date());

@@ -187,6 +199,10 @@
      else

         history.setFirst(true);

      userAccountBindingHistoryService.addUserAccountBindingHistory(history);



      Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.taobaoBindSuccess,

            new TaoBaoBindSuccessMQMsg(uid, fromUid, taoBaoUid, new Date()));

      producer.send(message);

   }



   /**